Changeset 25659

Timestamp:

10/08/20 12:31:51 (4 years ago)

Author:

jdquinn

Message:

CHG: Consolidating builds to MATLAB and Python APIs on Linux; clean up

Location:

issm/trunk-jpl

Files:

• externalpackages/petsc/install-3.12-linux-solid_earth.sh (deleted)
• externalpackages/petsc/install-3.12-linux.sh (modified) (2 diffs)
• jenkins/pine_island-mac-matlab (modified) (1 diff)
• jenkins/pine_island-mac-python (modified) (1 diff)
• jenkins/ross-debian_linux-dakota (modified) (1 diff)
• jenkins/ross-debian_linux-matlab (added)
• jenkins/ross-debian_linux-python (modified) (3 diffs)
• jenkins/ross-debian_linux-solid_earth (modified) (1 diff)

issm/trunk-jpl/externalpackages/petsc/install-3.12-linux.sh

@@ -2 +2 @@
 set -eu
 
-
-# NOTE: There is a single difference between the Linux and macOS 
-#               configurations, which is the addition of the -static-libgfortran 
-#               option to FFLAGS on the macOS static configurations. For the sake of 
-#               consistency, we maintain separate files for each, respective Linux and 
-#               macOS configuration.
 
 ## Constants
@@ -42 +36 @@
         --download-parmetis=1 \
         --download-scalapack=1 \
-        --download-mumps=1
+        --download-mumps=1 \
+        --download-zlib=1 \
+        --download-hdf5=1
+
 
 # Compile and install

issm/trunk-jpl/jenkins/pine_island-mac-matlab

@@ -3 +3 @@
 #--------------------#
 
-# MATLAB path
 MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 
-# ISSM CONFIGURATION
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \

issm/trunk-jpl/jenkins/pine_island-mac-python

@@ -3 +3 @@
 #--------------------#
 
-# ISSM CONFIGURATION
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \

issm/trunk-jpl/jenkins/ross-debian_linux-dakota

@@ -4 +4 @@
 
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
+
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \

issm/trunk-jpl/jenkins/ross-debian_linux-python

@@ -18 +18 @@
         --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 +37 @@
         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
@@ -64 +78 @@
 # See documentation in test/NightlyRun/runme.* for more information.
 #
+# NOTE:
+# - 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=""
-PYTHON_NROPTIONS="--exclude_name 'Dakota'"
+PYTHON_NROPTIONS="--exclude 234 418 420 2002 2003 2010 2021 2101"

issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

@@ -4 +4 @@
 
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
+
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \