Changeset 27550

Timestamp:

02/02/23 11:07:00 (2 years ago)

Author:

jdquinn

Message:

ADD: Configs for new macOS Intel machine

Location:

issm/trunk-jpl/jenkins

Files:

• mac-intel-dakota (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac-dakota ) (3 diffs)
• mac-intel-examples (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac-examples ) (5 diffs)
• mac-intel-solid_earth (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac-solid_earth ) (3 diffs)

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

@@ -7 +7 @@
 #--------------------#
 
-MATLAB_PATH="/Applications/MATLAB_R2018a.app"
+MATLAB_PATH="/Applications/MATLAB_R2022b.app"
 
 ISSM_CONFIG='\
@@ -16 +16 @@
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
-        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
-        --with-fortran-lib="-L/usr/local/Cellar/gcc/11.3.0/lib/gcc/11 -lgfortran" \
+        --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/usr/local/Cellar/gcc@11/11.3.0/lib/gcc/11 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -46 +47 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.12-mac.sh
+        petsc           install-3.14-mac.sh
         gsl                     install.sh
         boost           install-1.7-mac.sh

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

@@ -1 @@
-# NOTE: Same configuration as pine_island-mac-full
+# NOTE: Same configuration as mac-intel-full
 #
 # TODO: Change PROJ installation script to latest version once Jenkins macOS 
@@ -9 +9 @@
 #--------------------#
 
-MATLAB_PATH="/Applications/MATLAB_R2018a.app"
+MATLAB_PATH="/Applications/MATLAB_R2022b.app"
 
 ISSM_CONFIG='\
@@ -18 +18 @@
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
-        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
-        --with-fortran-lib="-L/usr/local/Cellar/gcc/11.3.0/lib/gcc/11 -lgfortran" \
+        --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/usr/local/Cellar/gcc@11/11.3.0/lib/gcc/11 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -47 +48 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.12-mac.sh
+        petsc           install-3.14-mac.sh
         gsl                     install.sh
         boost           install-1.7-mac.sh
@@ -80 +81 @@
 #               compilation
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=1
+NUMCPUS_RUN=2
 
 # Nightly run options

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

@@ -7 +7 @@
 #--------------------#
 
-MATLAB_PATH="/Applications/MATLAB_R2018a.app"
+MATLAB_PATH="/Applications/MATLAB_R2022b.app"
 
 ISSM_CONFIG='\
@@ -16 +16 @@
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
-        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
-        --with-fortran-lib="-L/usr/local/Cellar/gcc/11.3.0/lib/gcc/11 -lgfortran" \
+        --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/usr/local/Cellar/gcc@11/11.3.0/lib/gcc/11 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -46 +47 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.12-mac.sh
+        petsc           install-3.14-mac.sh
         gsl                     install.sh
         boost           install-1.7-mac.sh