Changeset 24328

Timestamp:

11/14/19 08:37:13 (5 years ago)

Author:

jdquinn

Message:

CHG: Working towards Mac and Linux configurations that more closely reflect one another; updated MPICH and PETSc versions; working on Linux Solid Earth build (still need to resolve tests with set faults, likely due to lack of support for PROJ vs PROJ4).

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/gmt/configs/Linux (added)
• externalpackages/gmt/configs/Linux/cmake (added)
• externalpackages/gmt/configs/Linux/cmake/ConfigUser.cmake (added)
• externalpackages/gmt/install-6.0-Linux.sh (added)
• externalpackages/lapack/install-3.8-Linux.sh (added)
• externalpackages/mpich/install-3.3-macOS_64.sh (deleted)
• externalpackages/mpich/install-3.3.sh (added)
• externalpackages/petsc/install-3.11-Linux.sh (added)
• externalpackages/petsc/install-3.11-linux64.sh (deleted)
• externalpackages/petsc/install-3.11-macOS.sh (added)
• jenkins/linux64_ross (modified) (3 diffs)
• jenkins/linux64_ross_se (modified) (3 diffs)
• m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -190 +190 @@
         path_prepend    "$MPI_DIR/bin"
         ld_library_path_prepend "$MPI_DIR/lib"
+fi
+
+LAPACK_DIR="${ISSM_DIR}/externalpackages/lapack/install"
+if [ -d "$LAPACK_DIR" ]; then
+        ld_library_path_append "$LAPACK_DIR/lib"
 fi
 

issm/trunk-jpl/jenkins/linux64_ross

@@ -12 +12 @@
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi" \
+        --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-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -41 +41 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-linux64.sh
-        petsc           install-3.7-linux64.sh
+        mpich           install-3.3.sh
+        lapack          install-3.8.sh
+        petsc           install-3.11-Linux.sh
         triangle        install-linux64.sh
         chaco           install.sh
         m1qn3           install.sh
-        hdf5            install-1.10.sh
-        netcdf          install-4.7.sh
         semic           install.sh
         shell2junit     install.sh
@@ -56 +55 @@
 #-----------------#
 
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-#       compilation.
-#
-NUMCPUS_INSTALL=10
+#number of cpus used in ISSM installation and compilation (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=5
+NUMCPUS_RUN=8
 
 #Nightly run options. The matlab routine runme.m will be called

issm/trunk-jpl/jenkins/linux64_ross_se

@@ -16 +16 @@
         --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/lapack/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-petsc-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-boost-dir=$ISSM_DIR/externalpackages/boost/install \
@@ -42 +42 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.2-linux64.sh
-        petsc           install-3.7-linux64.sh
+        mpich           install-3.3.sh
+        lapack          install-3.8.sh
+        petsc           install-3.11-Linux.sh
         triangle        install-linux64.sh
+        chaco           install.sh
+        m1qn3           install.sh
+        semic           install.sh
         boost           install-1.55-linux.sh
-        hdf5            install-1.10.sh
-        netcdf          install-4.7.sh
         proj            install-6.2.sh
         gdal            install-3.0-netcdf.sh
         gshhg           install.sh
-        gmt                     install.sh
+        gmt                     install-6.0-Linux.sh
         gmsh            install.sh
         shell2junit     install.sh
@@ -65 +67 @@
 #       compilation.
 #
-NUMCPUS_INSTALL=10
+NUMCPUS_INSTALL=8
 
 #number of cpus used in the nightly runs. (pb of access to all_vertices.txt if more than 1)
-NUMCPUS_RUN=5
+NUMCPUS_RUN=8
 
 #Nightly run options. The matlab routine runme.m will be called

issm/trunk-jpl/m4/issm_options.m4

@@ -1492 +1492 @@
         if test "x$HAVE_BLASLAPACK" == "xyes"; then
                 BLASLAPACKINCL=""
-                dnl: branch on whether we are running on windows or linux.
                 case "${host_os}" in
                 *cygwin*)
@@ -1498 +1497 @@
                   ;;
                 *linux*)
-                                BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -lflapack -lfblas "
-                #BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -llapack -lblas "
-                  ;;
+                        BLASLAPACKLIB="-L${BLASLAPACK_ROOT}/lib"
+                        if "x${BLASLAPACK_ROOT}" == "x${PETSC_ROOT}"; then
+                                BLASLAPACKLIB+=" -lflapack -lfblas"
+                        else
+                                BLASLAPACKLIB+=" -llapack -lblas"
+                        fi
+                ;;
                 *darwin*)
-                  BLASLAPACKLIB=-L"$BLASLAPACK_ROOT/lib -lflapack -lfblas "
-                  ;;
+                        BLASLAPACKLIB="-L${BLASLAPACK_ROOT}/lib"
+                        if "x${BLASLAPACK_ROOT}" == "x${PETSC_ROOT}"; then
+                                BLASLAPACKLIB+=" -lflapack -lfblas"
+                        else
+                                BLASLAPACKLIB+=" -llapack -lblas"
+                        fi
+                ;;
                 esac
                 AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src])