Index: ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh =================================================================== --- ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh (revision 25658) +++ ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh (nonexistent) @@ -1,50 +0,0 @@ -#!/bin/bash -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 -# -VER="3.12.3" - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz" - -# Unpack source -tar -zxvf petsc-${VER}.tar.gz - -# Cleanup -rm -rf install src -mkdir install src - -# Move source to 'src' directory -mv petsc-${VER}/* src/ -rm -rf petsc-${VER} - -# Configure -cd src -./config/configure.py \ - --prefix="${ISSM_DIR}/externalpackages/petsc/install" \ - --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \ - --with-debugging=0 \ - --with-valgrind=0 \ - --with-x=0 \ - --with-ssl=0 \ - --with-pic=1 \ - --download-fblaslapack=1 \ - --download-mpich=1 \ - --download-metis=1 \ - --download-parmetis=1 \ - --download-scalapack=1 \ - --download-mumps=1 \ - --download-zlib=1 \ - --download-hdf5=1 - -# Compile and install -make -make install Property changes on: ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Index: ../trunk-jpl/externalpackages/petsc/install-3.12-linux.sh =================================================================== --- ../trunk-jpl/externalpackages/petsc/install-3.12-linux.sh (revision 25658) +++ ../trunk-jpl/externalpackages/petsc/install-3.12-linux.sh (revision 25659) @@ -2,12 +2,6 @@ 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 # VER="3.12.3" @@ -41,8 +35,11 @@ --download-metis=1 \ --download-parmetis=1 \ --download-scalapack=1 \ - --download-mumps=1 + --download-mumps=1 \ + --download-zlib=1 \ + --download-hdf5=1 + # Compile and install make make install Index: ../trunk-jpl/jenkins/ross-debian_linux-python =================================================================== --- ../trunk-jpl/jenkins/ross-debian_linux-python (revision 25658) +++ ../trunk-jpl/jenkins/ross-debian_linux-python (revision 25659) @@ -17,7 +17,11 @@ --with-metis-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/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 \ --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ @@ -32,6 +36,16 @@ autotools install-debian-linux.sh 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 m1qn3 install.sh @@ -63,5 +77,11 @@ # # 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" Index: ../trunk-jpl/jenkins/pine_island-mac-matlab =================================================================== --- ../trunk-jpl/jenkins/pine_island-mac-matlab (revision 25658) +++ ../trunk-jpl/jenkins/pine_island-mac-matlab (revision 25659) @@ -2,10 +2,8 @@ # ISSM Configuration # #--------------------# -# MATLAB path MATLAB_PATH="/Applications/MATLAB_R2018a.app" -# ISSM CONFIGURATION ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ --disable-static \ Index: ../trunk-jpl/jenkins/ross-debian_linux-dakota =================================================================== --- ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 25658) +++ ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 25659) @@ -3,6 +3,7 @@ #--------------------# MATLAB_PATH="/usr/local/MATLAB/R2019b" + ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ --disable-static \ Index: ../trunk-jpl/jenkins/pine_island-mac-python =================================================================== --- ../trunk-jpl/jenkins/pine_island-mac-python (revision 25658) +++ ../trunk-jpl/jenkins/pine_island-mac-python (revision 25659) @@ -2,7 +2,6 @@ # ISSM Configuration # #--------------------# -# ISSM CONFIGURATION ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ --disable-static \ Index: ../trunk-jpl/jenkins/ross-debian_linux-solid_earth =================================================================== --- ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 25658) +++ ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 25659) @@ -3,6 +3,7 @@ #--------------------# MATLAB_PATH="/usr/local/MATLAB/R2019b" + ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ --disable-static \ Index: ../trunk-jpl/jenkins/ross-debian_linux-matlab =================================================================== --- ../trunk-jpl/jenkins/ross-debian_linux-matlab (nonexistent) +++ ../trunk-jpl/jenkins/ross-debian_linux-matlab (revision 25659) @@ -0,0 +1,87 @@ +#--------------------# +# ISSM Configuration # +#--------------------# + +MATLAB_PATH="/usr/local/MATLAB/R2019b" + +ISSM_CONFIG='\ + --prefix=${ISSM_DIR} \ + --disable-static \ + --enable-development \ + --enable-debugging \ + --with-numthreads=4 \ + --with-matlab-dir=${MATLAB_PATH} \ + --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -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-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 \ + --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ + --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \ +' + +#-------------------# +# External Packages # +#-------------------# + +EXTERNALPACKAGES=" + autotools install-debian-linux.sh + 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-netcdf.sh + gshhg install.sh + gmt install-6.0-linux.sh + gmsh install-4.sh + triangle install-linux.sh + chaco install.sh + m1qn3 install.sh + semic install.sh + shell2junit install.sh +" + +#---------# +# Testing # +#---------# + +# Test suites +MATLAB_TEST=1 +PYTHON_TEST=0 +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: +# - 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="" Property changes on: ../trunk-jpl/jenkins/ross-debian_linux-matlab ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property