Changeset 25660

Timestamp:

10/08/20 14:20:04 (4 years ago)

Author:

jdquinn

Message:

CHG: Clean up

Location:

issm/trunk-jpl/jenkins

Files:

• pine_island-mac (modified) (6 diffs)
• ross-debian_linux (modified) (7 diffs)

issm/trunk-jpl/jenkins/pine_island-mac

@@ +1 @@
+# NOTE: We do not have a project on Jenkins based on this configuration, but we
+#               should maintain it as a way to efficiently test both MATLAB and Python 
+#               APIs.
+#
+
 #--------------------#
 # ISSM Configuration #
@@ -14 +19 @@
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \
+        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
+        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
         --with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
@@ -21 +28 @@
         --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-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -37 +48 @@
         cmake           install.sh
         petsc           install-3.12-mac.sh
+        gsl                     install.sh
+        boost           install-1.7-mac.sh
+        dakota          install-6.2-mac.sh
+        curl            install-7.67.sh
+        netcdf          install-4.7-parallel.sh
+        proj            install-6.2.sh
+        gdal            install-3-python-netcdf.sh
+        gshhg           install.sh
+        gmt                     install-6.0-mac.sh
+        gmsh            install-4.sh
         triangle        install-mac.sh
         chaco           install.sh
@@ -50 +71 @@
 # Test suites
 MATLAB_TEST=1
-PYTHON_TEST=0
+PYTHON_TEST=1
 JAVASCRIPT_TEST=0
 EXAMPLES_TEST=0
@@ -66 +87 @@
 # Nightly run options
 #
-# See documentation in test/NightlyRun/runme.* for more information
+# 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"
 # - test701 is skipped because it uses full Stokes equations
 #
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
-PYTHON_NROPTIONS=""
+MATLAB_NROPTIONS="'exclude',[234 235 418 420 435 444 445 701 702 703]"
+PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703]"

issm/trunk-jpl/jenkins/ross-debian_linux

@@ +1 @@
+# NOTE: We do not have a project on Jenkins based on this configuration, but we
+#               should maintain it as a way to efficiently test both MATLAB and Python 
+#               APIs.
+#
+
 #--------------------#
 # ISSM Configuration #
@@ -4 +9 @@
 
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
+
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -10 +16 @@
         --enable-debugging \
         --with-numthreads=4 \
+        --with-python-dir=/usr \
+        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
         --with-matlab-dir=${MATLAB_PATH} \
         --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
@@ -18 +26 @@
         --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-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -33 +45 @@
         cmake           install.sh
         petsc           install-3.12-linux.sh
+        gsl                     install.sh
+        boost           install-1.7-linux.sh
+        dakota          install-6.2-linux.sh
+        curl            install-7.67.sh
+        netcdf          install-4.7-parallel.sh
+        proj            install-6.2.sh
+        gdal            install-3-python-netcdf.sh
+        gshhg           install.sh
+        gmt                     install-6.0-linux.sh
+        gmsh            install-4.sh
         triangle        install-linux.sh
         chaco           install.sh
@@ -46 +68 @@
 # Test suites
 MATLAB_TEST=1
-PYTHON_TEST=0
+PYTHON_TEST=1
 JAVASCRIPT_TEST=0
 EXAMPLES_TEST=0
@@ -64 +86 @@
 # See documentation in test/NightlyRun/runme.* for more information.
 #
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS=""
+# - Errors are large for tests 234, 418, and 420 under Python
+# - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces 
+#       different-sized meshes on macOS and Linux for 3d objects (archives are 
+#       generated on macOS).
+#
+MATLAB_NROPTIONS="'exclude',[2002 2003 2010 2021 2101]"
+PYTHON_NROPTIONS="--exclude 234 418 420 2002 2003 2010 2021 2101"