Skip to content

Commit

Permalink
Use Manylinux 2.28 for nightly build, remove cuda 12.1 wheel image
Browse files Browse the repository at this point in the history
  • Loading branch information
atalman committed Dec 17, 2024
1 parent a07505a commit 7bd5408
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 80 deletions.
10 changes: 5 additions & 5 deletions tools/scripts/generate_binary_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ def initialize_globals(channel: str, build_python_only: bool) -> None:
else:
PYTHON_ARCHES = PYTHON_ARCHES_DICT[channel]
WHEEL_CONTAINER_IMAGES = {
"11.8": "pytorch/manylinux-builder:cuda11.8",
"12.1": "pytorch/manylinux-builder:cuda12.1",
"12.4": "pytorch/manylinux-builder:cuda12.4",
"12.6": "pytorch/manylinux2_28-builder:cuda12.6",
**{
gpu_arch: f"pytorch/manylinux2_28-builder:cuda{gpu_arch}"
for gpu_arch in CUDA_ARCHES
},
**{
gpu_arch: f"pytorch/manylinux2_28-builder:rocm{gpu_arch}"
for gpu_arch in ROCM_ARCHES
},
CPU: "pytorch/manylinux-builder:cpu",
CPU: "pytorch/manylinux2_28-builder:cpu",
XPU: "pytorch/manylinux2_28-builder:xpu",
# TODO: Migrate CUDA_AARCH64 image to manylinux2_28_aarch64-builder:cuda12.4
CPU_AARCH64: "pytorch/manylinux2_28_aarch64-builder:cpu-aarch64",
Expand Down
30 changes: 15 additions & 15 deletions tools/tests/assets/build_matrix_linux_wheel_cuda.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -20,7 +20,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -35,7 +35,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -95,7 +95,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -110,7 +110,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -125,7 +125,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -185,7 +185,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -200,7 +200,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -215,7 +215,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -275,7 +275,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -290,7 +290,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -305,7 +305,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -365,7 +365,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -380,7 +380,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -395,7 +395,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down
30 changes: 15 additions & 15 deletions tools/tests/assets/build_matrix_linux_wheel_cuda_norocm.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -20,7 +20,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -35,7 +35,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -65,7 +65,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -80,7 +80,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -95,7 +95,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -125,7 +125,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -140,7 +140,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -155,7 +155,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -185,7 +185,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -200,7 +200,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -215,7 +215,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -245,7 +245,7 @@
"gpu_arch_type": "cpu",
"gpu_arch_version": "",
"desired_cuda": "cpu",
"container_image": "pytorch/manylinux-builder:cpu",
"container_image": "pytorch/manylinux2_28-builder:cpu",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cpu",
"validation_runner": "linux.2xlarge",
Expand All @@ -260,7 +260,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -275,7 +275,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down
20 changes: 10 additions & 10 deletions tools/tests/assets/build_matrix_linux_wheel_nocpu.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -20,7 +20,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -80,7 +80,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -95,7 +95,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -155,7 +155,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -170,7 +170,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -230,7 +230,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -245,7 +245,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down Expand Up @@ -305,7 +305,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "11.8",
"desired_cuda": "cu118",
"container_image": "pytorch/manylinux-builder:cuda11.8",
"container_image": "pytorch/manylinux2_28-builder:cuda11.8",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda11_8",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -320,7 +320,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.4",
"desired_cuda": "cu124",
"container_image": "pytorch/manylinux-builder:cuda12.4",
"container_image": "pytorch/manylinux2_28-builder:cuda12.4",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down
Loading

0 comments on commit 7bd5408

Please sign in to comment.