diff --git a/configs/sites/tier2/bounty/README_nvhpc-26.5.md b/configs/sites/tier2/bounty/README_nvhpc-26.5.md deleted file mode 100644 index 21c9ea6806..0000000000 --- a/configs/sites/tier2/bounty/README_nvhpc-26.5.md +++ /dev/null @@ -1,13 +0,0 @@ -WSL 2 Alma Linux 9 installation notes for NVHPC 26.5 compiler - -# Download and install nvhpc, for example: -wget https://developer.download.nvidia.com/hpc-sdk/26.5/nvhpc_2026_265_Linux_x86_64_cuda_13.2.tar.gz -tar xpzf nvhpc_2026_265_Linux_x86_64_cuda_13.2.tar.gz -nvhpc_2026_265_Linux_x86_64_cuda_13.2/install - -# Bug fix for missing include directory (symbolic link) -cd -ln -s Linux_x86_64/26.5/compilers/include include - -# Needed for hpcx -yum install libnl3 diff --git a/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml b/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml deleted file mode 100644 index 7d7a68dc98..0000000000 --- a/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml +++ /dev/null @@ -1,18 +0,0 @@ -packages: - all: - require: - - any_of: ['%gcc@=13.3.1'] - when: '%gcc' - mpi: - require: - - "openmpi@=5.0.8" - gcc: - buildable: False - externals: - - spec: gcc@13.3.1 languages:='c,c++,fortran' - prefix: /opt/rh/gcc-toolset-13/root/usr - extra_attributes: - compilers: - c: /opt/rh/gcc-toolset-13/root/usr/bin/gcc - cxx: /opt/rh/gcc-toolset-13/root/usr/bin/g++ - fortran: /opt/rh/gcc-toolset-13/root/usr/bin/gfortran diff --git a/configs/sites/tier2/bounty/packages_nvhpc-26.5.yaml b/configs/sites/tier2/bounty/packages_nvhpc-26.9.yaml similarity index 60% rename from configs/sites/tier2/bounty/packages_nvhpc-26.5.yaml rename to configs/sites/tier2/bounty/packages_nvhpc-26.9.yaml index 3094e5134b..19a3da7eaf 100644 --- a/configs/sites/tier2/bounty/packages_nvhpc-26.5.yaml +++ b/configs/sites/tier2/bounty/packages_nvhpc-26.9.yaml @@ -1,25 +1,24 @@ packages: all: require: - - any_of: ['%nvhpc@=26.5'] + - any_of: ['%nvhpc@=26.9'] when: '%nvhpc' - any_of: ['%gcc@=11.5.0'] when: '%gcc' mpi: buildable: false require: - #- "nvhpc@=26.5" - "openmpi@=5.0.10" nvhpc: buildable: false externals: - - spec: nvhpc@26.5+blas+lapack~mpi - prefix: /home/dom/prod/nvhpc-26.5 + - spec: nvhpc@26.9+blas+lapack~mpi + prefix: /home/dom/prod/nvhpc-26.9 extra_attributes: compilers: - c: /home/dom/prod/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvc - cxx: /home/dom/prod/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvc++ - fortran: /home/dom/prod/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvfortran + c: /home/dom/prod/nvhpc-26.9/Linux_x86_64/26.9/compilers/bin/nvc + cxx: /home/dom/prod/nvhpc-26.9/Linux_x86_64/26.9/compilers/bin/nvc++ + fortran: /home/dom/prod/nvhpc-26.9/Linux_x86_64/26.9/compilers/bin/nvfortran gcc: buildable: false externals: @@ -34,4 +33,4 @@ packages: buildable: false externals: - spec: openmpi@5.0.10 ~internal-hwloc +two_level_namespace - prefix: /home/dom/prod/nvhpc-26.5/Linux_x86_64/26.5/comm_libs/13.2/hpcx/hpcx-2.50/ompi5 + prefix: /home/dom/prod/nvhpc-26.9/Linux_x86_64/26.9/comm_libs/13.3/hpcx/hpcx-2.50/ompi5 diff --git a/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml b/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml deleted file mode 100644 index a81903d450..0000000000 --- a/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml +++ /dev/null @@ -1,41 +0,0 @@ -packages: - all: - require: - - any_of: ['%intel-oneapi-compilers@=2025.3.0'] - when: '%intel-oneapi-compilers' - - any_of: ['%gcc@=11.5.0'] - when: '%gcc' - mpi: - buildable: False - require: - - "intel-oneapi-mpi@2021.17" - intel-oneapi-compilers: - buildable: false - externals: - - spec: intel-oneapi-compilers@2025.3.0 +fix_rt_linkage - prefix: /opt/intel/oneapi - extra_attributes: - compilers: - c: /opt/intel/oneapi/2025.3/bin/icx - cxx: /opt/intel/oneapi/2025.3/bin/icpx - fortran: /opt/intel/oneapi/2025.3/bin/ifx - gcc: - buildable: false - externals: - - spec: gcc@11.5.0 languages:='c,c++' - prefix: /usr - extra_attributes: - compilers: - c: /usr/bin/gcc - cxx: /usr/bin/g++ - fortran: /usr/bin/gfortran - intel-oneapi-mpi: - buildable: false - externals: - - spec: intel-oneapi-mpi@2021.17 - prefix: /opt/intel/oneapi - intel-oneapi-mkl: - buildable: false - externals: - - spec: intel-oneapi-mkl@2025.3 - prefix: /opt/intel/oneapi diff --git a/repos/builtin b/repos/builtin index 7e51ad8614..2154a6587a 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 7e51ad86144fb59b25dab27931284ba71a70fe89 +Subproject commit 2154a6587ad8ba3b379e032882d917da8b62efa8 diff --git a/util/compilers/nvhpc-26.9_install.sh b/util/compilers/nvhpc-26.9_install.sh new file mode 100755 index 0000000000..ae09db3d1f --- /dev/null +++ b/util/compilers/nvhpc-26.9_install.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Note. nvhpc binds to the system gcc at install time. A system update +# that bumps the default gcc means reinstalling the SDK, not just +# rebuilding the software stack and the downstream applications. + +if [ "$#" -lt 1 ]; then + echo "Error: Not enough arguments. Provide NVHPC SDK installation prefix." + exit 1 +fi + +# Configure install via command line arguments +export NVHPC_SILENT=true +export NVHPC_INSTALL_DIR=${1} +export NVHPC_INSTALL_TYPE=single # or "network" for heterogeneous systems; check installer doc for details +export NVHPC_DEFAULT_CUDA=13.3 # optional; sets the default CUDA version + +# Download and install nvhpc +mkdir -p ${NVHPC_INSTALL_DIR}/src +cd ${NVHPC_INSTALL_DIR}/src +wget https://developer.download.nvidia.com/hpc-sdk/26.9/nvhpc_2026_269_Linux_x86_64_cuda_13.3.tar.gz +tar xpzf nvhpc_2026_269_Linux_x86_64_cuda_13.3.tar.gz +./nvhpc_2026_269_Linux_x86_64_cuda_13.3/install + +# Bug fix for missing include directory (symbolic link) +cd ${NVHPC_INSTALL_DIR} +ln -s Linux_x86_64/26.9/compilers/include include + +cd ${NVHPC_INSTALL_DIR}/src +rm -fr nvhpc_2026_269_Linux_x86_64_cuda_13.3