Index: /issm/trunk-jpl/jenkins/mac-intel-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-basic (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-intel-basic (revision 28053) @@ -1,3 +1,3 @@ -MATLAB_PATH="/Applications/MATLAB_R2022b.app" +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab (revision 28053) @@ -1,3 +1,3 @@ -MATLAB_PATH="/Applications/MATLAB_R2022b.app" +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-intel-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 28053) @@ -4,5 +4,5 @@ # -MATLAB_PATH="/Applications/MATLAB_R2022b.app" +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-intel-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-examples (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-intel-examples (revision 28053) @@ -7,5 +7,5 @@ # -MATLAB_PATH="/Applications/MATLAB_R2022b.app" +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-intel-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-full (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-intel-full (revision 28053) @@ -8,5 +8,5 @@ # -MATLAB_PATH="/Applications/MATLAB_R2022b.app" +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 28053) @@ -7,5 +7,5 @@ # -MATLAB_PATH="/Applications/MATLAB_R2022b.app" +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-silicon-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 28053) @@ -1,15 +1,3 @@ -# NOTE: -# - Currently, this configuration does not compile the MATLAB API. 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. -# -# TODO: -# - Change PROJ installation script to latest version once Jenkins macOS build -# node has been upgraded. -# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# @@ -22,6 +10,6 @@ --enable-development \ --enable-debugging \ - --without-wrappers \ --with-numthreads=8 \ + --with-matlab-dir=${MATLAB_PATH} \ --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -lgfortran" \ --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ @@ -68,5 +56,5 @@ # compilation # -NUMCPUS_INSTALL=4 +NUMCPUS_INSTALL=8 # Number of CPUs used in the nightly runs @@ -77,10 +65,4 @@ # See documentation in test/NightlyRun/runme.* for more information # -# NOTE: -# - Tests 430, 441:442, 470:476 excluded because of large errors. -# - Tests 462-464, 517 excluded because of "Arrays have incompatible sizes for -# this operation." -# - Test 701:703 excluded because they use full Stokes equations -# -MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),430,435,441:442,462:464,470:476,517,701:703]" +MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/mac-silicon-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-dakota (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-silicon-dakota (revision 28053) @@ -1,15 +1,3 @@ -# NOTE: -# - Currently, this configuration does not compile the MATLAB API. 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. -# -# TODO: -# - Change PROJ installation script to latest version once Jenkins macOS build -# node has been upgraded. -# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# @@ -23,4 +11,5 @@ --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 \ Index: /issm/trunk-jpl/jenkins/mac-silicon-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 28053) @@ -1,16 +1,3 @@ -# NOTE: -# - Same configuration as mac-silicon-full -# - Currently, this configuration does not compile the MATLAB API. 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. -# -# TODO: -# - Change PROJ installation script to latest version once Jenkins macOS build -# node has been upgraded. -# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# @@ -24,4 +11,5 @@ --enable-debugging \ --with-numthreads=8 \ + --with-matlab-dir=${MATLAB_PATH} \ --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -lgfortran" \ --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ Index: /issm/trunk-jpl/jenkins/mac-silicon-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-full (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-silicon-full (revision 28053) @@ -1,17 +1,3 @@ -# NOTE: -# - This configuration adds solid earth and Dakota capabilities to the basic -# build. -# - Currently, this configuration does not compile the MATLAB API. 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. -# -# TODO: -# - Change PROJ installation script to latest version once Jenkins macOS build -# node has been upgraded. -# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# @@ -25,4 +11,5 @@ --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 \ Index: /issm/trunk-jpl/jenkins/mac-silicon-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-solid_earth (revision 28052) +++ /issm/trunk-jpl/jenkins/mac-silicon-solid_earth (revision 28053) @@ -1,15 +1,3 @@ -# NOTE: -# - Currently, this configuration does not compile the MATLAB API. 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. -# -# TODO: -# - Change PROJ installation script to latest version once Jenkins macOS build -# node has been upgraded. -# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing +MATLAB_PATH="/Applications/MATLAB_R2023b.app" #--------------------# @@ -22,5 +10,6 @@ --enable-development \ --enable-debugging \ - --with-numthreads=4 \ + --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 \ @@ -100,6 +89,6 @@ # - Excluding 2012 until it can be looked at by Eric ("FindParam error message: Parameter HydrologyModel not set") # - Excluding 2091 until it can be debugged (resource starvation) -# - Excluding 2110:2113 until we can compile MEX modules natively for Silicon and then can debug differences in mesh generation between different platforms # MATLAB_NROPTIONS="'benchmark','slc','exclude',[2004 2006 2012 2051 2052 2053 2085 2424 2425]" -PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2012 2051 2052 2053 2085 2110:2113 2424 2425" +PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2012 2051 2052 2053 2085 2424 2425" +