Changeset 23225

Timestamp:

09/06/18 10:19:26 (7 years ago)

Author:

jdquinn

Message:

CHG: Final commit for Linux Binaries build

Location:

issm/trunk

Files:

• externalpackages/mpich/install-3.2-linux64-static.sh (modified) (1 diff)
• externalpackages/petsc/install-3.7-linux64-static.sh (modified) (1 diff)
• jenkins/linux64_ross_static (modified) (3 diffs)

issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh

@@ -22 +22 @@
         --disable-shared \
         --enable-strict=all \
+        --enable-fast \
         --with-pic
 
-# #Compile mpich (this new version supports parallel make)
-# if [ $# -eq 0 ]; then
-#       make
-# else
-#       make -j $1
-# fi
-
-#Compile MPICH with one thread
-make
+#Compile mpich (this new version supports parallel make)
+if [ $# -eq 0 ]; then
+        make
+else
+        make -j $1
+fi
 
 make install

issm/trunk/externalpackages/petsc/install-3.7-linux64-static.sh

@@ -18 +18 @@
 ./config/configure.py \
         --prefix="$ISSM_DIR/externalpackages/petsc/install" \
+        --with-single-library=1 \
+        --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
+        --with-shared-libraries=0 \
+        --with-pic=1 \
+        --with-debugging=0 \
         --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
-        --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-        --with-debugging=0 \
-        --with-valgrind=0 \
-        --with-x=0 \
-        --with-ssl=0 \
-        --with-shared-libraries=0 \
+        --download-fblaslapack=1 \
         --download-metis=1 \
         --download-parmetis=1 \
+        --with-x=0 \
+        --download-scalapack=1 \
         --download-mumps=1 \
-        --download-fblaslapack=1 \
-        --download-scalapack=1 \
-        --COPTFLAGS="-fPIC" \
-        --CXXOPTFLAGS="-fPIC" \
-        --FOPTFLAGS="-fPIC"
+        --with-ssl=0 \
+        --with-valgrind=0
 
 #Compile and intall

issm/trunk/jenkins/linux64_ross_static

@@ -16 +16 @@
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
         --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libmpifort.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpi.a -lrt -lpthread" \
-        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
+        --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 \
@@ -24 +24 @@
         --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-        --with-pic'
+        --with-pic \
+        --with-numthreads=4'
 
 #PYTHON and MATLAB testing
@@ -51 +52 @@
 #number of cpus used in ISSM installation and compilation (one is usually
 #safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=1
+NUMCPUS_INSTALL=10
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=1
+NUMCPUS_RUN=10
 
 #Nightly run options. The matlab routine runme.m will be called