Changeset 28120

Timestamp:

02/29/24 20:05:03 (13 months ago)

Author:

jdquinn

Message:

CHG: Bypassing test456 (for now); added macOS Silicon Python build to quickly determine if test is failing because of architecture or API

Location:

issm/trunk-jpl

Files:

• jenkins/mac-silicon-basic (modified) (1 diff)
• jenkins/mac-silicon-python (copied) (copied from issm/trunk-jpl/jenkins/mac-silicon-full ) (6 diffs)
• packagers/linux/package-issm-linux-binaries-matlab.sh (modified) (1 diff)
• packagers/linux/package-issm-linux-binaries-python-3.sh (modified) (1 diff)
• packagers/mac/package-issm-mac-binaries-matlab.sh (modified) (1 diff)
• packagers/mac/package-issm-mac-binaries-python-3.sh (modified) (1 diff)
• packagers/win/package-issm-win-binaries-matlab.sh (modified) (1 diff)

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

@@ -66 +66 @@
 #
 # NOTE:
-# - Tests 216, 274, 430, 435, 441:442, 470:476, 517 are excluded because of large errors
+# - Tests 216, 274, 430, 435, 441:442, 456, 470:476, 517 are excluded because of large errors
 # - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 808 are excluded because of failure "Arrays have incompatible sizes for this operation."
 #
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,462:464,470:476,508,517,544,546,808]"
+MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,456,462:464,470:476,508,517,544,546,808]"
 PYTHON_NROPTIONS=""

issm/trunk-jpl/jenkins/mac-silicon-python ¶

@@ -1 @@
-MATLAB_PATH="/Applications/MATLAB_R2023b.app"
-
 #--------------------#
 # ISSM Configuration #
@@ -11 +9 @@
         --enable-debugging \
         --with-numthreads=8 \
-        --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 \
@@ -43 +40 @@
         cmake           install.sh
         petsc           install-3.17-mac-silicon.sh
-        gsl                     install.sh
-        boost           install-1.7-mac.sh
-        dakota          install-6.2-mac.sh
-        chaco           install-mac.sh
-        curl            install-7-mac.sh
-        hdf5            install-1-parallel.sh
-        netcdf          install-4.7-parallel.sh
-        proj            install-6.sh
-        gdal            install-3-python.sh
-        gshhg           install.sh
-        gmt                     install-6-mac.sh
-        gmsh            install-4-mac.sh
         triangle        install-mac.sh
         m1qn3           install-mac.sh
@@ -67 +52 @@
 # Test suites
 MATLAB_TEST=0
-PYTHON_TEST=0
+PYTHON_TEST=1
 JAVASCRIPT_TEST=0
 EXAMPLES_TEST=0
@@ -76 +61 @@
 #               compilation
 #
-NUMCPUS_INSTALL=4
+NUMCPUS_INSTALL=8
 
 # Number of CPUs used in the nightly runs
@@ -82 +67 @@
 
 # Nightly run options
+#
+# See documentation in test/NightlyRun/runme.* for more information
+#
+# NOTE:
+# - Tests 216, 274, 430, 435, 441:442, 456, 470:476, 517 are excluded because of large errors
+# - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 808 are excluded because of failure "Arrays have incompatible sizes for this operation."
+#
 MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS=""
+PYTHON_NROPTIONS="--exclude 234 418 420"
+

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh ¶

@@ -30 +30 @@
 LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
 LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
-MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
+MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
 

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh ¶

@@ -30 +30 @@
 LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
 LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
-PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
+PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 456 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
 
 ## Environment

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh ¶

@@ -39 +39 @@
 ## Constants
 #
-MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
+MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
 MATLAB_PATH="/Applications/MATLAB_R2023b.app"
 

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh ¶

@@ -38 +38 @@
 ## Constants
 #
-PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
+PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 456 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
 
 ## Environment

issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh ¶

@@ -32 +32 @@
 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126,129,435,701,702,703]"
 #MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
-MATLAB_PATH=$(cygpath -u $(cygpath -ms "/c/Program Files/MATLAB/R2019b"))
+MATLAB_PATH=$(cygpath -u $(cygpath -ms "/c/Program Files/MATLAB/R2023b"))
 MSMPI_ROOT="${ISSM_DIR}/externalpackages/msmpi/install"