|
2 | 2 | HPCCM development container for the C++ HPC tutorial
|
3 | 3 | https://github.com/NVIDIA/hpc-container-maker/
|
4 | 4 | """
|
5 |
| -nvhpc_ver = '22.5' |
| 5 | +nvhpc_ver = '22.9' |
6 | 6 | cuda_ver = '11.7'
|
| 7 | +gcc_ver = '12' |
| 8 | +llvm_ver = '16' |
7 | 9 |
|
8 | 10 | #Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda{cuda_ver}-ubuntu20.04')
|
9 |
| -Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda_multi-ubuntu20.04') |
| 11 | +Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda_multi-ubuntu22.04') |
10 | 12 |
|
11 | 13 | Stage0 += packages(ospackages=[
|
12 | 14 | 'libtbb-dev', # Required for GCC C++ parallel STL
|
|
18 | 20 | ])
|
19 | 21 |
|
20 | 22 | # Install GNU and LLVM toolchains and CMake
|
21 |
| -Stage0 += gnu(version='11', extra_repository=True) |
22 |
| -Stage0 += llvm(version='15', upstream=True, extra_tools=True, toolset=True) |
23 |
| -Stage0 += cmake(eula=True, version='3.23.2') |
| 23 | +Stage0 += gnu(version=gcc_ver, extra_repository=True) |
| 24 | +Stage0 += llvm(version=llvm_ver, upstream=True, extra_tools=True, toolset=True) |
| 25 | +Stage0 += cmake(eula=True, version='3.24.2') |
24 | 26 |
|
25 | 27 | # Install NSight Systems and NSight Compute profilers
|
26 | 28 | # These are shipped with the HPC SDK containers now
|
|
53 | 55 |
|
54 | 56 | # libc++abi : make sure clang with -stdlib=libc++ can find it
|
55 | 57 | Stage0 += shell(commands=[
|
56 |
| - 'ln -sf /usr/lib/llvm-15/lib/libc++abi.so.1 /usr/lib/llvm-15/lib/libc++abi.so', |
| 58 | + f'ln -sf /usr/lib/llvm-{llvm_ver}/lib/libc++abi.so.1 /usr/lib/llvm-{llvm_ver}/lib/libc++abi.so', |
57 | 59 | ])
|
58 | 60 | Stage0 += environment(variables={
|
59 |
| - 'LD_LIBRARY_PATH':'/usr/lib/llvm-15/lib:$LD_LIBRARY_PATH', |
60 |
| - 'LIBRARY_PATH':'/usr/lib/llvm-15/lib:$LIBRARY_PATH', |
| 61 | + 'LD_LIBRARY_PATH': f'/usr/lib/llvm-{llvm_ver}/lib:$LD_LIBRARY_PATH', |
| 62 | + 'LIBRARY_PATH': f'/usr/lib/llvm-{llvm_ver}/lib:$LIBRARY_PATH', |
| 63 | + 'OMPI_MCA_coll_hcoll_enable':'0', |
61 | 64 | })
|
62 | 65 | Stage0 += copy(src='labs/', dest='/labs/')
|
63 | 66 |
|
|
0 commit comments