Changeset 24236

Timestamp:

10/16/19 13:36:08 (5 years ago)

Author:

jdquinn

Message:

CHG: Turning off Python tests in vanilla Linux build; minor edits

Location:

issm/trunk-jpl/jenkins

Files:

• linux64_ross (modified) (3 diffs)
• linux64_ross_python (modified) (4 diffs)

issm/trunk-jpl/jenkins/linux64_ross

@@ -11 +11 @@
         --disable-static \
         --with-matlab-dir=$MATLAB_PATH \
-        --with-python-dir=/usr \
-        --with-python-numpy-dir=/var/lib/jenkins/.local/lib/python2.7/site-packages/numpy \
-        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+        --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-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 \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
@@ -31 +29 @@
 #PYTHON and MATLAB testing
 MATLAB_TEST=1
-PYTHON_TEST=1
+PYTHON_TEST=0
 
 #-----------------------------------#
@@ -65 +63 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS="--exclude_name 'Dakota'"
+PYTHON_NROPTIONS=""
 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"

issm/trunk-jpl/jenkins/linux64_ross_python

@@ -4 +4 @@
 #-------------------------------#
 
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
 #ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
         --disable-static \
-        --with-matlab-dir=$MATLAB_PATH \
         --with-python-dir=/usr \
         --with-python-numpy-dir=/home/jenkins/.local/lib/python2.7/site-packages/numpy \
-        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+        --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 -lmpicxx -lmpifort" \
+        --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 \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-numthreads=4 \
@@ -37 +33 @@
 
 #List of external packages to be installed and their installation scripts
-EXTERNALPACKAGES="mpich         install-3.2-linux64.sh
+EXTERNALPACKAGES="autotools     install.sh
                                                 cmake         install.sh
+                                                mpich         install-3.2-linux64.sh
                                                 petsc         install-3.7-linux64.sh
                                                 triangle      install-linux64.sh
@@ -51 +48 @@
 #number of cpus used in ISSM installation and compilation (one is usually
 #safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=5
+NUMCPUS_INSTALL=10
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=3
+NUMCPUS_RUN=5
 
 #Nightly run options. The matlab routine runme.m will be called
@@ -61 +58 @@
 #ex: "'id',[101 102 103]"
 PYTHON_NROPTIONS="--exclude_name 'Dakota'"
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
+MATLAB_NROPTIONS=""