Skip to content

Commit 2a91503

Browse files
samcmillsamcmill
authored
Bump default NVHPC version to 24.7 (#490)
1 parent 67fdb28 commit 2a91503

File tree

3 files changed

+31
-25
lines changed

3 files changed

+31
-25
lines changed

‎docs/building_blocks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3196,7 +3196,7 @@ the default GNU toolchain.
31963196

31973197
- __version__: The version of the HPC SDK to use. Note when `package`
31983198
is set the version is determined automatically from the package
3199-
file name. The default value is `23.11`.
3199+
file name. The default value is `24.7`.
32003200

32013201
__Examples__
32023202

‎hpccm/building_blocks/nvhpc.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class nvhpc(bb_base, hpccm.templates.downloader, hpccm.templates.envvars,
117117
118118
version: The version of the HPC SDK to use. Note when `package`
119119
is set the version is determined automatically from the package
120-
file name. The default value is `23.11`.
120+
file name. The default value is `24.7`.
121121
122122
# Examples
123123
@@ -175,14 +175,20 @@ def __init__(self, **kwargs):
175175
self.__tarball = kwargs.get('tarball', False)
176176
self.__toolchain = kwargs.get('toolchain', None)
177177
self.__url = kwargs.get('url', None)
178-
self.__version = kwargs.get('version', '23.11')
178+
self.__version = kwargs.get('version', '24.7')
179179
self.__wd = kwargs.get('wd', hpccm.config.g_wd) # working directory
180180
self.__year = '' # Filled in by __get_version()
181181

182182
self.toolchain = toolchain(CC='nvc', CXX='nvc++', F77='nvfortran',
183183
F90='nvfortran', FC='nvfortran')
184184

185-
if Version(self.__version) >= Version('23.7'):
185+
if Version(self.__version) >= Version('24.7'):
186+
self.__cuda_version_default = '12.5'
187+
elif Version(self.__version) >= Version('24.5'):
188+
self.__cuda_version_default = '12.4'
189+
elif Version(self.__version) >= Version('23.11'):
190+
self.__cuda_version_default = '12.3'
191+
elif Version(self.__version) >= Version('23.7'):
186192
self.__cuda_version_default = '12.2'
187193
elif Version(self.__version) >= Version('23.5'):
188194
self.__cuda_version_default = '12.1'

‎test/test_nvhpc.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_defaults_ubuntu(self):
3939
"""Default HPC SDK building block"""
4040
n = nvhpc(eula=True)
4141
self.assertMultiLineEqual(str(n),
42-
r'''# NVIDIA HPC SDK version 23.11
42+
r'''# NVIDIA HPC SDK version 24.7
4343
RUN apt-get update -y && \
4444
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
4545
ca-certificates \
@@ -52,12 +52,12 @@ def test_defaults_ubuntu(self):
5252
echo "deb [signed-by=/usr/share/keyrings/DEB-GPG-KEY-NVIDIA-HPC-SDK.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /" >> /etc/apt/sources.list.d/hpccm.list && \
5353
apt-get update -y && \
5454
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
55-
nvhpc-23-11-cuda-multi && \
55+
nvhpc-24-7-cuda-multi && \
5656
rm -rf /var/lib/apt/lists/*
57-
ENV CPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nvshmem/include:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nccl/include:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/extras/qd/include/qd:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/include:$CPATH \
58-
LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nvshmem/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nccl/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/cuda/lib64:$LD_LIBRARY_PATH \
59-
MANPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/man:$MANPATH \
60-
PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nvshmem/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nccl/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/profilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/cuda/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/mpi/bin:$PATH''')
57+
ENV CPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nvshmem/include:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nccl/include:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/extras/qd/include/qd:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/include:$CPATH \
58+
LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nvshmem/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nccl/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/cuda/lib64:$LD_LIBRARY_PATH \
59+
MANPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/man:$MANPATH \
60+
PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nvshmem/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nccl/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/profilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/cuda/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/mpi/bin:$PATH''')
6161

6262
@x86_64
6363
@centos
@@ -66,19 +66,19 @@ def test_defaults_centos(self):
6666
"""Default HPC SDK building block"""
6767
n = nvhpc(eula=True)
6868
self.assertMultiLineEqual(str(n),
69-
r'''# NVIDIA HPC SDK version 23.11
69+
r'''# NVIDIA HPC SDK version 24.7
7070
RUN yum install -y \
7171
ca-certificates && \
7272
rm -rf /var/cache/yum/*
7373
RUN yum install -y yum-utils && \
7474
yum-config-manager --add-repo https://developer.download.nvidia.com/hpc-sdk/rhel/nvhpc.repo && \
7575
yum install -y \
76-
nvhpc-cuda-multi-23.11 && \
76+
nvhpc-cuda-multi-24.7 && \
7777
rm -rf /var/cache/yum/*
78-
ENV CPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nvshmem/include:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nccl/include:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/extras/qd/include/qd:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/include:$CPATH \
79-
LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nvshmem/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nccl/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/cuda/lib64:$LD_LIBRARY_PATH \
80-
MANPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/man:$MANPATH \
81-
PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nvshmem/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/nccl/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/profilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/cuda/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/mpi/bin:$PATH''')
78+
ENV CPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nvshmem/include:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nccl/include:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/extras/qd/include/qd:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/include:$CPATH \
79+
LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nvshmem/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nccl/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/cuda/lib64:$LD_LIBRARY_PATH \
80+
MANPATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/man:$MANPATH \
81+
PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nvshmem/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/nccl/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/profilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/cuda/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/mpi/bin:$PATH''')
8282

8383
@x86_64
8484
@centos
@@ -218,10 +218,10 @@ def test_runtime_ubuntu(self):
218218
libnuma1 \
219219
openssh-client && \
220220
rm -rf /var/lib/apt/lists/*
221-
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/REDIST/compilers/lib/* /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/lib/
222-
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/mpi /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/mpi
223-
ENV LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/mpi/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/lib:$LD_LIBRARY_PATH \
224-
PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/mpi/bin:$PATH''')
221+
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/REDIST/compilers/lib/* /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib/
222+
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/mpi /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/mpi
223+
ENV LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/mpi/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib:$LD_LIBRARY_PATH \
224+
PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/mpi/bin:$PATH''')
225225

226226
@x86_64
227227
@centos
@@ -241,11 +241,11 @@ def test_runtime_centos(self):
241241
numactl-libs \
242242
openssh-clients && \
243243
rm -rf /var/cache/yum/*
244-
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/REDIST/comm_libs/11.8/nccl/lib/libnccl.so /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/11.8/nccl/lib/libnccl.so
245-
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/REDIST/compilers/lib/* /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/lib/
246-
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/REDIST/math_libs/11.8/lib64/libcufft.so.10 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/11.8/lib64/libcufft.so.10
247-
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/REDIST/math_libs/11.8/lib64/libcublas.so.11 /opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/11.8/lib64/libcublas.so.11
248-
ENV LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/comm_libs/11.8/nccl/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.11/math_libs/11.8/lib64:$LD_LIBRARY_PATH''')
244+
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/REDIST/comm_libs/11.8/nccl/lib/libnccl.so /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/11.8/nccl/lib/libnccl.so
245+
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/REDIST/compilers/lib/* /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib/
246+
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/REDIST/math_libs/11.8/lib64/libcufft.so.10 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/11.8/lib64/libcufft.so.10
247+
COPY --from=0 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/REDIST/math_libs/11.8/lib64/libcublas.so.11 /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/11.8/lib64/libcublas.so.11
248+
ENV LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/11.8/nccl/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/11.8/lib64:$LD_LIBRARY_PATH''')
249249

250250
@x86_64
251251
@ubuntu

0 commit comments

Comments
 (0)