Changeset 27698 for issm/trunk-jpl/jenkins/mac-intel-full

Timestamp:

04/20/23 13:11:23 (2 years ago)

Author:

jdquinn

Message:

CHG: Standardizing HDF5 installation for builds that need it

File:

• issm/trunk-jpl/jenkins/mac-intel-full (copied) (copied from issm/trunk-jpl/jenkins/mac-silicon-full ) (2 diffs)

issm/trunk-jpl/jenkins/mac-intel-full

@@ -20 +20 @@
         --enable-development \
         --enable-debugging \
-        --with-numthreads=8 \
+        --with-numthreads=4 \
+        --with-matlab-dir=${MATLAB_PATH} \
         --with-python-version=3.9 \
         --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
         --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
         --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \
-        --with-mpi-include=${ISSM_EXT_DIR}/shared/petsc/install/include \
-        --with-mpi-libflags="-L${ISSM_EXT_DIR}/shared/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
-        --with-blas-lapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-metis-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-parmetis-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-scalapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-mumps-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-hdf5-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-petsc-dir=${ISSM_EXT_DIR}/shared/petsc/install \
-        --with-gsl-dir=${ISSM_EXT_DIR}/shared/gsl/install \
-        --with-boost-dir=${ISSM_EXT_DIR}/shared/boost/install \
-        --with-dakota-dir=${ISSM_EXT_DIR}/shared/dakota/install \
-        --with-proj-dir=${ISSM_EXT_DIR}/shared/proj/install \
-        --with-triangle-dir=${ISSM_EXT_DIR}/shared/triangle/install \
-        --with-chaco-dir=${ISSM_EXT_DIR}/chaco/install \
-        --with-m1qn3-dir=${ISSM_EXT_DIR}/m1qn3/install \
-        --with-semic-dir=${ISSM_EXT_DIR}/semic/install \
+        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \
+        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
+        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
+        --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
+        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
+        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
+        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
+        --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
 '
 
@@ -51 +52 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.17-mac-silicon.sh
+        petsc           install-3.14-mac.sh
         gsl                     install.sh
         boost           install-1.7-mac.sh
         dakota          install-6.2-mac.sh
         curl            install-7-mac.sh
+        hdf5            install-1-parallel.sh
         netcdf          install-4.7-parallel.sh
         proj            install-6.sh