Changeset 27638

Timestamp:

03/08/23 21:13:05 (2 years ago)

Author:

jdquinn

Message:

CHG: No need for MATLAB_PATH on Silicon-based machine; modified devpath for testing binaries

Location:

issm/trunk-jpl

Files:

• jenkins/mac-silicon-basic (modified) (3 diffs)
• jenkins/mac-silicon-full (copied) (copied from issm/trunk-jpl/jenkins/mac-silicon-basic ) (6 diffs)
• m4/issm_options.m4 (modified) (2 diffs)
• src/m/dev/devpath.m (modified) (1 diff)
• src/m/dev/devpath.py (modified) (4 diffs)

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

@@ -11 +11 @@
 #--------------------#
 
-MATLAB_PATH="/Applications/MATLAB_R2022b.app"
-
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -20 +18 @@
         --without-wrappers \
         --with-numthreads=8 \
-        --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -lgfortran" \
+        --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" \
@@ -67 +64 @@
 #               compilation
 #
-NUMCPUS_INSTALL=4
+NUMCPUS_INSTALL=8
 
 # Number of CPUs used in the nightly runs

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

@@ -1 +1 @@
 # NOTE: 
+# - 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 
@@ -11 +13 @@
 #--------------------#
 
-MATLAB_PATH="/Applications/MATLAB_R2022b.app"
-
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -20 +20 @@
         --without-wrappers \
         --with-numthreads=8 \
-        --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -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-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \
+        --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 \
 '
 
@@ -40 +44 @@
 #-------------------#
 
-# 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
@@ -67 +80 @@
 #               compilation
 #
-NUMCPUS_INSTALL=4
+NUMCPUS_INSTALL=8
 
 # Number of CPUs used in the nightly runs
@@ -73 +86 @@
 
 # Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information
-#
 MATLAB_NROPTIONS=""
 PYTHON_NROPTIONS=""

issm/trunk-jpl/m4/issm_options.m4

@@ -847 +847 @@
                 AC_MSG_RESULT([found])
 
-                PYTHONEXT=.so
+                PYWRAPPEREXT=.so
                 case "${host_os}" in
                         *cygwin*)
@@ -868 +868 @@
                 AC_SUBST([PYTHONINCL])
                 AC_SUBST([PYTHONLIB])
-                PYTHONWRAPPEREXT=${PYTHONEXT}
+                PYTHONWRAPPEREXT=${PYWRAPPEREXT}
                 AC_SUBST([PYTHONWRAPPEREXT])
                 AC_SUBST([PYTHONLINK])

issm/trunk-jpl/src/m/dev/devpath.m

@@ -18 +18 @@
 
 %ISSM path
-addpath([ISSM_DIR '/src/m/os/']); %load recursivepath
-addpath([ISSM_DIR '/lib']);       %load MEX files
+addpath([ISSM_DIR '/src/m/os/']);       %load recursivepath
+addpath([ISSM_DIR '/lib']);             %load MEX files
+addpath([ISSM_DIR '/lib-precompiled']); %load MEX files (precompiled; remove after MEX file compilation is supported on Silicon-based Macs)
 addpath(recursivepath([ISSM_DIR '/src/m']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/scotch']));

issm/trunk-jpl/src/m/dev/devpath.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os
 import sys
 
-#Recover ISSM_DIR and USERNAME
+# Recover ISSM_DIR and USERNAME
 ISSM_DIR = os.getenv('ISSM_DIR')
 USERNAME = os.getenv('USER')
@@ -10 +10 @@
     raise NameError('"ISSM_DIR" environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!')
 
-#Go through src/m and append any directory that contains a *.py file to PATH
+# Go through src/m and append any directory that contains a *.py file to PATH
 for root, dirs, files in os.walk(ISSM_DIR + '/src/m'):
     if '.svn' in dirs:
@@ -20 +20 @@
                     sys.path.append(root)
 
-#Also add the Nightly run directory
+# Also add the Nightly run directory
 if ISSM_DIR + '/test/NightlyRun' not in sys.path:
     sys.path.append(ISSM_DIR + '/test/NightlyRun')
 if ISSM_DIR + '/lib' not in sys.path:
     sys.path.append(ISSM_DIR + '/lib')
+if ISSM_DIR + '/lib-precompiled' not in sys.path:
+    sys.path.append(ISSM_DIR + '/lib-precompiled') # load precompiled MEX files; remove after MEX file compilation is supported on Silicon-based Macs
 if ISSM_DIR + '/src/wrappers/python/.libs' not in sys.path:
     sys.path.append(ISSM_DIR + '/src/wrappers/python/.libs')
@@ -51 +53 @@
 # print("\n  ISSM development path correctly loaded")
 # print("Current path is {}\n\n".format(ISSM_DIR))
+