Changeset 24348

Timestamp:

11/17/19 16:18:09 (5 years ago)

Author:

jdquinn

Message:

BUG: LAPACK CMake customization for macOS.

Location:

issm/trunk-jpl

Files:

• externalpackages/lapack/configs/mac (added)
• externalpackages/lapack/configs/mac/3.8 (added)
• externalpackages/lapack/configs/mac/3.8/CMakeLists.txt (added)
• externalpackages/lapack/install-3.8-mac.sh (modified) (1 diff)
• jenkins/macosx_pine-island (modified) (2 diffs)
• jenkins/macosx_pine-island_examples (modified) (2 diffs)

issm/trunk-jpl/externalpackages/lapack/install-3.8-mac.sh

@@ -24 +24 @@
 rm -rf lapack-$VER
 
+# Copy customized configuration files to 'src' directory
+cp configs/mac/3.8/CMakeLists.txt src/CMakeLists.txt
+
 # Configure
 #

issm/trunk-jpl/jenkins/macosx_pine-island

@@ -22 +22 @@
         --with-numthreads=4 \
         --enable-debugging \
-        --enable-development
+        --enable-development \
 '
 
@@ -40 +40 @@
         cmake           install.sh
         mpich           install-3.3.sh
+        lapack          install-3.8-mac.sh
         petsc           install-3.11-macOS.sh
         triangle        install-macosx64.sh
+        chaco           install.sh
         m1qn3           install.sh
         semic           install.sh

issm/trunk-jpl/jenkins/macosx_pine-island_examples

@@ -11 +11 @@
         --with-matlab-dir=$MATLAB_PATH \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
-        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+        --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 \
+        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-scalapack-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-numthreads=4 \
         --enable-debugging \
@@ -38 +41 @@
         cmake           install.sh
         mpich           install-3.3.sh
-        m1qn3           install.sh
-        lapack          install-3.8-linux.sh
+        lapack          install-3.8-mac.sh
         petsc           install-3.7-macosx64.sh
         triangle        install-macosx64.sh
+        chaco           install.sh
+        m1qn3           install.sh
+        semic           install.sh
         hdf5            install-1.10.sh
         netcdf          install-4.7.sh