Changeset 23099

Timestamp:

08/16/18 17:10:17 (7 years ago)

Author:

jdquinn

Message:

CHG: Modified Python builds to use usr copy of Python (adjusting Jenkins configurations and installing libs on nodes as needed)

Location:

issm/trunk-jpl/jenkins

Files:

• linux64_ross (modified) (2 diffs)
• linux64_ross_python (modified) (1 diff)
• linux64_ross_se (modified) (2 diffs)

issm/trunk-jpl/jenkins/linux64_ross

@@ -19 +19 @@
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-python-dir=$ISSM_DIR/externalpackages/python/install \
-        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy \
+        --with-python-dir=/usr \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
@@ -44 +43 @@
                                                 chaco         install.sh
                                                 m1qn3         install.sh
-                                                python        install-2.7.3-linux64.sh
-                  nose          install-linux64-python2.sh
-                  numpy         install-linux64.sh
-                  hdf5          install.sh
-                                                netcdf        install.sh
-                                                netcdf-cxx    install.sh
-                                                netcdf-python install.sh
                                                 shell2junit   install.sh"
 

issm/trunk-jpl/jenkins/linux64_ross_python

@@ -19 +19 @@
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-python-dir=/usr \
-        --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \

issm/trunk-jpl/jenkins/linux64_ross_se

@@ -7 +7 @@
 MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
-#ISSM CONFIGURATION 
+#ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR\
         --disable-static \
         --with-matlab-dir=$MATLAB_PATH \
-        --with-python-dir=$ISSM_DIR/externalpackages/python/install \
-        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy \
+        --with-python-dir=/usr \
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -36 +35 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools     install.sh    
-                                                cmake         install.sh                
+EXTERNALPACKAGES="autotools     install.sh
+                                                cmake         install.sh
                                                 mpich         install-3.2-linux64.sh
-                                                petsc         install-3.7-linux64.sh    
-                                                triangle      install-linux64.sh        
+                                                petsc         install-3.7-linux64.sh
+                                                triangle      install-linux64.sh
                                                 boost         install-1.55-linux.sh
-                                                python        install-2.7.3-linux64.sh
-                  nose          install-linux64-python2.sh
-                  numpy         install-linux64.sh
                                                 gshhg         install.sh
                                                 gdal          install-1.10-linux64.sh
-                                                hdf5          install.sh
-                                                netcdf        install.sh
-                                                netcdf-cxx    install.sh
-                                                netcdf-python install.sh
                                                 gmt           install.sh
                                                 gmsh          install.sh