Changeset 25801

Timestamp:

12/01/20 17:17:43 (4 years ago)

Author:

jdquinn

Message:

CHG: Configs for AD on macOS; clean up

Location:

issm/trunk-jpl

Files:

• externalpackages/adolc/install-mac-with_ampi.sh (copied) (copied from issm/trunk-jpl/externalpackages/adolc/install-withampi-macosx64.sh ) (1 diff)
• externalpackages/adolc/install-with_ampi.sh (moved) (moved from issm/trunk-jpl/externalpackages/adolc/install-withampi.sh )
• jenkins/linux64_caladan_ampi (modified) (1 diff)
• jenkins/pine_island-mac-adolc-ampion (copied) (copied from issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion ) (3 diffs)
• jenkins/ross-debian_linux-adolc-ampion (modified) (1 diff)

issm/trunk-jpl/externalpackages/adolc/install-mac-with_ampi.sh

@@ -2 +2 @@
 set -eu
 
-#Some cleanup
+
+## Environment
+#
+export CFLAGS="-O2 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
+export CXXFLAGS="-O2 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
+
+# Cleanup
 rm -rf install src
+mkdir install src
 
-# Keeping the following commented line for potential future use.
-#git clone https://gitlab.com/adol-c/adol-c.git src
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/ADOL-C.tar.gz" "ADOL-C.tar.gz"
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ADOL-C' 'ADOL-C.tar.gz'
+# Unpack source
+tar -zxvf ADOL-C.tar.gz
 
-#Untar ADOL-C
-tar -zxf  ADOL-C.tar.gz
-
-#Compile ADOL-C
-export CFLAGS="-O2 -L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich"
-export CXXFLAGS="-O2 -L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich"
-
+# Configure
 cd src
-./configure --prefix=$ISSM_DIR/externalpackages/adolc/install  \
-        --libdir=$ISSM_DIR/externalpackages/adolc/install/lib \
-        --with-mpi-root=$ISSM_DIR/externalpackages/mpich/install \
+./configure \
+        --prefix="${ISSM_DIR}/externalpackages/adolc/install" \
+        --libdir="${ISSM_DIR}/externalpackages/adolc/install/lib" \
+        --with-mpi-root="${ISSM_DIR}/externalpackages/petsc/install" \
         --enable-ampi \
-        --with-ampi=$ISSM_DIR/externalpackages/adjoinablempi/install \
+        --with-ampi="${ISSM_DIR}/externalpackages/adjoinablempi/install" \
         --with-soname=adolc \
         --disable-tapedoc-values
 
-make clean
+# Compile and install
 if [ $# -eq 0 ]; then
         make V=1
+        make V=1 install
 else
-        make -j $1 V=1
+        make V=1 -j $1
+        make V=1 install -j $1
 fi
-make V=1 install

issm/trunk-jpl/jenkins/linux64_caladan_ampi

@@ -47 +47 @@
         triangle                install-linux.sh
         adjoinablempi   install.sh
-        adolc                   install-withampi.sh
+        adolc                   install-with_ampi.sh
         shell2junit             install.sh
 "

issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion

@@ -3 +3 @@
 #--------------------#
 
-MATLAB_PATH="/usr/local/MATLAB/R2019b"
+MATLAB_PATH="/Applications/MATLAB_R2019b.app"
+
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -15 +16 @@
         --without-Love \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-python-dir=/usr \
-        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
+        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
+        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
+        --with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
-        --with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \
+        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/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-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
+        --with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \
+        --with-adolc-dir=${ISSM_DIR}/externalpackages/adolc/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
-        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
-        --with-adolc-dir=${ISSM_DIR}/externalpackages/adolc/install \
 '
 
@@ -39 +40 @@
 #
 EXTERNALPACKAGES="
-        autotools               install-debian-linux.sh
+        autotools               install.sh
         cmake                   install.sh
-        petsc                   install-3.12-linux.sh
+        petsc                   install-3.12-mac.sh
         gsl                             install.sh
-        triangle                install-linux.sh
-        adjoinablempi   install-linux.sh
-        adolc                   install-withampi.sh
+        triangle                install-mac.sh
+        adjoinablempi   install-mac.sh
+        adolc                   install-mac-with_ampi.sh
         shell2junit             install.sh
 "

issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion

@@ -45 +45 @@
         triangle                install-linux.sh
         adjoinablempi   install-linux.sh
-        adolc                   install-withampi.sh
+        adolc                   install-with_ampi.sh
         shell2junit             install.sh
 "