Index: ../trunk-jpl/externalpackages/mpich/install-3.2-linux64.sh =================================================================== --- ../trunk-jpl/externalpackages/mpich/install-3.2-linux64.sh (revision 24330) +++ ../trunk-jpl/externalpackages/mpich/install-3.2-linux64.sh (revision 24331) @@ -1,30 +1,39 @@ #!/bin/bash set -eu -#Some cleanup -rm -rf src install mpich-3.2 -mkdir src install -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz' +## Constants +# +VER="3.2" -#Untar -tar -zxvf mpich-3.2.tar.gz +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/mpich-${VER}.tar.gz" "mpich-${VER}.tar.gz" -#Move mpich into src directory -mv mpich-3.2/* src -rm -rf mpich-3.2 +# Unpack source +tar -zxvf mpich-$VER.tar.gz -#Configure mpich +# Cleanup +rm -rf src install +mkdir src install + +# Move source into 'src' directory +mv mpich-$VER/* src +rm -rf mpich-$VER + +# Configure cd src ./configure \ - --prefix="$ISSM_DIR/externalpackages/mpich/install" \ + --prefix="${ISSM_DIR}/externalpackages/mpich/install" \ --enable-shared -#Compile mpich (this new version supports parallel make) +# Compile and install if [ $# -eq 0 ]; then make + make install else make -j $1 + make -j $1 install fi -make install + +# Return to initial directory +cd .. Index: ../trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh =================================================================== --- ../trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh (revision 24330) +++ ../trunk-jpl/externalpackages/petsc/install-3.7-linux64.sh (revision 24331) @@ -1,36 +1,54 @@ #!/bin/bash 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" \ + --prefix="${ISSM_DIR}/externalpackages/petsc/install" \ + --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \ + --with-mpi-dir="${ISSM_DIR}/externalpackages/mpich/install" \ + --with-blas-lib="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" \ + --with-lapack-lib="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" \ --with-debugging=0 \ --with-valgrind=0 \ --with-x=0 \ --with-ssl=0 \ --with-shared-libraries=1 \ + --download-zlib=1\ + --download-hdf5=1 \ + --download-netcdf=1 \ --download-metis=1 \ --download-parmetis=1 \ - --download-mumps=1 \ --download-scalapack=1 \ - --download-fblaslapack=1 \ - --with-pic=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 .. Index: ../trunk-jpl/jenkins/linux64_ross =================================================================== --- ../trunk-jpl/jenkins/linux64_ross (revision 24330) +++ ../trunk-jpl/jenkins/linux64_ross (revision 24331) @@ -2,15 +2,16 @@ # 1: ISSM general configuration # #-------------------------------# -#MATLAB path +# MATLAB path MATLAB_PATH="/usr/local/MATLAB/R2015a" -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR \ +# ISSM CONFIGURATION +ISSM_CONFIG='\ + --prefix=$ISSM_DIR \ --disable-static \ --with-matlab-dir=$MATLAB_PATH \ --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-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 \ @@ -36,13 +37,13 @@ # 3: External packages installation # #-----------------------------------# -#List of external packages to be installed and their installation scripts +# List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install.sh cmake install.sh - mpich install-3.3.sh + mpich install-3.2-linux64.sh lapack install-3.8-linux.sh - petsc install-3.11-linux.sh + petsc install-3.7-linux64.sh triangle install-linux64.sh chaco install.sh m1qn3 install.sh Index: ../trunk-jpl/jenkins/linux64_ross_python =================================================================== --- ../trunk-jpl/jenkins/linux64_ross_python (revision 24330) +++ ../trunk-jpl/jenkins/linux64_ross_python (revision 24331) @@ -1,4 +1,3 @@ - #-------------------------------# # 1: ISSM general configuration # #-------------------------------# @@ -9,37 +8,45 @@ --with-python-dir=/usr \ --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ --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-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-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-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ + --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ + --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \ --with-numthreads=4 \ --enable-development \ - --enable-debugging ' + --enable-debugging \ +' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=0 PYTHON_TEST=1 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# # 3: External packages installation # #-----------------------------------# -#List of external packages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake install.sh - mpich install-3.2-linux64.sh - petsc install-3.7-linux64.sh - triangle install-linux64.sh - chaco install.sh - m1qn3 install.sh - shell2junit install.sh" +# List of external packages to be installed and their installation scripts +EXTERNALPACKAGES=" + autotools install.sh + cmake install.sh + mpich install-3.2-linux64.sh + lapack install-3.8-linux.sh + petsc install-3.7-linux64.sh + triangle install-linux64.sh + chaco install.sh + m1qn3 install.sh + semic install.sh + shell2junit install.sh +" #-----------------# # 4: test options # @@ -47,10 +54,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=10 +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 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable Index: ../trunk-jpl/jenkins/linux64_ross_se =================================================================== --- ../trunk-jpl/jenkins/linux64_ross_se (revision 24330) +++ ../trunk-jpl/jenkins/linux64_ross_se (revision 24331) @@ -41,9 +41,9 @@ EXTERNALPACKAGES=" autotools install.sh cmake install.sh - mpich install-3.3.sh + mpich install-3.2-linux64.sh lapack install-3.8-linux.sh - petsc install-3.11-linux.sh + petsc install-3.7-linux64.sh triangle install-linux64.sh chaco install.sh m1qn3 install.sh