Index: /issm/trunk-jpl/jenkins/mac-intel-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27702) @@ -1,4 +1,5 @@ -# TODO: Change PROJ installation script to latest version once Jenkins macOS -# build node has been upgraded. +# TODO: +# - Change PROJ installation script to latest version once Jenkins macOS build +# node has been upgraded. # Index: /issm/trunk-jpl/jenkins/mac-intel-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-examples (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-intel-examples (revision 27702) @@ -1,6 +1,8 @@ -# NOTE: Same configuration as mac-intel-full +# NOTE: +# - Same configuration as mac-intel-full # -# TODO: Change PROJ installation script to latest version once Jenkins macOS -# build node has been upgraded. +# TODO: +# - Change PROJ installation script to latest version once Jenkins macOS build +# node has been upgraded. # Index: /issm/trunk-jpl/jenkins/mac-intel-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-full (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-intel-full (revision 27702) @@ -2,11 +2,13 @@ # - 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. +# - 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. +# TODO: +# - Change PROJ installation script to latest version once Jenkins macOS build +# node has been upgraded. # @@ -86,5 +88,5 @@ # compilation # -NUMCPUS_INSTALL=8 +NUMCPUS_INSTALL=4 # Number of CPUs used in the nightly runs Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27702) @@ -1,4 +1,8 @@ -# TODO: Change PROJ installation script to latest version once Jenkins macOS -# build node has been upgraded. +# NOTE: +# - Same configuration as mac-intel-full +# +# TODO: +# - Change PROJ installation script to latest version once Jenkins macOS build +# node has been upgraded. # Index: /issm/trunk-jpl/jenkins/mac-silicon-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 27702) @@ -1,8 +1,12 @@ -# 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. +# 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. # @@ -54,5 +58,5 @@ # Test suites -MATLAB_TEST=0 +MATLAB_TEST=1 PYTHON_TEST=0 JAVASCRIPT_TEST=0 @@ -67,5 +71,5 @@ # Number of CPUs used in the nightly runs -NUMCPUS_RUN=1 +NUMCPUS_RUN=2 # Nightly run options @@ -73,4 +77,7 @@ # See documentation in test/NightlyRun/runme.* for more information # -MATLAB_NROPTIONS="" +# NOTE: +# - test701 is skipped because it uses full Stokes equations +# +MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/mac-silicon-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-dakota (revision 27702) +++ /issm/trunk-jpl/jenkins/mac-silicon-dakota (revision 27702) @@ -0,0 +1,105 @@ +# 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. +# + +#--------------------# +# ISSM Configuration # +#--------------------# + +ISSM_CONFIG='\ + --prefix=${ISSM_DIR} \ + --disable-static \ + --enable-development \ + --enable-debugging \ + --with-numthreads=8 \ + --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/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" \ + --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/hdf5/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-mac.sh + 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 + 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 + chaco install-mac.sh + m1qn3 install.sh + semic install.sh + shell2junit install.sh +" + +#---------# +# Testing # +#---------# + +# Test suites +MATLAB_TEST=1 +PYTHON_TEST=1 +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=2 + +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +# NOTE: +# - Errors are large for tests 234, 235, 418, and 420 under MATLAB +# - Tests 444 and 445 fail intermittently under MATLAB with "Index exceeds array bounds." +# - Errors are large for tests 234 418 and 420 under Python +# - See test417.py for why it is excluded +# - Test 444 fails intermittently under Python with "IndexError: list index out of range" +# - Excluding 2006 until it can be debugged (file I/O) +# +MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234 235 418 420 444 445 2006]" +PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420 444 445 2006" Index: /issm/trunk-jpl/jenkins/mac-silicon-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 27702) @@ -1,11 +1,13 @@ # 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. +# - 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. +# TODO: +# - Change PROJ installation script to latest version once Jenkins macOS build +# node has been upgraded. # Index: /issm/trunk-jpl/jenkins/mac-silicon-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-full (revision 27701) +++ /issm/trunk-jpl/jenkins/mac-silicon-full (revision 27702) @@ -2,11 +2,13 @@ # - 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. +# - 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. +# TODO: +# - Change PROJ installation script to latest version once Jenkins macOS build +# node has been upgraded. #