![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 24824
- Timestamp:
- 05/08/20 16:25:24 (5 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 5 added
- 5 deleted
- 15 edited
-
externalpackages/boost/install-1.55-linux-static.sh (modified) (1 diff)
-
externalpackages/boost/install-1.55-linux.sh (modified) (1 diff)
-
externalpackages/boost/install-1.55-mac-static.sh (modified) (1 diff)
-
externalpackages/boost/install-1.55-mac.sh (modified) (1 diff)
-
externalpackages/boost/install-1.55-stallo.sh (modified) (1 diff)
-
externalpackages/boost/install-1.7-linux-static.sh (added)
-
externalpackages/boost/install-1.7-linux.sh (added)
-
externalpackages/boost/install-1.7-mac-static.sh (added)
-
externalpackages/boost/install-1.7-mac.sh (added)
-
externalpackages/boost/install-1.72-linux-static.sh (deleted)
-
externalpackages/boost/install-1.72-linux.sh (deleted)
-
externalpackages/boost/install-1.72-mac-static.sh (deleted)
-
externalpackages/boost/install-1.72-mac.sh (deleted)
-
externalpackages/dakota/install-6.2-linux-static.sh (modified) (1 diff)
-
externalpackages/dakota/install-6.2-linux.sh (modified) (2 diffs)
-
externalpackages/dakota/install-6.2-mac-static.sh (modified) (1 diff)
-
externalpackages/dakota/install-6.2-mac.sh (modified) (2 diffs)
-
externalpackages/dakota/install-6.2-macosx64.sh (deleted)
-
externalpackages/gsl/install.sh (added)
-
jenkins/pine_island-mac-binaries-with_dakota (modified) (2 diffs)
-
jenkins/pine_island-mac-dakota (modified) (3 diffs)
-
jenkins/ross-debian_linux-binaries-with_dakota (modified) (1 diff)
-
jenkins/ross-debian_linux-codipack (modified) (1 diff)
-
jenkins/ross-debian_linux-dakota (modified) (1 diff)
-
m4/issm_options.m4 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/externalpackages/boost/install-1.55-linux-static.sh
r24653 r24824 10 10 # 11 11 export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost" 12 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with M atlab's Boost12 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost 13 13 14 14 # Download source -
issm/trunk-jpl/externalpackages/boost/install-1.55-linux.sh
r24653 r24824 10 10 # 11 11 export BOOST_ROOT="${ISSM_DIR}/externalpackages/boost" 12 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with M atlab's Boost12 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost 13 13 14 14 # Download source -
issm/trunk-jpl/externalpackages/boost/install-1.55-mac-static.sh
r24653 r24824 39 39 40 40 # Compile and install 41 ./bjam toolset=darwinlink=static install41 ./bjam link=static install 42 42 43 43 # Copy binary to install directory -
issm/trunk-jpl/externalpackages/boost/install-1.55-mac.sh
r24653 r24824 39 39 40 40 # Compile and install 41 ./bjam toolset=darwininstall41 ./bjam install 42 42 43 43 # Copy binary to install directory -
issm/trunk-jpl/externalpackages/boost/install-1.55-stallo.sh
r23790 r24824 24 24 patch src/boost/mpl/aux_/config/adl.hpp ./configs/1.55/adl.hpp.patch 25 25 26 #Setting CXXFLAGS to deal with C++11 incompatibility with M atlab's Boost26 #Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost 27 27 #export PATH="/usr/bin":$PATH 28 28 export CXXFLAGS='-std=c++98' -
issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh
r24699 r24824 12 12 export 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 13 13 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install 14 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with M atlab's Boost (absolutely necessary for this version)14 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version) 15 15 #export CXXFLAGS='-std=c++11' 16 16 export DAK_BUILD=${DAK_ROOT}/build -
issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh
r24810 r24824 12 12 export 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 13 13 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install 14 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with M atlab's Boost (absolutely necessary for this version)14 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version) 15 15 #export CXXFLAGS='-std=c++11' 16 16 export DAK_BUILD=${DAK_ROOT}/build … … 53 53 -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \ 54 54 -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \ 55 -DBoost_NO_BOOST_CMAKE=TRUE \ 55 56 -DHAVE_ACRO=OFF \ 56 57 -DHAVE_JEGA=OFF \ -
issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh
r24676 r24824 57 57 -DHAVE_ACRO=OFF \ 58 58 -DHAVE_JEGA=OFF \ 59 -DHAVE_QUESO=ON \ 60 -DDAKOTA_HAVE_GSL=ON \ 59 61 -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \ 60 62 -C${DAK_SRC}/cmake/DakotaDev.cmake \ -
issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh
r24676 r24824 15 15 export DAK_INSTALL=${DAK_ROOT}/install 16 16 export DAK_SRC=${DAK_ROOT}/src 17 export GSL_HOME=${ISSM_DIR}/externalpackages/gsl/install 17 18 export 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 18 19 … … 56 57 -DHAVE_ACRO=OFF \ 57 58 -DHAVE_JEGA=OFF \ 59 -DHAVE_QUESO=ON \ 60 -DDAKOTA_HAVE_GSL=ON \ 58 61 -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \ 59 62 -C${DAK_SRC}/cmake/DakotaDev.cmake \ -
issm/trunk-jpl/jenkins/pine_island-mac-binaries-with_dakota
r24676 r24824 29 29 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ 30 30 --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 \ 31 33 --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \ 32 --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \33 34 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ 34 35 --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ … … 51 52 cmake install.sh 52 53 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 54 56 dakota install-6.2-mac-static.sh 55 57 triangle install-mac-static.sh -
issm/trunk-jpl/jenkins/pine_island-mac-dakota
r24694 r24824 24 24 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ 25 25 --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 \ 26 28 --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \ 27 --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \28 29 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ 29 30 --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ … … 47 48 cmake install.sh 48 49 petsc install-3.12-mac.sh 49 boost install-1.72-mac.sh 50 gsl install.sh 51 boost install-1.7-mac.sh 50 52 dakota install-6.2-mac.sh 51 53 triangle install-mac.sh … … 79 81 # - test701 is skipped because it uses full Stokes equations 80 82 # 81 MATLAB_NROPTIONS="'exclude',[234,243,420,435,444,445,701,702,703 ,'id',[IdFromString('Dakota')]"83 MATLAB_NROPTIONS="'exclude',[234,243,420,435,444,445,701,702,703],'id',[IdFromString('Dakota')]" 82 84 PYTHON_NROPTIONS="--exclude 234 243 418 420 435 444 445 701 702 703 --include_name 'Dakota'" -
issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota
r24814 r24824 48 48 cmake install.sh 49 49 petsc install-3.12-linux-static.sh 50 gsl install- linux-static.sh51 boost install-1. 72-linux-static.sh50 gsl install-static.sh 51 boost install-1.55-linux-static.sh 52 52 dakota install-6.2-linux-static.sh 53 53 triangle install-linux-static.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-codipack
r24811 r24824 39 39 cmake install.sh 40 40 petsc install-3.12-linux.sh 41 gsl install -linux.sh41 gsl install.sh 42 42 triangle install-linux.sh 43 43 chaco install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-dakota
r24811 r24824 40 40 cmake install.sh 41 41 petsc install-3.12-linux.sh 42 gsl install -linux.sh42 gsl install.sh 43 43 boost install-1.55-linux.sh 44 44 dakota install-6.2-linux.sh -
issm/trunk-jpl/m4/issm_options.m4
r24811 r24824 537 537 538 538 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 541 545 dnl - We know $DAKOTA_ROOT cannot be empty at this point, so no need to 542 546 dnl check again in the following conditionals … … 568 572 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then 569 573 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}" 578 578 fi 579 579 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H]) … … 607 607 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" 608 608 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" 614 610 DAKOTALIB+=" ${BLASLAPACKLIB}" 615 611 fi
Note:
See TracChangeset
for help on using the changeset viewer.
