Changeset 24402

Timestamp:

11/26/19 20:41:00 (5 years ago)

Author:

jdquinn

Message:

CHG: Modified configs to test on new Ubuntu Linux node

Location:

issm/trunk-jpl/jenkins

Files:

• linux64_ross (modified) (2 diffs)
• linux64_ross_codi (modified) (5 diffs)
• linux64_ross_iceocean (modified) (5 diffs)
• linux64_ross_javascript (modified) (4 diffs)

issm/trunk-jpl/jenkins/linux64_ross

@@ -40 +40 @@
 # List of external packages to be installed and their installation scripts
 #
-# TODO:
-# - After upgrading Jenkins nodes to Ubuntu 18, use MPICH 3.3 and PETSc 3.11
-#       (which will install zlib, HDF5, and NetCDF).
-#
 EXTERNALPACKAGES="
         autotools       install.sh
@@ -72 +68 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
+MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
 PYTHON_NROPTIONS=""
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"

issm/trunk-jpl/jenkins/linux64_ross_codi

@@ -4 +4 @@
 
 # MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
+MATLAB_PATH="/usr/local/MATLAB/R2019b"
 
 # ISSM CONFIGURATION
@@ -14 +14 @@
         --without-Love \
         --with-matlab-dir=$MATLAB_PATH \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/7 -lgfortran" \
         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -22 +22 @@
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/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 \
         --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
-        --with-m1qn3-dir="$ISSM_DIR/externalpackages/m1qn3/install" \
+        --with-medipack-dir="$ISSM_DIR/externalpackages/medipack/install" \
         --with-codipack-dir="$ISSM_DIR/externalpackages/codipack/install" \
-        --with-medipack-dir="$ISSM_DIR/externalpackages/medipack/install" \
         --with-numthreads=4 \
         --enable-tape-alloc \
@@ -46 +48 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-linux64.sh
+        mpich           install-3.3.sh
         lapack          install-3.8-linux.sh
-        petsc           install-3.7-linux64.sh
+        petsc           install-3.11-linux.sh
         triangle        install-linux64.sh
+        chaco           install.sh
+        m1qn3           install.sh
+        semic           install.sh
         gsl                     install-linux64.sh
-        m1qn3           install.sh
         medipack        install.sh
         codipack        install.sh
@@ -61 +65 @@
 #-----------------#
 
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
+# List of external packages to be installed and their installation scripts
+#
+# NOTE: The PETSc libraries are compiled but not used: PETSc is really just
+#               being used as an installer for other external packages.
+#
 NUMCPUS_INSTALL=8
 

issm/trunk-jpl/jenkins/linux64_ross_iceocean

@@ -3 +3 @@
 #-------------------------------#
 
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
+# MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2019b"
 
-#ISSM CONFIGURATION
+# ISSM CONFIGURATION
 ISSM_CONFIG='\
         --prefix=$ISSM_DIR \
         --disable-static \
         --with-matlab-dir=$MATLAB_PATH \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
+        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/7 -lgfortran" \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
+        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -20 +20 @@
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-ocean=yes \
+        --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
+        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+        --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
         --with-numthreads=4 \
         --enable-development \
@@ -26 +28 @@
 '
 
-#PYTHON and MATLAB testing
+# Test suites
 MATLAB_TEST=1
 PYTHON_TEST=0
@@ -40 +42 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-linux64.sh
+        mpich           install-3.3.sh
         lapack          install-3.8-linux.sh
-        petsc           install-3.7-linux64.sh
+        petsc           install-3.11-linux.sh
         triangle        install-linux64.sh
+        chaco           install.sh
+        m1qn3           install.sh
+        semic           install.sh
         shell2junit     install.sh
 "
@@ -51 +56 @@
 #-----------------#
 
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
+# List of external packages to be installed and their installation scripts
 NUMCPUS_INSTALL=8
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=1
+NUMCPUS_RUN=8
 
 #Nightly run options. The matlab routine runme.m will be called

issm/trunk-jpl/jenkins/linux64_ross_javascript

@@ -3 +3 @@
 #-------------------------------#
 
-#ISSM CONFIGURATION
+# ISSM CONFIGURATION
 ISSM_CONFIG='\
-    --prefix="${ISSM_DIR}" \
+    --prefix=$ISSM_DIR \
     --disable-shared \
     --with-javascript \
@@ -17 +17 @@
 '
 
-#PYTHON and MATLAB testing
+# Test suites
 MATLAB_TEST=0
 PYTHON_TEST=0
 JAVASCRIPT_TEST=1
+EXAMPLES_TEST=0
 
 #-----------------------------------#
@@ -27 +28 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools     install.sh
-                                                cmake         install.sh
-                                                emscripten    install.sh
-                                                gsl           install-javascript.sh
-                                                triangle      install-javascript.sh
-                                                shell2junit   install.sh"
+EXTERNALPACKAGES="
+        autotools       install.sh
+        cmake           install.sh
+        emscripten      install.sh
+        gsl                     install-javascript.sh
+        triangle        install-javascript.sh
+        shell2junit     install.sh
+"
 
 #-----------------#
@@ -43 +46 @@
 #       compilation.
 #
-NUMCPUS_INSTALL=10
+NUMCPUS_INSTALL=8