Changeset 27542

Timestamp:

01/31/23 13:51:23 (2 years ago)

Author:

jdquinn

Message:

BUG: Fixes for new Jenkins configs

Location:

issm/trunk-jpl/jenkins

Files:

• mac-intel-basic (modified) (1 diff)
• mac-silicon-basic (copied) (copied from issm/trunk-jpl/jenkins/mac-intel-basic ) (6 diffs)

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

@@ -12 +12 @@
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="-L/usr/local/Cellar/gcc/11.3.0/lib/gcc/11 -lgfortran" \
+        --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" \

issm/trunk-jpl/jenkins/mac-silicon-basic

@@ +1 @@
+# NOTE: 
+# - Currently, this configuration does not compile the MATLAB and Python 
+#       APIs. After compiling, you will need to download the ISSM pre-compiled 
+#       binaries from https://issm.jpl.nasa.gov/download/binaries, copy the 
+#       contents of lib/ to $ISSM_DIR/lib-precompiled, then add 
+#       $ISSM_DIR/lib-precompiled to the path in MATLAB or Python.
+#
+
 #--------------------#
 # ISSM Configuration #
@@ -10 +18 @@
         --enable-development \
         --enable-debugging \
-        --with-numthreads=4 \
+        --without-wrappers \
+        --with-numthreads=8 \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="-L/usr/local/Cellar/gcc/11.3.0/lib/gcc/11 -lgfortran" \
+        --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -35 +44 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.17-mac-intel.sh
+        petsc           install-3.17-mac-silicon.sh
         triangle        install-mac.sh
         chaco           install-mac.sh
@@ -48 +57 @@
 
 # Test suites
-MATLAB_TEST=1
+MATLAB_TEST=0
 PYTHON_TEST=0
 JAVASCRIPT_TEST=0
@@ -61 +70 @@
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
+NUMCPUS_RUN=1
 
 # Nightly run options
@@ -67 +76 @@
 # See documentation in test/NightlyRun/runme.* for more information
 #
-# NOTE:
-# - test701 is skipped because it uses full Stokes equations
-#
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
+MATLAB_NROPTIONS=""
 PYTHON_NROPTIONS=""