Changeset 27695

Timestamp:

04/19/23 13:15:03 (2 years ago)

Author:

jdquinn

Message:

ADD: New config for macOS - Silicon - Examples build

Location:

issm/trunk-jpl/jenkins

Files:

• mac-silicon-examples (copied) (copied from issm/trunk-jpl/jenkins/mac-silicon-basic ) (4 diffs)
• mac-silicon-full (modified) (2 diffs)

issm/trunk-jpl/jenkins/mac-silicon-examples

@@ -1 @@
-# NOTE: 
-# - Currently, this configuration does not compile the MATLAB and Python 
-#       APIs. After compiling, you will need to download the ISSM pre-compiled 
+# 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 or Python.
+#       $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.
 #
 
@@ -16 +19 @@
         --enable-development \
         --enable-debugging \
-        --without-wrappers \
         --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-petsc-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-mpi-include=${ISSM_EXT_DIR}/shared/petsc/install/include \
+        --with-mpi-libflags="-L${ISSM_EXT_DIR}/shared/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+        --with-blas-lapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-metis-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-parmetis-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-scalapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-mumps-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-hdf5-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-petsc-dir=${ISSM_EXT_DIR}/shared/petsc/install \
+        --with-gsl-dir=${ISSM_EXT_DIR}/shared/gsl/install \
+        --with-boost-dir=${ISSM_EXT_DIR}/shared/boost/install \
+        --with-dakota-dir=${ISSM_EXT_DIR}/shared/dakota/install \
+        --with-proj-dir=${ISSM_EXT_DIR}/shared/proj/install \
+        --with-triangle-dir=${ISSM_EXT_DIR}/shared/triangle/install \
+        --with-chaco-dir=${ISSM_EXT_DIR}/chaco/install \
+        --with-m1qn3-dir=${ISSM_EXT_DIR}/m1qn3/install \
+        --with-semic-dir=${ISSM_EXT_DIR}/semic/install \
 '
 
@@ -37 +47 @@
 #-------------------#
 
-# List of external packages to be installed and their installation scripts
 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
+        netcdf          install-4.7-parallel.sh
+        proj            install-6.sh
+        gdal            install-3-python.sh
+        gshhg           install.sh
+        gmt                     install-6-mac-silicon.sh
+        gmsh            install-4-mac.sh
         triangle        install-mac.sh
         chaco           install-mac.sh
@@ -70 +89 @@
 
 # Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information
-#
 MATLAB_NROPTIONS=""
 PYTHON_NROPTIONS=""

issm/trunk-jpl/jenkins/mac-silicon-full

@@ -2 +2 @@
 # - This configuration adds solid earth and Dakota capabilities to the basic 
 #       build.
-# - Currently, this configuration does not compile the MATLAB and Python 
-#       APIs. After compiling, you will need to download the ISSM pre-compiled 
+# - 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 or Python.
+#       $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.
 #
 
@@ -18 +20 @@
         --enable-development \
         --enable-debugging \
-        --without-wrappers \
         --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_EXT_DIR}/shared/petsc/install/include \