Changeset 28178


Ignore:
Timestamp:
03/24/24 13:02:50 (12 months ago)
Author:
jdquinn
Message:

CHG: Upgrade Linux builds to PETSc 3.20, GMT 6.5

Location:
issm/trunk-jpl
Files:
5 added
1 deleted
18 edited
2 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

    r28164 r28178  
    55## Constants
    66#
    7 VER="6.0.0"
     7VER="6.5.0"
     8
     9PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
    810
    911# Find libgfortran and libgcc so we do not have to hardcode them
    … …  
    2729export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
    2830export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;/usr/lib/x86_64-linux-gnu/libssl.a;/usr/lib/x86_64-linux-gnu/libcrypto.a"
    29 export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.
    3031
    3132# Download source
    … …  
    4344rm -rf gmt-${VER}
    4445
    45 # Copy custom configuration files
    46 cp ./configs/6.0/static/linux/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
    47 cp ./configs/6.0/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
    48 cp ./configs/6.0/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
    49 cp ./configs/6.0/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
    50 cp ./configs/6.0/static/src/CMakeLists.txt ./src/src
     46# Copy custom configuration files to source
     47cp ./src/cmake/ConfigUserAdvancedTemplate.cmake ./src/cmake/ConfigUser.cmake
     48
     49# Patch source
     50patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/static/cmake/ConfigUserAdvancedTemplate.cmake.patch
     51patch ./src/cmake/modules/FindGDAL.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake.patch
     52patch ./src/cmake/modules/FindGSHHG.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGSHHG.cmake.patch
     53patch ./src/cmake/modules/FindNETCDF.cmake < ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake.patch
    5154
    5255# Configure
    … …  
    6366#
    6467cmake \
     68        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
    6569        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
    6670        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux.sh

    r28164 r28178  
    55## Constants
    66#
    7 VER="6.4.0"
     7VER="6.5.0"
     8
     9PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
    810
    911# Find libgfortran so that we do not have to hardcode it.
    … …  
    1921#
    2022export CC=mpicc
    21 export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.
    2223
    2324# Download source
    … …  
    3536rm -rf gmt-${VER}
    3637
    37 # Copy custom configuration files
    38 cp ./configs/6.0/linux/cmake/ConfigUser.cmake ./src/cmake
     38# Copy custom configuration files to source
     39cp ./src/cmake/ConfigUserAdvancedTemplate.cmake ./src/cmake/ConfigUser.cmake
     40
     41# Patch source
     42patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/cmake/ConfigUserAdvancedTemplate.cmake.patch
    3943
    4044# Configure
    … …  
    5155#
    5256cmake \
     57        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
    5358        -DBLAS_LIBRARIES="-L${BLAS_ROOT}/lib;-lfblas;-L${LIBGFORTRAN_ROOT};-lgfortran" \
    5459        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r28166 r28178  
    22set -eu
    33
     4# NOTE: After GMT version 6.0.0, we must build a shared copy of libgmt for our
     5# distributables as GMT moved from individual executables to a single
     6# executable with modules. For example,
     7#
     8#       gmtselect -> gmt select
     9#
     10# These modules are not compiled into the static version of libgmt (and likely)
     11# never will be.
     12#
    413
    514## Constants
    … …  
    5160
    5261# Patch source
    53 patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/static/mac/cmake/ConfigUserAdvancedTemplate.cmake.patch
     62patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/static/cmake/ConfigUserAdvancedTemplate.cmake.patch
    5463patch ./src/cmake/modules/FindGDAL.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake.patch
    5564patch ./src/cmake/modules/FindGSHHG.cmake < ./configs/${VER%.*}/static/cmake/modules/FindGSHHG.cmake.patch

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh

    r27837 r28178  
    55## Constants
    66#
    7 VER="6.4.0"
     7VER="6.5.0"
     8
     9PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
    810
    911# Find libgfortran so that we do not have to hardcode it.
    … …  
    1921#
    2022export CC=mpicc
    21 export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.
    2223
    2324# Download source
    … …  
    3536rm -rf gmt-${VER}
    3637
    37 # Copy custom configuration files
    38 cp ./configs/6/mac/cmake/ConfigUser.cmake ./src/cmake
    39 cp ./configs/6/mac/cmake/modules/ConfigCMake.cmake ./src/cmake/modules
     38# Copy custom configuration files to source
     39cp ./src/cmake/ConfigUserAdvancedTemplate.cmake ./src/cmake/ConfigUser.cmake
     40
     41# Patch source
     42patch ./src/cmake/ConfigUser.cmake < ./configs/${VER%.*}/cmake/ConfigUserAdvancedTemplate.cmake.patch
     43patch ./src/cmake/modules/ConfigCMake.cmake < ./configs/${VER%.*}/cmake/modules/ConfigCMake.cmake.patch
    4044
    4145# Configure
    … …  
    5256#
    5357cmake \
     58        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
    5459        -DBLAS_LIBRARIES="-L${BLAS_ROOT}/lib;-lfblas;-L${LIBGFORTRAN_ROOT};-lgfortran" \
    5560        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \

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

    r28177 r28178  
    55## Constants
    66#
    7 VER="3.17.4"
     7VER="3.20.5"
    88
    99PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS

  • issm/trunk-jpl/externalpackages/petsc/install-3.20-linux.sh

    r28177 r28178  
    33
    44## Constants
    5 VER="3.17.4"
     5#
     6VER="3.20.5"
    67
    78PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS

  • issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff

    r28055 r28178  
    4444        autotools       install-linux.sh
    4545        cmake           install.sh
    46         petsc           install-3.17-linux.sh
     46        petsc           install-3.20-linux.sh
    4747        gsl                     install.sh
    4848        triangle        install-linux.sh

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

    r28055 r28178  
    4444        autotools               install-linux.sh
    4545        cmake                   install.sh
    46         petsc                   install-3.17-linux.sh
     46        petsc                   install-3.20-linux.sh
    4747        gsl                             install.sh
    4848        triangle                install-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-basic

    r28079 r28178  
    3333        autotools       install-linux.sh
    3434        cmake           install.sh
    35         petsc           install-3.17-linux.sh
     35        petsc           install-3.20-linux.sh
    3636        triangle        install-linux.sh
    3737        m1qn3           install-linux.sh

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

    r28079 r28178  
    4545        autotools       install-linux.sh
    4646        cmake           install.sh
    47         petsc           install-3.17-linux-static.sh
     47        petsc           install-3.20-linux-static.sh
    4848        gsl                     install-static.sh
    4949        boost           install-1.7-linux-static.sh

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

    r28079 r28178  
    4646        autotools       install-linux.sh
    4747        cmake           install.sh
    48         petsc           install-3.17-linux-static.sh
     48        petsc           install-3.20-linux-static.sh
    4949        gsl                     install-static.sh
    5050        boost           install-1.7-linux-static.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-codipack

    r28079 r28178  
    3939        autotools       install-linux.sh
    4040        cmake           install.sh
    41         petsc           install-3.17-linux.sh
     41        petsc           install-3.20-linux.sh
    4242        gsl                     install.sh
    4343        triangle        install-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-dakota

    r28129 r28178  
    4444        autotools               install-linux.sh
    4545        cmake                   install.sh
    46         petsc                   install-3.17-linux.sh
     46        petsc                   install-3.20-linux.sh
    4747        gsl                             install.sh
    4848        boost                   install-1.7-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full

    r28079 r28178  
    4545        autotools       install-linux.sh
    4646        cmake           install.sh
    47         petsc           install-3.17-linux.sh
     47        petsc           install-3.20-linux.sh
    4848        gsl                     install.sh
    4949        boost           install-1.7-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack

    r28079 r28178  
    4444        autotools       install-linux.sh
    4545        cmake           install.sh
    46         petsc           install-3.17-linux.sh
     46        petsc           install-3.20-linux.sh
    4747        mplapack        install-2-linux.sh
    4848        gsl                     install.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind

    r28079 r28178  
    4444        autotools       install-linux.sh
    4545        cmake           install.sh
    46         petsc           install-3.17-linux.sh
     46        petsc           install-3.20-linux.sh
    4747        gsl                     install.sh
    4848        boost           install-1.7-linux-valgrind.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-gia

    r28055 r28178  
    3737        autotools       install-linux.sh
    3838        cmake           install.sh
    39         petsc           install-3.17-linux.sh
     39        petsc           install-3.20-linux.sh
    4040        triangle        install-linux.sh
    4141        math77          install.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-iceocean

    r28079 r28178  
    3434        autotools       install-linux.sh
    3535        cmake           install.sh
    36         petsc           install-3.17-linux.sh
     36        petsc           install-3.20-linux.sh
    3737        triangle        install-linux.sh
    3838        m1qn3           install-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-python

    r28126 r28178  
    3333        autotools       install-linux.sh
    3434        cmake           install.sh
    35         petsc           install-3.17-linux.sh
     35        petsc           install-3.20-linux.sh
    3636        triangle        install-linux.sh
    3737        m1qn3           install-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

    r28079 r28178  
    4242        autotools               install-linux.sh
    4343        cmake                   install.sh
    44         petsc                   install-3.17-linux.sh
     44        petsc                   install-3.20-linux.sh
    4545        gsl                             install.sh
    4646        boost                   install-1.7-linux.sh
Note: See TracChangeset for help on using the changeset viewer.