Skip to content

Commit 1b6992a

Browse files
huydhnhuydhn
committed
Address review comments
Signed-off-by: Huy Do <huydhn@gmail.com>
1 parent f5bb128 commit 1b6992a

6 files changed

Lines changed: 1100 additions & 215 deletions

‎tools/scripts/generate_binary_build_matrix.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"release": ["3.10", "3.11", "3.12", "3.13", "3.14", "3.14t"],
2828
}
2929
CUDA_ARCHES_DICT = {
30-
"nightly": ["12.6", "12.8", "12.9", "13.0"],
31-
"test": ["12.6", "12.8", "12.9", "13.0"],
32-
"release": ["12.6", "12.8", "12.9", "13.0"],
30+
"nightly": ["12.6", "12.8", "13.0"],
31+
"test": ["12.6", "12.8", "13.0"],
32+
"release": ["12.6", "12.8", "13.0"],
3333
}
3434

3535
ROCM_ARCHES_DICT = {
@@ -148,7 +148,7 @@ def validation_runner(arch_type: str, os: str) -> str:
148148
return LINUX_CPU_RUNNER
149149

150150

151-
def initialize_globals(channel: str, build_python_only: bool) -> None:
151+
def initialize_globals(channel: str, os: str, build_python_only: bool) -> None:
152152
global CURRENT_VERSION, CUDA_ARCHES, ROCM_ARCHES, PYTHON_ARCHES
153153
global WHEEL_CONTAINER_IMAGES, LIBTORCH_CONTAINER_IMAGES
154154
if channel == TEST:
@@ -157,6 +157,9 @@ def initialize_globals(channel: str, build_python_only: bool) -> None:
157157
CURRENT_VERSION = CURRENT_STABLE_VERSION
158158

159159
CUDA_ARCHES = CUDA_ARCHES_DICT[channel]
160+
if channel != "release" and os == LINUX:
161+
# Only build CUDA 12.9 for Linux
162+
CUDA_ARCHES.append("12.9")
160163
ROCM_ARCHES = ROCM_ARCHES_DICT[channel]
161164
if build_python_only:
162165
# Only select the oldest version of python if building a python only package
@@ -523,7 +526,7 @@ def generate_build_matrix(
523526

524527
for channel in channels:
525528
for package in package_types:
526-
initialize_globals(channel, build_python_only == ENABLE)
529+
initialize_globals(channel, operating_system, build_python_only == ENABLE)
527530
includes.extend(
528531
GENERATING_FUNCTIONS_BY_PACKAGE_TYPE[package](
529532
operating_system,

‎tools/tests/assets/build_matrix_linux_wheel_cuda.json‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@
4545
{
4646
"python_version": "3.10",
4747
"gpu_arch_type": "cuda",
48-
"gpu_arch_version": "12.9",
49-
"desired_cuda": "cu129",
50-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
48+
"gpu_arch_version": "13.0",
49+
"desired_cuda": "cu130",
50+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
5151
"package_type": "manywheel",
52-
"build_name": "manywheel-py3_10-cuda12_9",
52+
"build_name": "manywheel-py3_10-cuda13_0",
5353
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
54-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
54+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
5555
"channel": "nightly",
5656
"upload_to_base_bucket": "no",
5757
"stable_version": "2.9.0"
5858
},
5959
{
6060
"python_version": "3.10",
6161
"gpu_arch_type": "cuda",
62-
"gpu_arch_version": "13.0",
63-
"desired_cuda": "cu130",
64-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
62+
"gpu_arch_version": "12.9",
63+
"desired_cuda": "cu129",
64+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
6565
"package_type": "manywheel",
66-
"build_name": "manywheel-py3_10-cuda13_0",
66+
"build_name": "manywheel-py3_10-cuda12_9",
6767
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
68-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
68+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
6969
"channel": "nightly",
7070
"upload_to_base_bucket": "no",
7171
"stable_version": "2.9.0"
@@ -143,27 +143,27 @@
143143
{
144144
"python_version": "3.11",
145145
"gpu_arch_type": "cuda",
146-
"gpu_arch_version": "12.9",
147-
"desired_cuda": "cu129",
148-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
146+
"gpu_arch_version": "13.0",
147+
"desired_cuda": "cu130",
148+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
149149
"package_type": "manywheel",
150-
"build_name": "manywheel-py3_11-cuda12_9",
150+
"build_name": "manywheel-py3_11-cuda13_0",
151151
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
152-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
152+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
153153
"channel": "nightly",
154154
"upload_to_base_bucket": "no",
155155
"stable_version": "2.9.0"
156156
},
157157
{
158158
"python_version": "3.11",
159159
"gpu_arch_type": "cuda",
160-
"gpu_arch_version": "13.0",
161-
"desired_cuda": "cu130",
162-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
160+
"gpu_arch_version": "12.9",
161+
"desired_cuda": "cu129",
162+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
163163
"package_type": "manywheel",
164-
"build_name": "manywheel-py3_11-cuda13_0",
164+
"build_name": "manywheel-py3_11-cuda12_9",
165165
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
166-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
166+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
167167
"channel": "nightly",
168168
"upload_to_base_bucket": "no",
169169
"stable_version": "2.9.0"
@@ -241,27 +241,27 @@
241241
{
242242
"python_version": "3.12",
243243
"gpu_arch_type": "cuda",
244-
"gpu_arch_version": "12.9",
245-
"desired_cuda": "cu129",
246-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
244+
"gpu_arch_version": "13.0",
245+
"desired_cuda": "cu130",
246+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
247247
"package_type": "manywheel",
248-
"build_name": "manywheel-py3_12-cuda12_9",
248+
"build_name": "manywheel-py3_12-cuda13_0",
249249
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
250-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
250+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
251251
"channel": "nightly",
252252
"upload_to_base_bucket": "no",
253253
"stable_version": "2.9.0"
254254
},
255255
{
256256
"python_version": "3.12",
257257
"gpu_arch_type": "cuda",
258-
"gpu_arch_version": "13.0",
259-
"desired_cuda": "cu130",
260-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
258+
"gpu_arch_version": "12.9",
259+
"desired_cuda": "cu129",
260+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
261261
"package_type": "manywheel",
262-
"build_name": "manywheel-py3_12-cuda13_0",
262+
"build_name": "manywheel-py3_12-cuda12_9",
263263
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
264-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
264+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
265265
"channel": "nightly",
266266
"upload_to_base_bucket": "no",
267267
"stable_version": "2.9.0"
@@ -339,27 +339,27 @@
339339
{
340340
"python_version": "3.13",
341341
"gpu_arch_type": "cuda",
342-
"gpu_arch_version": "12.9",
343-
"desired_cuda": "cu129",
344-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
342+
"gpu_arch_version": "13.0",
343+
"desired_cuda": "cu130",
344+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
345345
"package_type": "manywheel",
346-
"build_name": "manywheel-py3_13-cuda12_9",
346+
"build_name": "manywheel-py3_13-cuda13_0",
347347
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
348-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
348+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
349349
"channel": "nightly",
350350
"upload_to_base_bucket": "no",
351351
"stable_version": "2.9.0"
352352
},
353353
{
354354
"python_version": "3.13",
355355
"gpu_arch_type": "cuda",
356-
"gpu_arch_version": "13.0",
357-
"desired_cuda": "cu130",
358-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
356+
"gpu_arch_version": "12.9",
357+
"desired_cuda": "cu129",
358+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
359359
"package_type": "manywheel",
360-
"build_name": "manywheel-py3_13-cuda13_0",
360+
"build_name": "manywheel-py3_13-cuda12_9",
361361
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
362-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
362+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
363363
"channel": "nightly",
364364
"upload_to_base_bucket": "no",
365365
"stable_version": "2.9.0"
@@ -437,27 +437,27 @@
437437
{
438438
"python_version": "3.13t",
439439
"gpu_arch_type": "cuda",
440-
"gpu_arch_version": "12.9",
441-
"desired_cuda": "cu129",
442-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
440+
"gpu_arch_version": "13.0",
441+
"desired_cuda": "cu130",
442+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
443443
"package_type": "manywheel",
444-
"build_name": "manywheel-py3_13t-cuda12_9",
444+
"build_name": "manywheel-py3_13t-cuda13_0",
445445
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
446-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
446+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
447447
"channel": "nightly",
448448
"upload_to_base_bucket": "no",
449449
"stable_version": "2.9.0"
450450
},
451451
{
452452
"python_version": "3.13t",
453453
"gpu_arch_type": "cuda",
454-
"gpu_arch_version": "13.0",
455-
"desired_cuda": "cu130",
456-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
454+
"gpu_arch_version": "12.9",
455+
"desired_cuda": "cu129",
456+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
457457
"package_type": "manywheel",
458-
"build_name": "manywheel-py3_13t-cuda13_0",
458+
"build_name": "manywheel-py3_13t-cuda12_9",
459459
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
460-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
460+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
461461
"channel": "nightly",
462462
"upload_to_base_bucket": "no",
463463
"stable_version": "2.9.0"
@@ -535,27 +535,27 @@
535535
{
536536
"python_version": "3.14",
537537
"gpu_arch_type": "cuda",
538-
"gpu_arch_version": "12.9",
539-
"desired_cuda": "cu129",
540-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
538+
"gpu_arch_version": "13.0",
539+
"desired_cuda": "cu130",
540+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
541541
"package_type": "manywheel",
542-
"build_name": "manywheel-py3_14-cuda12_9",
542+
"build_name": "manywheel-py3_14-cuda13_0",
543543
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
544-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
544+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
545545
"channel": "nightly",
546546
"upload_to_base_bucket": "no",
547547
"stable_version": "2.9.0"
548548
},
549549
{
550550
"python_version": "3.14",
551551
"gpu_arch_type": "cuda",
552-
"gpu_arch_version": "13.0",
553-
"desired_cuda": "cu130",
554-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
552+
"gpu_arch_version": "12.9",
553+
"desired_cuda": "cu129",
554+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
555555
"package_type": "manywheel",
556-
"build_name": "manywheel-py3_14-cuda13_0",
556+
"build_name": "manywheel-py3_14-cuda12_9",
557557
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
558-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
558+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
559559
"channel": "nightly",
560560
"upload_to_base_bucket": "no",
561561
"stable_version": "2.9.0"
@@ -633,27 +633,27 @@
633633
{
634634
"python_version": "3.14t",
635635
"gpu_arch_type": "cuda",
636-
"gpu_arch_version": "12.9",
637-
"desired_cuda": "cu129",
638-
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
636+
"gpu_arch_version": "13.0",
637+
"desired_cuda": "cu130",
638+
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
639639
"package_type": "manywheel",
640-
"build_name": "manywheel-py3_14t-cuda12_9",
640+
"build_name": "manywheel-py3_14t-cuda13_0",
641641
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
642-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
642+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
643643
"channel": "nightly",
644644
"upload_to_base_bucket": "no",
645645
"stable_version": "2.9.0"
646646
},
647647
{
648648
"python_version": "3.14t",
649649
"gpu_arch_type": "cuda",
650-
"gpu_arch_version": "13.0",
651-
"desired_cuda": "cu130",
652-
"container_image": "pytorch/manylinux2_28-builder:cuda13.0",
650+
"gpu_arch_version": "12.9",
651+
"desired_cuda": "cu129",
652+
"container_image": "pytorch/manylinux2_28-builder:cuda12.9",
653653
"package_type": "manywheel",
654-
"build_name": "manywheel-py3_14t-cuda13_0",
654+
"build_name": "manywheel-py3_14t-cuda12_9",
655655
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
656-
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu130",
656+
"installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu129",
657657
"channel": "nightly",
658658
"upload_to_base_bucket": "no",
659659
"stable_version": "2.9.0"

0 commit comments

Comments
 (0)