source: issm/oecreview/Archive/24684-25833/ISSM-24823-24824.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 32.9 KB

  • ../trunk-jpl/jenkins/ross-debian_linux-codipack

     
    3838        autotools       install-debian-linux.sh
    3939        cmake           install.sh
    4040        petsc           install-3.12-linux.sh
    41         gsl                     install-linux.sh
     41        gsl                     install.sh
    4242        triangle        install-linux.sh
    4343        chaco           install.sh
    4444        m1qn3           install.sh

  • ../trunk-jpl/jenkins/pine_island-mac-binaries-with_dakota

     
    2828        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2929        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
    3030        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
     31        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
     32        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    3133        --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
    32         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    3334        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
    3435        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
    3536        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
    … …  
    5051        autotools       install.sh
    5152        cmake           install.sh
    5253        petsc           install-3.12-mac-static.sh
    53         boost           install-1.72-mac-static.sh
     54        gsl                     install-static.sh
     55        boost           install-1.7-mac-static.sh
    5456        dakota          install-6.2-mac-static.sh
    5557        triangle        install-mac-static.sh
    5658        chaco           install.sh

  • ../trunk-jpl/m4/issm_options.m4

     
    536536                DAKOTAFLAGS=""
    537537
    538538                dnl NOTE:
    539                 dnl - See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota for the
    540                 dnl       flags needed by your combination of Boost and Dakota versions
     539                dnl - See,
     540                dnl
     541                dnl     $ISSM_DIR/externalpackages/dakota/build/src/Makefile.export.Dakota
     542                dnl
     543                dnl   for the flags needed by your combination of Boost and Dakota
     544                dnl   versions
    541545                dnl - We know $DAKOTA_ROOT cannot be empty at this point, so no need to
    542546                dnl   check again in the following conditionals
    543547                dnl
    … …  
    567571                                        AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
    568572                                elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then
    569573                                        if test "${BOOST_VERSION_MAJOR}" == "1"; then
    570                                                 if test "${BOOST_VERSION_MINOR}" == "55"; then
    571                                                         DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    572                                                         DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
    573                                                 elif test "${BOOST_VERSION_MINOR}" = "72"; then
    574                                                         DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    575                                                         dnl See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota -> Dakota_LIBRARIES
    576                                                         DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system ${BLASLAPACKLIB}"
    577                                                 fi
     574                                                DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_QUESO -DHAVE_QUESO_GPMSA -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
     575                                                DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lqueso -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver"
     576                                                DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system"
     577                                                DAKOTALIB+=" ${BLASLAPACKLIB}"
    578578                                        fi
    579579                                        AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
    580580                                        AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
    … …  
    606606                                        if test "${BOOST_VERSION_MAJOR}" == "1"; then
    607607                                                DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_QUESO -DHAVE_QUESO_GPMSA -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    608608                                                DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lqueso -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver"
    609                                                 if test "${BOOST_VERSION_MINOR}" == "55"; then
    610                                                         DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
    611                                                 elif test "${BOOST_VERSION_MINOR}" = "72"; then
    612                                                         DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system"
    613                                                 fi
     609                                                DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system"
    614610                                                DAKOTALIB+=" ${BLASLAPACKLIB}"
    615611                                        fi
    616612                                        AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])

  • ../trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh

     
    1 #!/bin/bash
    2 set -eu
    3 
    4 # Constants
    5 DAK_VER="6.2"
    6 
    7 # Some cleanup
    8 rm -rf build
    9 rm -rf install
    10 rm -rf tests
    11 rm -rf src
    12 mkdir build install src
    13 
    14 # Download from ISSM server
    15 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${DAK_VER}-public.src.tar.gz" "dakota-${DAK_VER}-public-src.tar.gz"
    16 
    17 # Untar
    18 tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
    19 
    20 # Move Dakota to src directory
    21 mv dakota-${DAK_VER}.0.src/* src
    22 rm -rf dakota-${DAK_VER}.0.src
    23 
    24 # Set up Dakota and CMake variables
    25 DAK_PATH=$ISSM_DIR/externalpackages/dakota
    26 
    27 export DAK_BUILD=$DAK_PATH/build
    28 export DAK_INSTALL=$DAK_PATH/install
    29 export DAK_SRC=$DAK_PATH/src
    30 export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
    31 export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
    32 
    33 # Apply patches
    34 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    35 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/$DAK_VER/BuildDakotaCustom.cmake.mac.patch
    36 patch $DAK_SRC/cmake/DakotaDev.cmake configs/$DAK_VER/DakotaDev.cmake.patch
    37 patch $DAK_SRC/cmake/InstallDarwinDylibs.cmake configs/$DAK_VER/InstallDarwinDylibs.cmake.patch
    38 patch $DAK_SRC/CMakeLists.txt configs/$DAK_VER/CMakeLists.txt.patch
    39 patch src/src/NonDSampling.cpp configs/$DAK_VER/NonDSampling.cpp.patch
    40 patch src/src/NonDLocalReliability.cpp configs/$DAK_VER/NonDLocalReliability.cpp.patch
    41 patch src/packages/pecos/src/pecos_global_defs.hpp configs/$DAK_VER/pecos_global_defs.hpp.patch
    42 
    43 # Configure and build Dakota
    44 cd $DAK_BUILD
    45 cmake \
    46         -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
    47         -C$DAK_SRC/cmake/DakotaDev.cmake \
    48         -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
    49         -DBoost_NO_BOOST_CMAKE=TRUE \
    50         -DBoost_NO_SYSTEM_PATHS=TRUE \
    51         -DBoost_LIBRARY_DIRS:FILEPATH=$BOOST_ROOT/lib \
    52         -DCMAKE_INSTALL_PREFIX=$DAK_INSTALL \
    53         -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
    54         -DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
    55         -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
    56         -DCMAKE_CXX_FLAGS=-fdelayed-template-parsing \
    57         -DHAVE_ACRO=off \
    58         -DHAVE_JEGA=off \
    59         $DAK_SRC
    60 
    61 if [ $# -eq 0 ];
    62 then
    63         make
    64         make install
    65 else
    66         make -j $1
    67         make -j $1 install
    68 fi
    69 
    70 # Set paths and library paths
    71 export PATH=$DAK_INSTALL/bin:$DAK_INSTALL/test:$PATH
    72 
    73 if [ -z ${DYLD_LIBRARY_PATH+x} ]
    74 then
    75         export DYLD_LIBRARY_PATH=$DAK_INSTALL/lib:$DAK_INSTALL/bin
    76 else
    77         export DYLD_LIBRARY_PATH=$DAK_INSTALL/lib:$DAK_INSTALL/bin:$DYLD_LIBRARY_PATH
    78 fi

  • ../trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh 

    Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
     
    5656        -DBoost_NO_BOOST_CMAKE=TRUE \
    5757        -DHAVE_ACRO=OFF \
    5858        -DHAVE_JEGA=OFF \
     59        -DHAVE_QUESO=ON \
     60        -DDAKOTA_HAVE_GSL=ON \
    5961        -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \
    6062        -C${DAK_SRC}/cmake/DakotaDev.cmake \
    6163        ${DAK_SRC}

  • ../trunk-jpl/externalpackages/dakota/install-6.2-linux.sh

     
    1111#
    1212export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    1313export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
    14 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
     14export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version)
    1515#export CXXFLAGS='-std=c++11'
    1616export DAK_BUILD=${DAK_ROOT}/build
    1717export DAK_INSTALL=${DAK_ROOT}/install
    … …  
    5252        -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \
    5353        -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
    5454        -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
     55        -DBoost_NO_BOOST_CMAKE=TRUE \
    5556        -DHAVE_ACRO=OFF \
    5657        -DHAVE_JEGA=OFF \
    5758        -DHAVE_QUESO=ON \

  • ../trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

     
    1414export DAK_BUILD=${DAK_ROOT}/build
    1515export DAK_INSTALL=${DAK_ROOT}/install
    1616export DAK_SRC=${DAK_ROOT}/src
     17export GSL_HOME=${ISSM_DIR}/externalpackages/gsl/install
    1718export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/local/Cellar/gcc/9.3.0/lib/gcc/9 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    1819
    1920# Cleanup
    … …  
    5556        -DBoost_NO_BOOST_CMAKE=TRUE \
    5657        -DHAVE_ACRO=OFF \
    5758        -DHAVE_JEGA=OFF \
     59        -DHAVE_QUESO=ON \
     60        -DDAKOTA_HAVE_GSL=ON \
    5861        -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \
    5962        -C${DAK_SRC}/cmake/DakotaDev.cmake \
    6063        ${DAK_SRC}

  • ../trunk-jpl/externalpackages/boost/install-1.72-linux.sh

     
    1 #!/bin/bash
    2 #set -eu # Do not `run set -eu` because it causes some targets to fail
    3 
    4 
    5 # NOTE:
    6 # - Stop after bootstrap step and run `b2 --debug-configuration` to figure
    7 #       out which paths Boost is using to include Python. Make sure that each of
    8 #       the listed paths is covered by Python. If not, you must create a symbolic
    9 #       link from $ISSM_DIR/externalpackages/python to the location of the file
    10 #       that Boost is expecting. There is no way to get the Boost to compile with
    11 #       Python otherwise.
    12 #
    13 
    14 ## Constants
    15 #
    16 VER="1_72_0"
    17 
    18 ## Envrionment
    19 #
    20 #export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
    21 #export CXXFLAGS='-std=c++11'
    22 
    23 # Download source
    24 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
    25 
    26 # Unpack source
    27 tar -zxvf boost_${VER}.tar.gz
    28 
    29 # Cleanup
    30 rm -rf install src
    31 mkdir install src
    32 
    33 # Move source into 'src' directory
    34 mv boost_${VER}/* src/
    35 rm -rf boost_${VER}
    36 
    37 # Configure
    38 cd src
    39 ./bootstrap.sh \
    40         --prefix="${ISSM_DIR}/externalpackages/boost/install" \
    41         --with-python=python2.7 \
    42         --with-python-root="${ISSM_DIR}/externalpackages/python/install"
    43 
    44 # Modify project config to enable MPI
    45 printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
    46 
    47 # Compile and install
    48 ./b2 --toolset=gcc install

  • ../trunk-jpl/externalpackages/boost/install-1.72-mac.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.72-linux.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
     
    1 #!/bin/bash
    2 #set -eu # Do not `run set -eu` because it causes some targets to fail
    3 
    4 
    5 ## Constants
    6 #
    7 VER="1_72_0"
    8 
    9 ## Environment
    10 #
    11 export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
    12 
    13 # Download source
    14 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
    15 
    16 # Unpack source
    17 tar -zxvf boost_${VER}.tar.gz
    18 
    19 # Cleanup
    20 rm -rf install src
    21 mkdir install src
    22 
    23 # Move source into 'src' directory
    24 mv boost_${VER}/* src/
    25 rm -rf boost_${VER}
    26 
    27 # Configure
    28 cd src
    29 ./bootstrap.sh \
    30         --prefix=${BOOST_ROOT}/install \
    31         --with-python=python2.7
    32 
    33 # Modify project config to enable MPI
    34 printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
    35 
    36 # Compile and install
    37 ./b2 install
    38 
    39 # Copy binary to install directory
    40 mkdir ${BOOST_ROOT}/install/bin
    41 cp bjam ${BOOST_ROOT}/install/bin
    42 
    43 # Set install_name for all shared libraries
    44 cd ${BOOST_ROOT}/install/lib
    45 for name in *.dylib; do
    46         install_name_tool -id ${BOOST_ROOT}/install/lib/${name} ${name}
    47 done

  • ../trunk-jpl/externalpackages/boost/install-1.72-linux-static.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.72-mac.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
     
    1 #!/bin/bash
    2 #set -eu # Do not `run set -eu` because it causes some targets to fail
    3 
    4 
    5 ## Constants
    6 #
    7 VER="1_72_0"
    8 
    9 ## Envrionment
    10 #
    11 export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
    12 
    13 # Download source
    14 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
    15 
    16 # Unpack source
    17 tar -zxvf boost_${VER}.tar.gz
    18 
    19 # Cleanup
    20 rm -rf install src
    21 mkdir install src
    22 
    23 # Move source into 'src' directory
    24 mv boost_${VER}/* src/
    25 rm -rf boost_${VER}
    26 
    27 # Configure
    28 cd src
    29 ./bootstrap.sh \
    30         --prefix="${BOOST_ROOT}/install" \
    31         --with-python=python2.7
    32 
    33 # Modify project config to enable MPI
    34 printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
    35 
    36 # Compile and install
    37 ./b2 link=static install
    38 
    39 # Remove any dynamic libraries that may have been compiled
    40 #
    41 # TODO: Reconfigure so that dynamic libraries are not compiled at all
    42 #
    43 rm -f $(find ${BOOST_ROOT}/install/lib -name *.so*)

  • ../trunk-jpl/externalpackages/boost/install-1.72-mac-static.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.72-linux-static.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
     
    1 #!/bin/bash
    2 #set -eu # Do not `run set -eu` because it causes some targets to fail
    3 
    4 
    5 ## Constants
    6 #
    7 VER="1_72_0"
    8 
    9 ## Environment
    10 #
    11 export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
    12 
    13 # Download source
    14 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
    15 
    16 # Unpack source
    17 tar -zxvf boost_${VER}.tar.gz
    18 
    19 # Cleanup
    20 rm -rf install src
    21 mkdir install src
    22 
    23 # Move source into 'src' directory
    24 mv boost_${VER}/* src/
    25 rm -rf boost_${VER}
    26 
    27 # Configure
    28 cd src
    29 ./bootstrap.sh \
    30         --prefix=${BOOST_ROOT}/install \
    31         --with-python=python2.7
    32 
    33 # Modify project config to enable MPI
    34 printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
    35 
    36 # Compile and install
    37 ./b2 link=static install
    38 
    39 # Remove any dynamic libraries that may have been compiled
    40 #
    41 # TODO: Reconfigure so that dynamic libraries are not compiled at all
    42 #
    43 rm -f $(find ${BOOST_ROOT}/install/lib -name *.dylib)

  • ../trunk-jpl/externalpackages/boost/install-1.55-linux-static.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.72-mac-static.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
     
    99## Environment
    1010#
    1111export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
    12 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
     12export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost
    1313
    1414# Download source
    1515$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"

  • ../trunk-jpl/externalpackages/boost/install-1.55-mac-static.sh

     
    3838printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
    3939
    4040# Compile and install
    41 ./bjam toolset=darwin link=static install
     41./bjam link=static install
    4242
    4343# Copy binary to install directory
    4444mkdir ${BOOST_ROOT}/install/bin

  • ../trunk-jpl/externalpackages/boost/install-1.55-stallo.sh

     
    2323
    2424patch src/boost/mpl/aux_/config/adl.hpp ./configs/1.55/adl.hpp.patch
    2525
    26 #Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
     26#Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost
    2727#export PATH="/usr/bin":$PATH
    2828export CXXFLAGS='-std=c++98'
    2929export CC=mpicc

  • ../trunk-jpl/externalpackages/boost/install-1.55-linux.sh

     
    99## Environment
    1010#
    1111export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
    12 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
     12export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost
    1313
    1414# Download source
    1515$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"

  • ../trunk-jpl/externalpackages/boost/install-1.55-mac.sh

     
    3838printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
    3939
    4040# Compile and install
    41 ./bjam toolset=darwin install
     41./bjam install
    4242
    4343# Copy binary to install directory
    4444mkdir ${BOOST_ROOT}/install/bin

  • ../trunk-jpl/externalpackages/boost/install-1.7-linux-static.sh

     
     1#!/bin/bash
     2#set -eu # Do not `run set -eu` because it causes some targets to fail
     3
     4
     5## Constants
     6#
     7VER="1_73_0"
     8
     9## Envrionment
     10#
     11export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
     12
     13# Download source
     14$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
     15
     16# Unpack source
     17tar -zxvf boost_${VER}.tar.gz
     18
     19# Cleanup
     20rm -rf install src
     21mkdir install src
     22
     23# Move source into 'src' directory
     24mv boost_${VER}/* src/
     25rm -rf boost_${VER}
     26
     27# Configure
     28cd src
     29./bootstrap.sh \
     30        --prefix="${BOOST_ROOT}/install" \
     31        --with-python=python2.7
     32
     33# Modify project config to enable MPI
     34printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
     35
     36# Compile and install
     37./b2 link=static install
     38
     39# Remove any dynamic libraries that may have been compiled
     40#
     41# TODO: Reconfigure so that dynamic libraries are not compiled at all
     42#
     43rm -f $(find ${BOOST_ROOT}/install/lib -name *.so*)

  • ../trunk-jpl/externalpackages/boost/install-1.7-mac-static.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.7-linux-static.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
     
     1#!/bin/bash
     2#set -eu # Do not `run set -eu` because it causes some targets to fail
     3
     4
     5## Constants
     6#
     7VER="1_73_0"
     8
     9## Environment
     10#
     11export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
     12
     13# Download source
     14$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
     15
     16# Unpack source
     17tar -zxvf boost_${VER}.tar.gz
     18
     19# Cleanup
     20rm -rf install src
     21mkdir install src
     22
     23# Move source into 'src' directory
     24mv boost_${VER}/* src/
     25rm -rf boost_${VER}
     26
     27# Configure
     28cd src
     29./bootstrap.sh \
     30        --prefix=${BOOST_ROOT}/install \
     31        --with-python=python2.7
     32
     33# Modify project config to enable MPI
     34printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
     35
     36# Compile and install
     37./b2 link=static install
     38
     39# Remove any dynamic libraries that may have been compiled
     40#
     41# TODO: Reconfigure so that dynamic libraries are not compiled at all
     42#
     43rm -f $(find ${BOOST_ROOT}/install/lib -name *.dylib)

  • ../trunk-jpl/externalpackages/boost/install-1.7-linux.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.7-mac-static.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
     
     1#!/bin/bash
     2#set -eu # Do not `run set -eu` because it causes some targets to fail
     3
     4
     5## Constants
     6#
     7VER="1_73_0"
     8
     9## Envrionment
     10#
     11export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
     12
     13# Download source
     14$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
     15
     16# Unpack source
     17tar -zxvf boost_${VER}.tar.gz
     18
     19# Cleanup
     20rm -rf install src
     21mkdir install src
     22
     23# Move source into 'src' directory
     24mv boost_${VER}/* src/
     25rm -rf boost_${VER}
     26
     27# Configure
     28cd src
     29./bootstrap.sh \
     30        --prefix="${BOOST_ROOT}/install" \
     31        --with-python=python2.7
     32
     33# Modify project config to enable MPI
     34printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
     35
     36# Compile and install
     37./b2 install

  • ../trunk-jpl/externalpackages/boost/install-1.7-mac.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.7-linux.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
     
     1#!/bin/bash
     2#set -eu # Do not `run set -eu` because it causes some targets to fail
     3
     4
     5## Constants
     6#
     7VER="1_73_0"
     8
     9## Environment
     10#
     11export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost"
     12
     13# Download source
     14$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/boost_${VER}.tar.gz" "boost_${VER}.tar.gz"
     15
     16# Unpack source
     17tar -zxvf boost_${VER}.tar.gz
     18
     19# Cleanup
     20rm -rf install src
     21mkdir install src
     22
     23# Move source into 'src' directory
     24mv boost_${VER}/* src/
     25rm -rf boost_${VER}
     26
     27# Configure
     28cd src
     29./bootstrap.sh \
     30        --prefix=${BOOST_ROOT}/install \
     31        --with-python=python2.7
     32
     33# Modify project config to enable MPI
     34printf "\n# Enable MPI\nusing mpi ;\n" >> project-config.jam
     35
     36# Compile and install
     37./b2 install
     38
     39# Set install_name for all shared libraries
     40cd ${BOOST_ROOT}/install/lib
     41for name in *.dylib; do
     42        install_name_tool -id ${BOOST_ROOT}/install/lib/${name} ${name}
     43done

  • ../trunk-jpl/externalpackages/gsl/install.sh 

    Property changes on: ../trunk-jpl/externalpackages/boost/install-1.7-mac.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
     
     1#!/bin/bash
     2set -eu
     3
     4
     5# Constants
     6#
     7GSL_ROOT=${ISSM_DIR}/externalpackages/gsl
     8VER="1.15"
     9
     10# Cleanup=
     11rm -rf install src
     12mkdir install src
     13
     14# Download source
     15${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gsl-${VER}.tar.gz" "gsl-${VER}.tar.gz"
     16
     17# Unpack source
     18tar -zxvf gsl-${VER}.tar.gz
     19
     20# Move source to 'src' directory
     21mv gsl-${VER}/* src
     22rm -rf gsl-${VER}
     23
     24# Configure
     25cd src
     26./configure \
     27        --prefix="${GSL_ROOT}/install" \
     28        --disable-static
     29
     30# Compile and install
     31if [ $# -eq 0 ]; then
     32        make
     33        make install
     34else
     35        make -j $1
     36        make -j $1 install
     37fi

  • ../trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota 

    Property changes on: ../trunk-jpl/externalpackages/gsl/install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
     
    4747        autotools       install-debian-linux.sh
    4848        cmake           install.sh
    4949        petsc           install-3.12-linux-static.sh
    50         gsl                     install-linux-static.sh
    51         boost           install-1.72-linux-static.sh
     50        gsl                     install-static.sh
     51        boost           install-1.55-linux-static.sh
    5252        dakota          install-6.2-linux-static.sh
    5353        triangle        install-linux-static.sh
    5454        chaco           install.sh

  • ../trunk-jpl/jenkins/pine_island-mac-dakota

     
    2323        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2424        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2525        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
     26        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
     27        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    2628        --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
    27         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    2829        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
    2930        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
    3031        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
    … …  
    4647        autotools       install.sh
    4748        cmake           install.sh
    4849        petsc           install-3.12-mac.sh
    49         boost           install-1.72-mac.sh
     50        gsl                     install.sh
     51        boost           install-1.7-mac.sh
    5052        dakota          install-6.2-mac.sh
    5153        triangle        install-mac.sh
    5254        chaco           install.sh
    … …  
    7880# - Error is large for test420
    7981# - test701 is skipped because it uses full Stokes equations
    8082#
    81 MATLAB_NROPTIONS="'exclude',[234,243,420,435,444,445,701,702,703,'id',[IdFromString('Dakota')]"
     83MATLAB_NROPTIONS="'exclude',[234,243,420,435,444,445,701,702,703],'id',[IdFromString('Dakota')]"
    8284PYTHON_NROPTIONS="--exclude 234 243 418 420 435 444 445 701 702 703 --include_name 'Dakota'"

  • ../trunk-jpl/jenkins/ross-debian_linux-dakota

     
    3939        autotools       install-debian-linux.sh
    4040        cmake           install.sh
    4141        petsc           install-3.12-linux.sh
    42         gsl                     install-linux.sh
     42        gsl                     install.sh
    4343        boost           install-1.55-linux.sh
    4444        dakota          install-6.2-linux.sh
    4545        triangle        install-linux.sh

  • ../trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh

     
    1111#
    1212export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    1313export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
    14 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
     14export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version)
    1515#export CXXFLAGS='-std=c++11'
    1616export DAK_BUILD=${DAK_ROOT}/build
    1717export DAK_INSTALL=${DAK_ROOT}/install
Note: See TracBrowser for help on using the repository browser.