Changeset 24427

Timestamp:

12/03/19 23:52:51 (5 years ago)

Author:

jdquinn

Message:

CHG: Using system copies of BLAS and LAPACK (works locally)

Location:

issm/trunk-jpl

Files:

• externalpackages/petsc/install-3.7-mac.sh (modified) (2 diffs)
• jenkins/macosx_pine-island (modified) (4 diffs)
• jenkins/macosx_pine-island_dakota (modified) (2 diffs)
• jenkins/macosx_pine-island_dakota_static (modified) (2 diffs)
• jenkins/macosx_pine-island_examples (modified) (3 diffs)
• jenkins/macosx_pine-island_static (modified) (2 diffs)

issm/trunk-jpl/externalpackages/petsc/install-3.7-mac.sh

@@ -2 +2 @@
 set -eu
 
-#Some cleanup
-rm -rf install petsc-3.7.6 src
+
+## Constants
+#
+VER="3.7.6"
+
+# 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
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz'
+# Move source to 'src' directory
+mv petsc-$VER/* src/
+rm -rf petsc-$VER
 
-#Untar and move petsc to install directory
-tar -zxvf  petsc-3.7.6.tar.gz
-mv petsc-3.7.6/* src/
-rm -rf petsc-3.7.6
-
-#configure
+# Configure
 cd src
 ./config/configure.py \
-        --prefix="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
-        --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-        --with-debugging=1 \
+        --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
+        --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
+        --with-mpi-dir="${ISSM_DIR}/externalpackages/mpich/install" \
+        --with-debugging=0 \
         --with-valgrind=0 \
         --with-x=0 \
@@ -27 +34 @@
         --download-metis=1 \
         --download-parmetis=1 \
-        --download-mumps=1 \
-        --download-scalapack=1
+        --download-scalapack=1 \
+        --download-mumps=1
 
-#Compile and intall
-make
-make install
+# Compile and install
+if [ $# -eq 0 ]; then
+        make
+        make install
+else
+        make -j $1
+        make -j $1 install
+fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/jenkins/macosx_pine-island

@@ -7 +7 @@
 
 # ISSM CONFIGURATION
-ISSM_CONFIG='--prefix=$ISSM_DIR \
+ISSM_CONFIG='\
+        --prefix=$ISSM_DIR \
+        --disable-static \
         --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 -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 \
@@ -21 +22 @@
         --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
         --with-numthreads=4 \
+        --enable-development \
         --enable-debugging \
-        --enable-development \
 '
 
@@ -39 +40 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-mac.sh
+        mpich           install-3.3.sh
         petsc           install-3.7-mac.sh
         triangle        install-macosx64.sh
@@ -57 +58 @@
 #               compilation
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=8
+NUMCPUS_RUN=
 
 # Nightly run options

issm/trunk-jpl/jenkins/macosx_pine-island_dakota

@@ -14 +14 @@
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/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 \
@@ -44 +43 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-mac.sh
+        mpich           install-3.3.sh
         petsc           install-3.7-mac.sh
         triangle        install-macosx64.sh

issm/trunk-jpl/jenkins/macosx_pine-island_dakota_static

@@ -17 +17 @@
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -36 +35 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools    install.sh
-                                                cmake        install.sh
-                                                chaco        install-macosx64.sh
-                                                mpich        install-3.2-macosx64-static.sh
-                                                m1qn3        install.sh
-                                                petsc        install-3.7-macosx64-static.sh
-                                                triangle     install-macosx64.sh
-                                                boost        install-1.55-macosx-el_capitan.sh
-                                                dakota       install-6.2-macosx64.sh
-                                                shell2junit  install.sh"
+EXTERNALPACKAGES="
+        autotools       install.sh
+        cmake           install.sh
+        chaco           install-macosx64.sh
+        mpich           install-3.2-macosx64-static.sh
+        m1qn3           install.sh
+        petsc           install-3.7-macosx64-static.sh
+        triangle        install-macosx64.sh
+        boost           install-1.55-macosx-el_capitan.sh
+        dakota          install-6.2-macosx64.sh
+        shell2junit     install.sh
+"
 
 #-----------------#

issm/trunk-jpl/jenkins/macosx_pine-island_examples

@@ -12 +12 @@
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/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 \
@@ -40 +39 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-mac.sh
+        mpich           install-3.3.sh
         petsc           install-3.7-mac.sh
         triangle        install-macosx64.sh
@@ -65 +64 @@
 #       compilation
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=8
+NUMCPUS_RUN=4
 
 # Nightly run options

issm/trunk-jpl/jenkins/macosx_pine-island_static

@@ -16 +16 @@
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lpmpi -lmpifort -lmpicxx" \
-        --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 \
@@ -68 +67 @@
 #               compilation
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=8
+NUMCPUS_RUN=4
 
 # Nightly run options