8000 Revert "Remove Cuda 12.4 from nightly Binaries (#148625)" · pytorch/pytorch@99da439 · GitHub
[go: up one dir, main page]
Skip to content

Commit 99da439

Browse files
pytorchmergebotpytorchmergebot
committed
Revert "Remove Cuda 12.4 from nightly Binaries (#148625)"
This reverts commit 1239176. Reverted #148625 on behalf of https://github.com/malfet 8000 due to Broke lint ([comment](#148625 (comment)))
1 parent 6602e63 commit 99da439

11 files changed

+2957
-487
lines changed

‎.github/scripts/generate_binary_build_matrix.py

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616

1717

1818
# NOTE: Also update the CUDA sources in tools/nightly.py when changing this list
19-
CUDA_ARCHES = ["11.8", "12.6", "12.8"]
19+
CUDA_ARCHES = ["11.8", "12.4", "12.6", "12.8"]
2020
CUDA_ARCHES_FULL_VERSION = {
2121
"11.8": "11.8.0",
22+
"12.4": "12.4.1",
2223
"12.6": "12.6.3",
2324
"12.8": "12.8.0",
2425
}
2526
CUDA_ARCHES_CUDNN_VERSION = {
2627
"11.8": "9",
28+
"12.4": "9",
2729
"12.6": "9",
2830
"12.8": "9",
2931
}
@@ -56,6 +58,21 @@
5658
"nvidia-nccl-cu11==2.21.5; platform_system == 'Linux' and platform_machine == 'x86_64' | "
5759
"nvidia-nvtx-cu11==11.8.86; platform_system == 'Linux' and platform_machine == 'x86_64'"
5860
),
61+
"12.4": (
62+
"nvidia-cuda-nvrtc-cu12==12.4.127; platform_system == 'Linux' and platform_machine == 'x86_64' | "
63+
"nvidia-cuda-runtime-cu12==12.4.127; platform_system == 'Linux' and platform_machine == 'x86_64' | "
64+
"nvidia-cuda-cupti-cu12==12.4.127; platform_system == 'Linux' and platform_machine == 'x86_64' | "
65+
"nvidia-cudnn-cu12==9.1.0.70; platform_system == 'Linux' and platform_machine == 'x86_64' | "
66+
"nvidia-cublas-cu12==12.4.5.8; platform_system == 'Linux' and platform_machine == 'x86_64' | "
67+
"nvidia-cufft-cu12==11.2.1.3; platform_system == 'Linux' and platform_machine == 'x86_64' | "
68+
"nvidia-curand-cu12==10.3.5.147; platform_system == 'Linux' and platform_machine == 'x86_64' | "
69+
"nvidia-cusolver-cu12==11.6.1.9; platform_system == 'Linux' and platform_machine == 'x86_64' | "
70+
"nvidia-cusparse-cu12==12.3.1.170; platform_system == 'Linux' and platform_machine == 'x86_64' | "
71+
"nvidia-cusparselt-cu12==0.6.2; platform_system == 'Linux' and platform_machine == 'x86_64' | "
72+
"nvidia-nccl-cu12==2.25.1; platform_system == 'Linux' and platform_machine == 'x86_64' | "
73+
"nvidia-nvtx-cu12==12.4.127; platform_system == 'Linux' and platform_machine == 'x86_64' | "
74+
"nvidia-nvjitlink-cu12==12.4.127; platform_system == 'Linux' and platform_machine == 'x86_64'"
75+
),
5976
"12.6": (
6077
"nvidia-cuda-nvrtc-cu12==12.6.77; platform_system == 'Linux' and platform_machine == 'x86_64' | "
6178
"nvidia-cuda-runtime-cu12==12.6.77; platform_system == 'Linux' and platform_machine == 'x86_64' | "
@@ -331,7 +348,7 @@ def generate_wheels_matrix(
331348
continue
332349

333350
if use_split_build and (
334-
arch_version not in ["12.6", "12.8", "11.8", "cpu"] or os != "linux"
351+
arch_version not in ["12.6", "12.4", "11.8", "cpu"] or os != "linux"
335352
):
336353
raise RuntimeError(
337354
"Split build is only supported on linux with cuda 12*, 11.8, and cpu.\n"
@@ -342,7 +359,7 @@ def generate_wheels_matrix(
342359
# cuda linux wheels require PYTORCH_EXTRA_INSTALL_REQUIREMENTS to install
343360

344361
if (
345-
arch_version in ["12.8", "12.6", "11.8"]
362+
arch_version in ["12.8", "12.6", "12.4", "11.8"]
346363
and os == "linux"
347364
or arch_version in CUDA_AARCH64_ARCHES
348365
):
@@ -371,8 +388,8 @@ def generate_wheels_matrix(
371388
), # include special case for aarch64 build, remove the -aarch64 postfix
372389
}
373390
)
374-
# Special build building to use on Colab. Python 3.11 for 12.6 CUDA
375-
if python_version == "3.11" and arch_version == "12.6":
391+
# Special build building to use on Colab. Python 3.11 for 12.4 CUDA
392+
if python_version == "3.11" and arch_version == "12.4":
376393
ret.append(
377394
{
378395
"python_version": python_version,
@@ -415,7 +432,7 @@ def generate_wheels_matrix(
415432
"pytorch_extra_install_requirements": (
416433
PYTORCH_EXTRA_INSTALL_REQUIREMENTS["xpu"]
417434
if gpu_arch_type == "xpu"
418-
else PYTORCH_EXTRA_INSTALL_REQUIREMENTS["12.6"]
435+
else PYTORCH_EXTRA_INSTALL_REQUIREMENTS["12.4"]
419436
if os != "linux"
420437
else ""
421438
),
@@ -427,4 +444,5 @@ def generate_wheels_matrix(
427444

428445
validate_nccl_dep_consistency("12.8")
429446
validate_nccl_dep_consistency("12.6")
447+
validate_nccl_dep_consistency("12.4")
430448
validate_nccl_dep_consistency("11.8")

‎.github/scripts/generate_ci_workflows.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class OperatingSystem:
152152
package_type="manywheel",
153153
build_configs=generate_binary_build_matrix.generate_wheels_matrix(
154154
OperatingSystem.LINUX,
155-
arches=["11.8", "12.6", "12.8"],
155+
arches=["11.8", "12.4", "12.6", "12.8"],
156156
python_versions=["3.9"],
157157
),
158158
branches="main",

0 commit comments

Comments
 (0)
0