Skip to content

Commit dbd52c9

Browse files
Alexey-RivkinAlexey-Rivkin
authored
AZP/RELEASE: Add CUDA 13 support - v1.19.x (#10891)
1 parent 9834110 commit dbd52c9

File tree

13 files changed

+98
-7
lines changed

13 files changed

+98
-7
lines changed

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Manjunath Gorentla Venkata <[email protected]>
6363
Marek Schimara <[email protected]>
6464
Mark Allen <[email protected]>
6565
Matthew Baker <[email protected]>
66+
Michael Braverman <[email protected]>
6667
Michal Shalev <[email protected]>
6768
Mike Dubman <[email protected]>
6869
Mikhail Brinskii <[email protected]>

‎bindings/go/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CGOLDFLAGS=-L$(abs_top_builddir)/src/ucp/$(objdir) -lucp -L$(abs_top_builddir)/s
1515

1616
if HAVE_CUDA
1717
CGOLDFLAGS+=$(CUDA_LDFLAGS) $(CUDA_LIBS) $(CUDART_LIBS)
18+
CGOCFLAGS+=$(CUDA_CPPFLAGS)
1819
GOTAGS=cuda
1920
else
2021
GOTAGS=

‎buildlib/az-distro-release.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ jobs:
3737
ubuntu24_cuda12_${{ parameters.arch }}:
3838
build_container: ubuntu24_cuda12_${{ parameters.arch }}
3939
artifact_name: $(POSTFIX)-ubuntu24.04-mofed5-cuda12-${{ parameters.arch }}.tar.bz2
40+
ubuntu22_cuda13_${{ parameters.arch }}:
41+
build_container: ubuntu22_cuda13_${{ parameters.arch }}
42+
artifact_name: $(POSTFIX)-ubuntu22.04-mofed5-cuda13-${{ parameters.arch }}.tar.bz2
43+
ubuntu24_cuda13_${{ parameters.arch }}:
44+
build_container: ubuntu24_cuda13_${{ parameters.arch }}
45+
artifact_name: $(POSTFIX)-ubuntu24.04-mofed5-cuda13-${{ parameters.arch }}.tar.bz2
4046
# x86 only
4147
${{ if eq(parameters.arch, 'x86_64') }}:
4248
centos7_cuda11_${{ parameters.arch }}:

‎buildlib/az-helpers.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,19 @@ try_load_cuda_env() {
188188
num_gpus=$(nvidia-smi -L | grep GPU | wc -l)
189189
[ "${num_gpus}" -gt 0 ] || return 0
190190

191-
# Check cuda env module
192-
az_module_load dev/cuda12.8 || return 0
191+
az_module_load dev/cuda13.0.0 || return 0
193192
have_cuda=yes
194193

195194
# Check gdrcopy
196195
if [ -w "/dev/gdrdrv" ]
197196
then
198-
az_module_load dev/gdrcopy2.4.4_cuda12.8.0 && have_gdrcopy=yes
197+
az_module_load dev/gdrcopy2.5.1_cuda13.0.0 && have_gdrcopy=yes
199198
fi
200199
}
201200

202201
load_cuda_env() {
203202
try_load_cuda_env
204-
if [ "${have_cuda}" != "yes" ] ; then
203+
if [ "${have_cuda}" == "no" ] ; then
205204
if [ "${ucx_gpu}" = "yes" ] ; then
206205
azure_log_error "CUDA load failed on GPU node $(hostname -s)"
207206
exit 1

‎buildlib/azure-pipelines-release-drp.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ resources:
4444
image: $(REPO_MIRROR)/ucx/x86_64/ubuntu20.04-mofed5-cuda12:3
4545
- container: ubuntu24_cuda12_x86_64
4646
image: $(REPO_MIRROR)/ucx/x86_64/ubuntu24.04-mofed24.10-cuda12.5:1
47+
- container: ubuntu22_cuda13_x86_64
48+
image: $(REPO_MIRROR)/ucx/x86_64/ubuntu22.04-mofed5-cuda13:1
49+
- container: ubuntu24_cuda13_x86_64
50+
image: $(REPO_MIRROR)/ucx/x86_64/ubuntu24.04-mofed24.10-cuda13:1
4751

4852
# aarch64
4953
- container: centos8_cuda11_aarch64
@@ -61,6 +65,10 @@ resources:
6165
image: $(REPO_MIRROR)/ucx/aarch64/ubuntu22.04-mofed5-cuda12:3
6266
- container: ubuntu24_cuda12_aarch64
6367
image: $(REPO_MIRROR)/ucx/aarch64/ubuntu24.04-mofed24.10-cuda12.5:1
68+
- container: ubuntu22_cuda13_aarch64
69+
image: $(REPO_MIRROR)/ucx/aarch64/ubuntu22.04-mofed5-cuda13:1
70+
- container: ubuntu24_cuda13_aarch64
71+
image: $(REPO_MIRROR)/ucx/aarch64/ubuntu24.04-mofed24.10-cuda13:1
6472

6573
stages:
6674
- stage: Prepare

‎buildlib/azure-pipelines-release.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ resources:
4040
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu22.04-mofed5-cuda12:3
4141
- container: ubuntu24_cuda12_x86_64
4242
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu24.04-mofed24.10-cuda12.5:1
43+
- container: ubuntu22_cuda13_x86_64
44+
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu22.04-mofed5-cuda13:1
45+
- container: ubuntu24_cuda13_x86_64
46+
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu24.04-mofed24.10-cuda13:1
4347

4448
# aarch64
4549
- container: centos8_cuda11_aarch64
@@ -57,6 +61,10 @@ resources:
5761
image: rdmz-harbor.rdmz.labs.mlnx/ucx/aarch64/ubuntu22.04-mofed5-cuda12:3
5862
- container: ubuntu24_cuda12_aarch64
5963
image: rdmz-harbor.rdmz.labs.mlnx/ucx/aarch64/ubuntu24.04-mofed24.10-cuda12.5:1
64+
- container: ubuntu22_cuda13_aarch64
65+
image: rdmz-harbor.rdmz.labs.mlnx/ucx/aarch64/ubuntu22.04-mofed5-cuda13:1
66+
- container: ubuntu24_cuda13_aarch64
67+
image: rdmz-harbor.rdmz.labs.mlnx/ucx/aarch64/ubuntu24.04-mofed24.10-cuda13:1
6068

6169
stages:
6270
- stage: Prepare

‎buildlib/dockers/docker-compose-aarch64.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,27 @@ services:
9393
CUDA_VERSION: 12.5.1
9494
NV_DRIVER_VERSION: 555
9595
ARCH: aarch64
96+
ubuntu22.04-mofed5-cuda13:
97+
image: ubuntu22.04-mofed5-cuda13:1
98+
build:
99+
context: .
100+
network: host
101+
dockerfile: ubuntu-release.Dockerfile
102+
args:
103+
MOFED_VERSION: 5.8-7.0.6.1
104+
UBUNTU_VERSION: 22.04
105+
CUDA_VERSION: 13.0.0
106+
NV_DRIVER_VERSION: 580
107+
ARCH: aarch64
108+
ubuntu24.04-mofed5-cuda13:
109+
image: ubuntu24.04-mofed24.10-cuda13:1
110+
build:
111+
context: .
112+
network: host
113+
dockerfile: ubuntu-release.Dockerfile
114+
args:
115+
MOFED_VERSION: 24.10-3.2.5.0
116+
UBUNTU_VERSION: 24.04
117+
CUDA_VERSION: 13.0.0
118+
NV_DRIVER_VERSION: 580
119+
ARCH: aarch64

‎buildlib/dockers/docker-compose-x86_64.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,27 @@ services:
129129
CUDA_VERSION: 12.5.1
130130
NV_DRIVER_VERSION: 555
131131
ARCH: x86_64
132+
ubuntu22.04-mofed5-cuda13:
133+
image: ubuntu22.04-mofed5-cuda13:1
134+
build:
135+
context: .
136+
network: host
137+
dockerfile: ubuntu-release.Dockerfile
138+
args:
139+
MOFED_VERSION: 5.8-7.0.6.1
140+
UBUNTU_VERSION: 22.04
141+
CUDA_VERSION: 13.0.0
142+
NV_DRIVER_VERSION: 580
143+
ARCH: x86_64
144+
ubuntu24.04-mofed5-cuda13:
145+
image: ubuntu24.04-mofed24.10-cuda13:1
146+
build:
147+
context: .
148+
network: host
149+
dockerfile: ubuntu-release.Dockerfile
150+
args:
151+
MOFED_VERSION: 24.10-3.2.5.0
152+
UBUNTU_VERSION: 24.04
153+
CUDA_VERSION: 13.0.0
154+
NV_DRIVER_VERSION: 580
155+
ARCH: x86_64

‎buildlib/pr/cuda/cuda.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ jobs:
9292
CONTAINER: ubuntu22_cuda_12_0
9393
ubuntu22_cuda_12_1:
9494
CONTAINER: ubuntu22_cuda_12_1
95+
ubuntu22_cuda_13_0:
96+
CONTAINER: ubuntu22_cuda_13_0
97+
ubuntu24_cuda_13_0:
98+
CONTAINER: ubuntu24_cuda_13_0
9599

96100
container: $[ variables['CONTAINER'] ]
97101
timeoutInMinutes: 35

‎buildlib/pr/main.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ resources:
153153
- container: ubuntu22_cuda_12_1
154154
image: nvidia/cuda:12.1.0-devel-ubuntu22.04
155155
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_GPU)
156+
- container: ubuntu22_cuda_13_0
157+
image: nvidia/cuda:13.0.0-devel-ubuntu22.04
158+
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_GPU)
159+
- container: ubuntu24_cuda_13_0
160+
image: nvidia/cuda:13.0.0-devel-ubuntu24.04
161+
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_GPU)
156162
- container: centos8_cuda11
157163
image: rdmz-harbor.rdmz.labs.mlnx/ucx/centos8-mofed5-cuda11:1
158164
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_VOLUMES) $(DOCKER_OPT_GPU)
@@ -174,6 +180,12 @@ resources:
174180
- container: ubuntu22_cuda12
175181
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu22.04-mofed5-cuda12:3
176182
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_VOLUMES) $(DOCKER_OPT_GPU)
183+
- container: ubuntu22_cuda13
184+
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu22.04-mofed5-cuda13:1
185+
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_VOLUMES) $(DOCKER_OPT_GPU)
186+
- container: ubuntu24_cuda13
187+
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu24.04-mofed24.10-cuda13:1
188+
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_VOLUMES) $(DOCKER_OPT_GPU)
177189
- container: ubuntu2204_rocm_6_0_0
178190
image: rdmz-harbor.rdmz.labs.mlnx/ucx/x86_64/ubuntu2204:rocm-6.0.0
179191
options: $(DOCKER_OPT_ARGS) $(DOCKER_OPT_VOLUMES)

0 commit comments

Comments
 (0)