Changeset 27553

Timestamp:

02/06/23 09:31:58 (2 years ago)

Author:

jdquinn

Message:

CHG: More changes for new Mac Intel build node; clean up

Location:

issm/trunk-jpl

Files:

• externalpackages/gmsh/install-4-linux-static.sh (modified) (1 diff)
• externalpackages/gmsh/install-4-linux.sh (modified) (1 diff)
• externalpackages/gmsh/install-4-mac-static.sh (modified) (1 diff)
• externalpackages/gmsh/install-4-mac.sh (modified) (1 diff)
• externalpackages/petsc/install-3.12-linux.sh (deleted)
• externalpackages/petsc/install-3.12-lonestar.sh (deleted)
• externalpackages/petsc/install-3.12-mac.sh (deleted)
• externalpackages/petsc/install-3.12-win-msys2-gcc-msmpi.sh (deleted)
• externalpackages/petsc/install-3.13-pleiades.sh (deleted)
• externalpackages/petsc/install-3.14-linux-static.sh (moved) (moved from issm/trunk-jpl/externalpackages/petsc/install-3.12-linux-static.sh ) (2 diffs)
• externalpackages/petsc/install-3.14-mac-nohdf5.sh (deleted)
• externalpackages/petsc/install-3.14-mac-static.sh (moved) (moved from issm/trunk-jpl/externalpackages/petsc/install-3.12-mac-static.sh ) (3 diffs)
• externalpackages/petsc/install-3.14-mac-with-hdf5.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-3.14-mac.sh ) (2 diffs)
• externalpackages/petsc/install-3.14-mac.sh (modified) (3 diffs)
• externalpackages/petsc/install-3.15-babylon.sh (modified) (1 diff)
• externalpackages/petsc/install-3.16-linux.sh (modified) (3 diffs)
• externalpackages/petsc/install-3.16-mac.sh (modified) (3 diffs)
• externalpackages/petsc/install-3.17-mac-intel.sh (modified) (2 diffs)
• externalpackages/petsc/install-3.17-mac-silicon-static.sh (moved) (moved from issm/trunk-jpl/externalpackages/petsc/install-3.17-mac-m1-static.sh ) (1 diff)
• externalpackages/petsc/install-3.17-mac-silicon.sh (moved) (moved from issm/trunk-jpl/externalpackages/petsc/install-3.17-mac-m1.sh )
• externalpackages/petsc/install-3.6-win10.sh (deleted)
• externalpackages/petsc/install-3.7-discover.sh (deleted)
• externalpackages/petsc/install-dev-linux64.sh (deleted)
• externalpackages/petsc/install-dev-pleiades.sh (deleted)
• externalpackages/petsc/install-dev-win10-par.sh (deleted)
• externalpackages/petsc/install-dev-win10.sh (deleted)
• jenkins/examples_tests.sh (modified) (1 diff)
• jenkins/mac-binaries-python (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-3 ) (3 diffs)
• jenkins/mac-intel-binaries-matlab (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab ) (2 diffs)
• jenkins/ross-debian_linux-binaries-matlab (modified) (1 diff)
• jenkins/ross-debian_linux-binaries-python-2 (modified) (1 diff)
• jenkins/ross-debian_linux-binaries-python-3 (modified) (1 diff)

issm/trunk-jpl/externalpackages/gmsh/install-4-linux-static.sh

@@ -58 +58 @@
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+        -DCMAKE_SKIP_RPATH=TRUE \
         -DENABLE_BUILD_LIB=1 \
         -DBLAS_LAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib -lflapack -L${BLAS_ROOT}/lib -lfblas ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" \

issm/trunk-jpl/externalpackages/gmsh/install-4-linux.sh

@@ -57 +57 @@
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+        -DCMAKE_SKIP_RPATH=TRUE \
         -DENABLE_BUILD_DYNAMIC=1 \
         -DENABLE_BUILD_SHARED=1 \

issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh

@@ -69 +69 @@
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+        -DCMAKE_SKIP_RPATH=TRUE \
         -DENABLE_BUILD_LIB=1 \
         -DBLAS_LAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib -lflapack -L${BLAS_ROOT}/lib -lfblas ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" \

issm/trunk-jpl/externalpackages/gmsh/install-4-mac.sh

@@ -57 +57 @@
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+        -DCMAKE_SKIP_RPATH=TRUE \
         -DENABLE_BUILD_DYNAMIC=1 \
         -DENABLE_BUILD_SHARED=1 \

issm/trunk-jpl/externalpackages/petsc/install-3.14-linux-static.sh

@@ -5 +5 @@
 ## Constants
 #
-VER="3.12.3"
+VER="3.14.6"
 
 PETSC_DIR=${ISSM_DIR}/externalpackages/petsc/src # DO NOT CHANGE THIS
@@ -33 +33 @@
 #               compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS
 #
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
-#
 cd ${PETSC_DIR}
 ./config/configure.py \

issm/trunk-jpl/externalpackages/petsc/install-3.14-mac-static.sh

@@ -5 +5 @@
 ## Constants
 #
-VER="3.12.3"
+VER="3.14.6"
 
 PETSC_DIR=${ISSM_DIR}/externalpackages/petsc/src # DO NOT CHANGE THIS
@@ -35 +35 @@
 # - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
 #       (may need to remove it for earlier versions not using the C99 standard).
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
 # - Added -static-libgfortran to all macOS static builds, but this will not 
 #       work out of the box on Linux.
@@ -51 +45 @@
         --CFLAGS="-fPIC -Wno-error=implicit-function-declaration" \
         --CXXFLAGS="-fPIC" \
-        --FFLAGS="-fPIC -fallow-argument-mismatch -static-libgfortran" \
+        --FFLAGS="-fPIC -static-libgfortran" \
         --with-debugging=0 \
         --with-valgrind=0 \

issm/trunk-jpl/externalpackages/petsc/install-3.14-mac-with-hdf5.sh

@@ -25 +25 @@
 
 # Modify source so that Python 3 can be used to compile PETSc
-sed -i '' 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ${PETSC_DIR}/config/configure.py
+sed -i'' 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ${PETSC_DIR}/config/configure.py
 
 # Modify source so that Python >= 3.9 can be used to compile PETSc
-sed -i '' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/script.py
+sed -i'' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/script.py
 
 # Configure
@@ -35 +35 @@
 # - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
 #       (may need to remove it for earlier versions not using the C99 standard).
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
 #
 cd ${PETSC_DIR}
-./config/configure.py \
+./configure \
         --prefix="${PREFIX}" \
         --PETSC_DIR="${PETSC_DIR}" \
         --CFLAGS="-Wno-error=implicit-function-declaration" \
-        --FFLAGS="-fallow-argument-mismatch" \
         --with-debugging=0 \
         --with-valgrind=0 \

issm/trunk-jpl/externalpackages/petsc/install-3.14-mac.sh

@@ -25 +25 @@
 
 # Modify source so that Python 3 can be used to compile PETSc
-sed -i '' 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ${PETSC_DIR}/config/configure.py
+sed -i'' 's|#!/usr/bin/env python|#!/usr/bin/env python3|g' ${PETSC_DIR}/config/configure.py
 
 # Modify source so that Python >= 3.9 can be used to compile PETSc
-sed -i '' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/script.py
+sed -i'' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/script.py
 
 # Configure
@@ -35 +35 @@
 # - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
 #       (may need to remove it for earlier versions not using the C99 standard).
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
 #
 cd ${PETSC_DIR}
-./config/configure.py \
+./configure \
         --prefix="${PREFIX}" \
         --PETSC_DIR="${PETSC_DIR}" \
         --CFLAGS="-Wno-error=implicit-function-declaration" \
-        --FFLAGS="-fallow-argument-mismatch" \
         --with-debugging=0 \
         --with-valgrind=0 \
@@ -59 +52 @@
         --download-scalapack=1 \
         --download-mumps=1 \
-        --download-zlib=1 \
-        --download-hdf5=1
+        --download-zlib=1
 
 # Compile and install

issm/trunk-jpl/externalpackages/petsc/install-3.15-babylon.sh

@@ -41 +41 @@
         --download-scalapack=1 \
         --download-mumps=1 \
-        --download-zlib=1 \
-        --download-hdf5=1
+        --download-zlib=1
 
 # Compile and install

issm/trunk-jpl/externalpackages/petsc/install-3.16-linux.sh

@@ -29 +29 @@
 # - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
 #       (may need to remove it for earlier versions not using the C99 standard).
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
 #
 cd ${PETSC_DIR}
@@ -41 +35 @@
         --PETSC_DIR="${PETSC_DIR}" \
         --CFLAGS="-Wno-error=implicit-function-declaration" \
-        --FFLAGS="-fallow-argument-mismatch" \
         --with-debugging=0 \
         --with-valgrind=0 \
@@ -53 +46 @@
         --download-scalapack=1 \
         --download-mumps=1 \
-        --download-zlib=1 \
-        --download-hdf5=1
+        --download-zlib=1
 
 # Compile and install

issm/trunk-jpl/externalpackages/petsc/install-3.16-mac.sh

@@ -29 +29 @@
 # - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
 #       (may need to remove it for earlier versions not using the C99 standard).
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
 #
 cd ${PETSC_DIR}
@@ -41 +35 @@
         --PETSC_DIR="${PETSC_DIR}" \
         --CFLAGS="-Wno-error=implicit-function-declaration" \
-        --FFLAGS="-fallow-argument-mismatch" \
         --with-debugging=0 \
         --with-valgrind=0 \
@@ -53 +46 @@
         --download-scalapack=1 \
         --download-mumps=1 \
-        --download-zlib=1 \
-        --download-hdf5=1
+        --download-zlib=1
 
 # Compile and install

issm/trunk-jpl/externalpackages/petsc/install-3.17-mac-intel.sh

@@ -25 +25 @@
 
 # Configure
+#
+# NOTE:
+# - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
+#       (may need to remove it for earlier versions not using the C99 standard).
+#
 cd ${PETSC_DIR}
 ./configure \
         --prefix="${PREFIX}" \
         --PETSC_DIR="${PETSC_DIR}" \
+        --CFLAGS="-Wno-error=implicit-function-declaration" \
         --with-debugging=0 \
         --with-valgrind=0 \
@@ -40 +46 @@
         --download-scalapack=1 \
         --download-mumps=1 \
-        --download-zlib=1 \
-        --download-hdf5=1
+        --download-zlib=1
 
 # Compile and install

issm/trunk-jpl/externalpackages/petsc/install-3.17-mac-silicon-static.sh

@@ -33 +33 @@
 #               compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS
 #
-# - Added -fallow-argument-mismatch to FFLAGS in order to clear,
-#
-#               error: The Fortran compiler gfortran will not compile files that call 
-#               the same routine with arguments of different types.
-#
-#       for gfortran 10 or later (may need to remove it for earlier versions).
 cd ${PETSC_DIR}
 ./configure \

issm/trunk-jpl/jenkins/examples_tests.sh

@@ -6 +6 @@
 # called from jenkins/jenkins.sh.
 #
-# runme files are modifed as needed to fill in statements that would otherwise 
+# runme files are modified as needed to fill in statements that would otherwise 
 # be added by user.
 #

issm/trunk-jpl/jenkins/mac-binaries-python

@@ -11 +11 @@
 #
 
-# ISSM CONFIGURATION
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -18 +17 @@
         --enable-standalone-libraries \
         --disable-dependency-tracking \
-        --with-python-version=3.4 \
-        --with-python-dir=/Library/Frameworks/Python.framework/Versions/3.4 \
-        --with-python-numpy-dir=/Library/Frameworks/Python.framework/Versions/3.4/lib/python3.4/site-packages/numpy \
-        --with-fortran-lib="/usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libgfortran.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libquadmath.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/gcc/x86_64-apple-darwin15/11/libgcc.a" \
+        --with-python-version="3.9" \
+        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
+        --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
+        --with-fortran-lib="/usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libgfortran.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libquadmath.a //usr/local/Cellar/gcc/12.2.0/lib/gcc/12/gcc/x86_64-apple-darwin21/12/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -48 +47 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.12-mac-static.sh
+        petsc           install-3.14-mac-static.sh
         gsl                     install-static.sh
         boost           install-1.7-mac-static.sh

issm/trunk-jpl/jenkins/mac-intel-binaries-matlab

@@ -22 +22 @@
         --disable-dependency-tracking \
         --with-matlab-dir=${MATLAB_PATH} \
-        --with-fortran-lib="/usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libgfortran.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libquadmath.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/gcc/x86_64-apple-darwin15/11/libgcc.a" \
+        --with-fortran-lib="/usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libgfortran.a /usr/local/Cellar/gcc/12.2.0/lib/gcc/12/libquadmath.a //usr/local/Cellar/gcc/12.2.0/lib/gcc/12/gcc/x86_64-apple-darwin21/12/libgcc.a" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -49 +49 @@
         autotools       install-mac.sh
         cmake           install.sh
-        petsc           install-3.12-mac-static.sh
+        petsc           install-3.14-mac-static.sh
         gsl                     install-static.sh
         boost           install-1.7-mac-static.sh

issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab

@@ -44 +44 @@
         autotools       install-linux.sh
         cmake           install.sh
-        petsc           install-3.12-linux-static.sh
+        petsc           install-3.14-linux-static.sh
         gsl                     install-static.sh
         boost           install-1.7-linux-static.sh

issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-2

@@ -44 +44 @@
         autotools       install-linux.sh
         cmake           install.sh
-        petsc           install-3.12-linux-static.sh
+        petsc           install-3.14-linux-static.sh
         gsl                     install-static.sh
         boost           install-1.7-linux-static.sh

issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-3

@@ -45 +45 @@
         autotools       install-linux.sh
         cmake           install.sh
-        petsc           install-3.12-linux-static.sh
+        petsc           install-3.14-linux-static.sh
         gsl                     install-static.sh
         boost           install-1.7-linux-static.sh