Index: /issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh (revision 27602) +++ /issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh (revision 27603) @@ -14,9 +14,4 @@ ## Constants -# - -# NOTE: If updating version at all, need to generate new patch for -# configs/${VER}/static/CMakeLists.txt after applying changes from -# previous version # VER="4.10.5" Index: /issm/trunk-jpl/jenkins/jenkins.sh =================================================================== --- /issm/trunk-jpl/jenkins/jenkins.sh (revision 27602) +++ /issm/trunk-jpl/jenkins/jenkins.sh (revision 27603) @@ -471,5 +471,5 @@ # Check that MATLAB did not exit in error - matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab_log.log | wc -l` + matlabExitedInError=`grep -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab_log.log | wc -l` if [ $matlabExitedInError -ne 0 ]; then @@ -524,5 +524,5 @@ # Check that MATLAB did not exit in error - matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab_log_examples.log | wc -l` + matlabExitedInError=`grep -E "Activation cannot proceed|Error in|Illegal use of reserved keyword" matlab_log_examples.log | wc -l` if [ $matlabExitedInError -ne 0 ]; then Index: sm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-2 =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-2 (revision 27602) +++ (revision ) @@ -1,90 +1,0 @@ -#--------------------# -# ISSM Configuration # -#--------------------# - -# NOTE: -# - We can disable dependency tracking in the Autotools because the binaries -# should always be a one-time build. -# - libgfortran will not be available in $ISSM_DIR/lib at compile time: it is -# copied by packaging script. -# - -ISSM_CONFIG='\ - --prefix=${ISSM_DIR} \ - --enable-standalone-executables \ - --enable-standalone-modules \ - --enable-standalone-libraries \ - --disable-dependency-tracking \ - --with-pic \ - --with-python-dir=/usr \ - --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ - --with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \ - --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/petsc/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 \ -' -#-------------------# -# External Packages # -#-------------------# - -EXTERNALPACKAGES=" - autotools install-linux.sh - cmake install.sh - petsc install-3.14-linux-static.sh - gsl install-static.sh - boost install-1.7-linux-static.sh - dakota install-6.2-linux-static.sh - curl install-7-linux-static.sh - netcdf install-4.7-parallel-static.sh - proj install-6-static.sh - gdal install-3-python-static.sh - gshhg install.sh - gmt install-6-linux-static.sh - gmsh install-4-linux-static.sh - triangle install-linux-static.sh - chaco install-linux.sh - m1qn3 install.sh - semic install.sh - shell2junit install.sh -" - -#---------# -# Testing # -#---------# - -# Test suites -MATLAB_TEST=0 -PYTHON_TEST=0 -JAVASCRIPT_TEST=0 -EXAMPLES_TEST=0 - -# Number of CPUs used in ISSM compilation -# -# NOTE: One is usually safer as some packages are very sensitive to parallel -# compilation. -# -NUMCPUS_INSTALL=8 - -# Number of CPUs used in the nightly runs -NUMCPUS_RUN=1 - -# Nightly run options -# -# See documentation in test/NightlyRun/runme.* for more information. -# -MATLAB_NROPTIONS="" -PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27602) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27603) @@ -30,5 +30,5 @@ 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,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # 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,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" @@ -140,5 +140,5 @@ # Check that MATLAB did not exit in error - matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log` + matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log` if [ ${matlabExitedInError} -ne 0 ]; then Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27602) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27603) @@ -30,5 +30,5 @@ 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 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # 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 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 Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27602) +++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27603) @@ -40,5 +40,5 @@ ## 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,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # 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,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_R2022b.app" @@ -146,5 +146,5 @@ # Check that MATLAB did not exit in error - matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log` + matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log` if [ ${matlabExitedInError} -ne 0 ]; then Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27602) +++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27603) @@ -39,5 +39,5 @@ ## 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 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # 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 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 Index: /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh (revision 27602) +++ /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh (revision 27603) @@ -11,5 +11,5 @@ # INSTALL_DIR=${PWD} -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,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # 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,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_R2022b.app" PKG="ISSM-macOS-MATLAB" @@ -34,5 +34,5 @@ # Check that MATLAB did not exit in error matlabExitCode=`echo $?` -matlabExitedInError=`grep -c -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log` +matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log` if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then Index: /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh (revision 27602) +++ /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh (revision 27603) @@ -12,5 +12,5 @@ INSTALL_DIR=${PWD} PKG="ISSM-macOS-Python-3" -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 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # 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 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 COMPRESSED_PKG="${PKG}.zip"