Changeset 24632
- Timestamp:
- 03/03/20 13:58:31 (5 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 2 added
- 12 deleted
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/etc/environment.sh
r24611 r24632 196 196 if [ -d "$PETSC_DIR" ]; then 197 197 export PETSC_DIR 198 path_prepend "${PETSC_DIR}/bin" # In case we have installed MPICH via PETSc 198 199 ld_library_path_append "${PETSC_DIR}/lib" 199 200 fi -
issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh
r24593 r24632 6 6 # 7 7 DAK_ROOT=${ISSM_DIR}/externalpackages/dakota 8 MPI_INSTALL=${ISSM_DIR}/externalpackages/ mpich/install8 MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install 9 9 VER="6.2" 10 10 11 11 ## Environment 12 12 # 13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/ lapack/install/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it 14 14 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install 15 15 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version) … … 18 18 export DAK_INSTALL=${DAK_ROOT}/install 19 19 export DAK_SRC=${DAK_ROOT}/src 20 export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/ lapack/install/lib -llapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it20 export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it 21 21 export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples 22 22 -
issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh
r24593 r24632 6 6 # 7 7 DAK_ROOT=${ISSM_DIR}/externalpackages/dakota 8 MPI_INSTALL=${ISSM_DIR}/externalpackages/ mpich/install8 MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install 9 9 VER="6.2" 10 10 11 11 ## Environment 12 12 # 13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/ lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it 14 14 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install 15 15 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version) … … 18 18 export DAK_INSTALL=${DAK_ROOT}/install 19 19 export DAK_SRC=${DAK_ROOT}/src 20 export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/ lapack/install/lib -llapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it20 export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it 21 21 export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples 22 22 -
issm/trunk-jpl/jenkins/ross-debian_linux
r24593 r24632 12 12 --with-matlab-dir=${MATLAB_PATH} \ 13 13 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 14 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \15 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \16 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \14 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 15 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 16 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 17 17 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 18 18 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 32 32 autotools install-debian-linux.sh 33 33 cmake install.sh 34 mpich install-3.3.sh 35 lapack install-3.8-linux.sh 36 petsc install-3.7-linux.sh 34 petsc install-3.12-linux.sh 37 35 triangle install-linux.sh 38 36 chaco install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff
r24593 r24632 18 18 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ 19 19 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 20 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \21 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \20 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 21 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 22 22 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 23 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \23 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 24 24 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 25 25 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 40 40 autotools install-debian-linux.sh 41 41 cmake install.sh 42 mpich install-3.3.sh 43 lapack install-3.8-linux.sh 44 petsc install-3.7-linux.sh 42 petsc install-3.12-linux.sh 45 43 triangle install-linux.sh 46 44 gsl install-linux64.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion
r24593 r24632 18 18 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ 19 19 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 20 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \21 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \20 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 21 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 22 22 --with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \ 23 23 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 24 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \24 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 25 25 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 26 26 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 41 41 autotools install-debian-linux.sh 42 42 cmake install.sh 43 mpich install-3.3.sh 44 lapack install-3.8-linux.sh 45 petsc install-3.7-linux.sh 43 petsc install-3.12-linux.sh 46 44 triangle install-linux.sh 47 45 gsl install-linux64.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-binaries
r24593 r24632 18 18 --with-matlab-dir=${MATLAB_PATH} \ 19 19 --with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \ 20 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \21 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \22 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \20 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 21 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 22 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 23 23 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 24 24 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 37 37 autotools install-debian-linux.sh 38 38 cmake install.sh 39 mpich install-3.3-static.sh 40 lapack install-3.8-linux-static.sh 41 petsc install-3.7-linux-static.sh 39 petsc install-3.12-linux-static.sh 42 40 triangle install-linux-static.sh 43 41 chaco install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota
r24593 r24632 21 21 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ 22 22 --with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \ 23 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \24 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \25 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \23 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 24 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 25 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 26 26 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 27 27 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 43 43 autotools install-debian-linux.sh 44 44 cmake install.sh 45 mpich install-3.3-static.sh 46 lapack install-3.8-linux-static.sh 47 petsc install-3.7-linux-static.sh 45 petsc install-3.12-linux-static.sh 48 46 boost install-1.55-linux-static.sh 49 47 dakota install-6.2-linux-static.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-codipack
r24593 r24632 16 16 --with-matlab-dir=${MATLAB_PATH} \ 17 17 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 18 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \19 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \20 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \18 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 19 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 20 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 21 21 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 22 22 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 38 38 autotools install-debian-linux.sh 39 39 cmake install.sh 40 mpich install-3.3.sh 41 lapack install-3.8-linux.sh 42 petsc install-3.7-linux.sh 40 petsc install-3.12-linux.sh 43 41 triangle install-linux.sh 44 42 chaco install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-dakota
r24593 r24632 16 16 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ 17 17 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 18 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \19 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \20 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \18 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 19 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 20 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 21 21 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 22 22 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 38 38 autotools install-debian-linux.sh 39 39 cmake install.sh 40 mpich install-3.3.sh 41 lapack install-3.8-linux.sh 42 petsc install-3.7-linux.sh 40 petsc install-3.12-linux.sh 43 41 boost install-1.55-linux.sh 44 42 dakota install-6.2-linux.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-gia
r24593 r24632 15 15 --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \ 16 16 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 17 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \18 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \19 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \17 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 18 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 19 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 20 20 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 21 21 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 33 33 autotools install-debian-linux.sh 34 34 cmake install.sh 35 mpich install-3.3.sh 36 lapack install-3.8-linux.sh 37 petsc install-3.7-linux.sh 35 petsc install-3.12-linux.sh 38 36 triangle install-linux.sh 39 37 math77 install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-iceocean
r24593 r24632 13 13 --with-matlab-dir=${MATLAB_PATH} \ 14 14 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 15 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \16 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \17 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \15 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 16 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 17 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 18 18 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 19 19 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 33 33 autotools install-debian-linux.sh 34 34 cmake install.sh 35 mpich install-3.3.sh 36 lapack install-3.8-linux.sh 37 petsc install-3.7-linux.sh 35 petsc install-3.12-linux.sh 38 36 triangle install-linux.sh 39 37 chaco install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-javascript
r24599 r24632 4 4 5 5 ISSM_CONFIG='\ 6 7 8 9 10 11 12 13 14 15 16 17 6 --prefix=${ISSM_DIR} \ 7 --disable-shared \ 8 --enable-development \ 9 --enable-debugging \ 10 --with-javascript \ 11 --without-fortran \ 12 --without-GiaIvins \ 13 --without-Love \ 14 --without-kml \ 15 --without-kriging \ 16 --with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install-javascript" \ 17 --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \ 18 18 ' 19 19 … … 23 23 24 24 EXTERNALPACKAGES=" 25 autotoolsinstall-debian-linux.sh26 cmakeinstall.sh27 emscripteninstall.sh28 gslinstall-javascript.sh29 triangleinstall-linux-javascript.sh30 shell2junitinstall.sh25 autotools install-debian-linux.sh 26 cmake install.sh 27 emscripten install.sh 28 gsl install-javascript.sh 29 triangle install-linux-javascript.sh 30 shell2junit install.sh 31 31 " 32 32 … … 44 44 # 45 45 # NOTE: One is usually safer as some packages are very sensitive to parallel 46 # 46 # compilation. 47 47 # 48 48 NUMCPUS_INSTALL=8 -
issm/trunk-jpl/jenkins/ross-debian_linux-python
r24593 r24632 12 12 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ 13 13 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 14 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \15 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \16 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \14 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 15 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 16 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 17 17 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 18 18 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 29 29 #-------------------# 30 30 31 # TODO:32 # - After upgrading Jenkins nodes to Ubuntu 18, use MPICH 3.3 and PETSc 3.1133 # (which will install zlib, HDF5, and NetCDF).34 #35 31 EXTERNALPACKAGES=" 36 32 autotools install-debian-linux.sh 37 33 cmake install.sh 38 mpich install-3.3.sh 39 lapack install-3.8-linux.sh 40 petsc install-3.7-linux.sh 34 petsc install-3.12-linux.sh 41 35 triangle install-linux.sh 42 36 chaco install.sh -
issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth
r24593 r24632 14 14 --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ 15 15 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \ 16 --with-mpi-include=${ISSM_DIR}/externalpackages/ mpich/install/include \17 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/ mpich/install/lib -lmpi -lmpicxx -lmpifort" \18 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/ lapack/install \16 --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ 17 --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ 18 --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ 19 19 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ 20 20 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ … … 32 32 autotools install-debian-linux.sh 33 33 cmake install.sh 34 mpich install-3.3.sh 35 lapack install-3.8-linux.sh 36 petsc install-3.7-linux.sh 34 petsc install-3.12-linux.sh 37 35 triangle install-linux.sh 38 36 chaco install.sh -
issm/trunk-jpl/m4/issm_options.m4
r24620 r24632 585 585 if test "${BOOST_VERSION_MINOR}" == "55"; then 586 586 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" 587 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 -L${BLASLAPACK_ROOT}/lib -llapack -lblas"587 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}" 588 588 elif test "${BOOST_VERSION_MINOR}" = "72"; then 589 589 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" 590 590 dnl See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota -> Dakota_LIBRARIES 591 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 -L${BLASLAPACK_ROOT}/lib -llapack -lblas"591 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}" 592 592 fi 593 593 fi … … 598 598 if test "${BOOST_VERSION_MINOR}" == "55"; then 599 599 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" 600 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 -L${BLASLAPACK_ROOT}/lib -llapack -lblas"600 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}" 601 601 elif test "${BOOST_VERSION_MINOR}" == "72"; then 602 602 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" 603 DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -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 -L${BLASLAPACK_ROOT}/lib -llapack -lblas"603 DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -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}" 604 604 fi 605 605 fi … … 1102 1102 fi 1103 1103 AM_CONDITIONAL([MEDIPACK], [test "x${HAVE_MEDIPACK}" == "xyes"]) 1104 dnl }}} 1105 dnl PETSc{{{ 1106 AC_ARG_WITH( 1107 [petsc-dir], 1108 AS_HELP_STRING([--with-petsc-dir=DIR], [PETSc root directory, necessary for parallel build]), 1109 [PETSC_ROOT=${withval}], 1110 [PETSC_ROOT="no"] 1111 ) 1112 AC_MSG_CHECKING([for PETSc]) 1113 if test "x${PETSC_ROOT}" == "xno"; then 1114 HAVE_PETSC=no 1115 else 1116 HAVE_PETSC=yes 1117 if ! test -d "${PETSC_ROOT}"; then 1118 AC_MSG_ERROR([PETSc directory provided (${PETSC_ROOT}) does not exist!]); 1119 fi 1120 fi 1121 AC_MSG_RESULT([${HAVE_PETSC}]) 1122 AM_CONDITIONAL([PETSC], [test "x${HAVE_PETSC}" == "xyes"]) 1123 1124 dnl PETSc libraries and header files 1125 if test "x${HAVE_PETSC}" == "xyes"; then 1126 AC_MSG_CHECKING(for PETSc version) 1127 if ! test -f "${PETSC_ROOT}/include/petscversion.h"; then 1128 AC_MSG_ERROR([PETSc not instaled correctly: file (${PETSC_ROOT}/include/petscversion.h) does not exist!]); 1129 fi 1130 PETSC_MAJOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'` 1131 PETSC_MINOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'` 1132 AC_DEFINE_UNQUOTED(_PETSC_MAJOR_, $PETSC_MAJOR, [PETSc version major]) 1133 AC_DEFINE_UNQUOTED(_PETSC_MINOR_, $PETSC_MINOR, [PETSc version minor]) 1134 AC_MSG_RESULT([${PETSC_MAJOR}.${PETSC_MINOR}]) 1135 1136 dnl PETSC_VERSION_DATE_HG=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' ` 1137 PETSC_RELEASE=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_RELEASE" | sed 's/#define PETSC_VERSION_RELEASE//' | sed 's/ //g'` 1138 1139 AC_MSG_CHECKING(whether PETSc is the development version) 1140 dnl if test "x${PETSC_VERSION_DATE_HG}" == "xunknown"; then 1141 if test "${PETSC_RELEASE}" == "0"; then 1142 AC_DEFINE([_HAVE_PETSCDEV_], [1], [with PETSc-dev]) 1143 AC_MSG_RESULT([yes]) 1144 else 1145 AC_MSG_RESULT([no]) 1146 fi 1147 1148 AC_ARG_WITH( 1149 [petsc-arch], 1150 AS_HELP_STRING([--with-petsc-arch=DIR], [PETSc arch, necessary for PETSc < 3.0]), 1151 [PETSC_ARCH=${withval}], 1152 [PETSC_ARCH=""] 1153 ) 1154 1155 AC_MSG_CHECKING(for PETSc libraries and header files in ${PETSC_ROOT}) 1156 dnl To get PETSc's libraries, 1157 dnl 1158 dnl cd $ISSM_DIR/externalpackages/petsc/src 1159 dnl make getlinklibs 1160 dnl 1161 PETSCINCL=" -I${PETSC_ROOT}/include" 1162 dnl Add other location (not needed anymore since at least PETSc 3.0) 1163 if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/${PETSC_ARCH}/include"; then 1164 PETSCINCL+=" ${PETSC_ROOT}/${PETSC_ARCH}/include" 1165 fi 1166 if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/include/${PETSC_ARCH}"; then 1167 PETSCINCL+=" ${PETSC_ROOT}/include/${PETSC_ARCH}" 1168 fi 1169 1170 case "${host_os}" in 1171 *cygwin*) 1172 if test ${PETSC_MAJOR} -lt 3; then 1173 PETSCLIB=-Wl,/LIBPATH:`cygpath -w ${PETSC_ROOT}/lib` -Wl,libpetscksp.lib -Wl,libpetscdm.lib -Wl,libpetscmat.lib -Wl,libpetscvec.lib -Wl,libpetscsnes.lib -Wl,libpetscts.lib -Wl,libmpiuni.lib -Wl,libpetsc.lib 1174 else 1175 PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m ${PETSC_ROOT}/lib` -Wl,libpetsc.lib" 1176 PETSCINCL="/I`cygpath -m ${PETSC_ROOT}/include`" 1177 fi 1178 ;; 1179 *linux*) 1180 if test ${PETSC_MAJOR} -lt 3; then 1181 PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc" 1182 else 1183 PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl" 1184 if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then 1185 PETSCLIB+=" -lparmetis -lmetis" 1186 fi 1187 fi 1188 if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then 1189 PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis" 1190 fi 1191 ;; 1192 *darwin*) 1193 if test ${PETSC_MAJOR} -lt 3; then 1194 PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc" 1195 else 1196 PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc" 1197 if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then 1198 PETSCLIB+=" -lmetis" 1199 fi 1200 fi 1201 ;; 1202 esac 1203 AC_MSG_RESULT([done]) 1204 AC_DEFINE([_HAVE_PETSC_], [1], [with PETSc in ISSM src]) 1205 AC_SUBST([PETSCINCL]) 1206 AC_SUBST([PETSCLIB]) 1207 fi 1104 1208 dnl }}} 1105 1209 dnl MPI{{{ … … 1167 1271 AM_CONDITIONAL([MPI], [test "x${HAVE_MPI}" == "xyes"]) 1168 1272 AC_MSG_RESULT([${HAVE_MPI}]) 1169 dnl }}}1170 dnl PETSc{{{1171 AC_ARG_WITH(1172 [petsc-dir],1173 AS_HELP_STRING([--with-petsc-dir=DIR], [PETSc root directory, necessary for parallel build]),1174 [PETSC_ROOT=${withval}],1175 [PETSC_ROOT="no"]1176 )1177 AC_MSG_CHECKING([for PETSc])1178 if test "x${PETSC_ROOT}" == "xno"; then1179 HAVE_PETSC=no1180 else1181 HAVE_PETSC=yes1182 if ! test -d "${PETSC_ROOT}"; then1183 AC_MSG_ERROR([PETSc directory provided (${PETSC_ROOT}) does not exist!]);1184 fi1185 fi1186 AC_MSG_RESULT([${HAVE_PETSC}])1187 AM_CONDITIONAL([PETSC], [test "x${HAVE_PETSC}" == "xyes"])1188 1189 dnl PETSc libraries and header files1190 if test "x${HAVE_PETSC}" == "xyes"; then1191 AC_MSG_CHECKING(for PETSc version)1192 if ! test -f "${PETSC_ROOT}/include/petscversion.h"; then1193 AC_MSG_ERROR([PETSc not instaled correctly: file (${PETSC_ROOT}/include/petscversion.h) does not exist!]);1194 fi1195 PETSC_MAJOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`1196 PETSC_MINOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`1197 AC_DEFINE_UNQUOTED(_PETSC_MAJOR_, $PETSC_MAJOR, [PETSc version major])1198 AC_DEFINE_UNQUOTED(_PETSC_MINOR_, $PETSC_MINOR, [PETSc version minor])1199 AC_MSG_RESULT([${PETSC_MAJOR}.${PETSC_MINOR}])1200 1201 dnl PETSC_VERSION_DATE_HG=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `1202 PETSC_RELEASE=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_RELEASE" | sed 's/#define PETSC_VERSION_RELEASE//' | sed 's/ //g'`1203 1204 AC_MSG_CHECKING(whether PETSc is the development version)1205 dnl if test "x${PETSC_VERSION_DATE_HG}" == "xunknown"; then1206 if test "${PETSC_RELEASE}" == "0"; then1207 AC_DEFINE([_HAVE_PETSCDEV_], [1], [with PETSc-dev])1208 AC_MSG_RESULT([yes])1209 else1210 AC_MSG_RESULT([no])1211 fi1212 1213 AC_ARG_WITH(1214 [petsc-arch],1215 AS_HELP_STRING([--with-petsc-arch=DIR], [PETSc arch, necessary for PETSc < 3.0]),1216 [PETSC_ARCH=${withval}],1217 [PETSC_ARCH=""]1218 )1219 1220 AC_MSG_CHECKING(for PETSc libraries and header files in ${PETSC_ROOT})1221 dnl To get PETSc's libraries,1222 dnl1223 dnl cd $ISSM_DIR/externalpackages/petsc/src1224 dnl make getlinklibs1225 dnl1226 PETSCINCL=" -I${PETSC_ROOT}/include"1227 dnl Add other location (not needed anymore since at least PETSc 3.0)1228 if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/${PETSC_ARCH}/include"; then1229 PETSCINCL+=" ${PETSC_ROOT}/${PETSC_ARCH}/include"1230 fi1231 if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/include/${PETSC_ARCH}"; then1232 PETSCINCL+=" ${PETSC_ROOT}/include/${PETSC_ARCH}"1233 fi1234 1235 case "${host_os}" in1236 *cygwin*)1237 if test ${PETSC_MAJOR} -lt 3; then1238 PETSCLIB=-Wl,/LIBPATH:`cygpath -w ${PETSC_ROOT}/lib` -Wl,libpetscksp.lib -Wl,libpetscdm.lib -Wl,libpetscmat.lib -Wl,libpetscvec.lib -Wl,libpetscsnes.lib -Wl,libpetscts.lib -Wl,libmpiuni.lib -Wl,libpetsc.lib1239 else1240 PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m ${PETSC_ROOT}/lib` -Wl,libpetsc.lib"1241 PETSCINCL="/I`cygpath -m ${PETSC_ROOT}/include`"1242 fi1243 ;;1244 *linux*)1245 if test ${PETSC_MAJOR} -lt 3; then1246 PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc"1247 else1248 PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl"1249 if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then1250 PETSCLIB+=" -lparmetis -lmetis"1251 fi1252 fi1253 if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then1254 PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis"1255 fi1256 ;;1257 *darwin*)1258 if test ${PETSC_MAJOR} -lt 3; then1259 PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"1260 else1261 PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc"1262 if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then1263 PETSCLIB+=" -lmetis"1264 fi1265 fi1266 ;;1267 esac1268 AC_MSG_RESULT([done])1269 AC_DEFINE([_HAVE_PETSC_], [1], [with PETSc in ISSM src])1270 AC_SUBST([PETSCINCL])1271 AC_SUBST([PETSCLIB])1272 fi1273 1273 dnl }}} 1274 1274 dnl SCOTCH{{{ … … 1599 1599 if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then 1600 1600 BLASLAPACKLIB+=" -lopenblas" 1601 elif ls ${BLASLAPACK_ROOT}/lib/liblapack.* 1> /dev/null 2>&1; then 1601 elif ls ${BLASLAPACK_ROOT}/lib/libf2clapack.* 1> /dev/null 2>&1; then 1602 BLASLAPACKLIB+=" -lf2clapack -lf2cblas" 1603 elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then 1604 BLASLAPACKLIB+=" -lflapack -lfblas" 1605 else 1602 1606 BLASLAPACKLIB+=" -llapack -lblas" 1603 else1604 BLASLAPACKLIB+=" -lflapack -lfblas"1605 1607 fi 1606 1608 ;; … … 1609 1611 if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then 1610 1612 BLASLAPACKLIB+=" -lopenblas" 1611 elif ls ${BLASLAPACK_ROOT}/lib/liblapack.* 1> /dev/null 2>&1; then 1613 elif ls ${BLASLAPACK_ROOT}/lib/libf2clapack.* 1> /dev/null 2>&1; then 1614 BLASLAPACKLIB+=" -lf2clapack -lf2cblas" 1615 elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then 1616 BLASLAPACKLIB+=" -lflapack -lfblas" 1617 else 1612 1618 BLASLAPACKLIB+=" -llapack -lblas" 1613 else1614 BLASLAPACKLIB+=" -lflapack -lfblas"1615 1619 fi 1616 1620 ;; -
issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh
r24593 r24632 34 34 35 35 echo "Moving MPICH binaries to bin/" 36 if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then 36 if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then 37 cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec . 38 cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy . 39 elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then 37 40 cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec . 38 41 cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy . 39 42 else 40 43 echo "MPICH not found" 44 exit 1 41 45 fi 42 46 … … 127 131 python -m compileall ${PACKAGE}/bin # Precompile all Python scripts to bytecode 128 132 rm -f ${PACKAGE}/bin/*.py # Remove all Python scripts 133 rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes 129 134 rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package 130 135 rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package -
issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh
r24593 r24632 23 23 echo "Modify generic" 24 24 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m 25 rm generic_static.m26 25 27 26 echo "Moving MPICH binaries to bin/" 28 if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then 27 if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then 28 cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec . 29 cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy . 30 elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then 29 31 cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec . 30 cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy 32 cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy . 31 33 else 32 34 echo "MPICH not found" 35 exit 1 33 36 fi 34 37 … … 80 83 cp -rf bin examples lib scripts test ${PACKAGE}/ 81 84 echo "Cleaning up unneeded/unwanted files" 85 rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes 82 86 rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package 83 87 rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package
Note:
See TracChangeset
for help on using the changeset viewer.