Skip to content

Commit

Permalink
[release-only] Pin Docker images for release 2.6 (#6067)
Browse files Browse the repository at this point in the history
  • Loading branch information
@atalman
atalman authored Dec 16, 2024
1 parent 8ad9781 commit d8aa5aa
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 129 deletions.
28 changes: 14 additions & 14 deletions tools/scripts/generate_binary_build_matrix.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,39 +151,39 @@ 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",
"11.8": "pytorch/manylinux-builder:cuda11.8-2.6",
"12.1": "pytorch/manylinux-builder:cuda12.1-2.6",
"12.4": "pytorch/manylinux-builder:cuda12.4-2.6",
"12.6": "pytorch/manylinux2_28-builder:cuda12.6-2.6",
**{
gpu_arch: f"pytorch/manylinux2_28-builder:rocm{gpu_arch}"
for gpu_arch in ROCM_ARCHES
},
CPU: "pytorch/manylinux-builder:cpu",
XPU: "pytorch/manylinux2_28-builder:xpu",
CPU: "pytorch/manylinux-builder:cpu-2.6",
XPU: "pytorch/manylinux2_28-builder:xpu-2.6",
# TODO: Migrate CUDA_AARCH64 image to manylinux2_28_aarch64-builder:cuda12.4
CPU_AARCH64: "pytorch/manylinux2_28_aarch64-builder:cpu-aarch64",
CUDA_AARCH64: "pytorch/manylinuxaarch64-builder:cuda12.4",
CPU_AARCH64: "pytorch/manylinux2_28_aarch64-builder:cpu-aarch64-2.6",
CUDA_AARCH64: "pytorch/manylinuxaarch64-builder:cuda12.4-2.6",
}
LIBTORCH_CONTAINER_IMAGES = {
**{
(gpu_arch, PRE_CXX11_ABI): f"pytorch/manylinux-builder:cuda{gpu_arch}"
(gpu_arch, PRE_CXX11_ABI): f"pytorch/manylinux-builder:cuda{gpu_arch}-2.6"
for gpu_arch in CUDA_ARCHES
},
**{
(gpu_arch, CXX11_ABI): f"pytorch/libtorch-cxx11-builder:cuda{gpu_arch}"
(gpu_arch, CXX11_ABI): f"pytorch/libtorch-cxx11-builder:cuda{gpu_arch}-2.6"
for gpu_arch in CUDA_ARCHES
},
**{
(gpu_arch, PRE_CXX11_ABI): f"pytorch/manylinux-builder:rocm{gpu_arch}"
(gpu_arch, PRE_CXX11_ABI): f"pytorch/manylinux-builder:rocm{gpu_arch}-2.6"
for gpu_arch in ROCM_ARCHES
},
**{
(gpu_arch, CXX11_ABI): f"pytorch/libtorch-cxx11-builder:rocm{gpu_arch}"
(gpu_arch, CXX11_ABI): f"pytorch/libtorch-cxx11-builder:rocm{gpu_arch}-2.6"
for gpu_arch in ROCM_ARCHES
},
(CPU, PRE_CXX11_ABI): "pytorch/manylinux-builder:cpu",
(CPU, CXX11_ABI): "pytorch/libtorch-cxx11-builder:cpu",
(CPU, PRE_CXX11_ABI): "pytorch/manylinux-builder:cpu-2.6",
(CPU, CXX11_ABI): "pytorch/libtorch-cxx11-builder:cpu-2.6",
}


Expand Down
40 changes: 20 additions & 20 deletions tools/tests/assets/build_matrix_linux_wheel_cuda.json
View file
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/manylinux-builder:cpu-2.6",
"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/manylinux-builder:cuda11.8-2.6",
"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/manylinux-builder:cuda12.4-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -50,7 +50,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.6",
"desired_cuda": "cu126",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_9-cuda12_6",
"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/manylinux-builder:cpu-2.6",
"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/manylinux-builder:cuda11.8-2.6",
"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/manylinux-builder:cuda12.4-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -140,7 +140,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.6",
"desired_cuda": "cu126",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_10-cuda12_6",
"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/manylinux-builder:cpu-2.6",
"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/manylinux-builder:cuda11.8-2.6",
"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/manylinux-builder:cuda12.4-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -230,7 +230,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.6",
"desired_cuda": "cu126",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_11-cuda12_6",
"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/manylinux-builder:cpu-2.6",
"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/manylinux-builder:cuda11.8-2.6",
"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/manylinux-builder:cuda12.4-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -320,7 +320,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.6",
"desired_cuda": "cu126",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_12-cuda12_6",
"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/manylinux-builder:cpu-2.6",
"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/manylinux-builder:cuda11.8-2.6",
"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/manylinux-builder:cuda12.4-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda12_4",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand All @@ -410,7 +410,7 @@
"gpu_arch_type": "cuda",
"gpu_arch_version": "12.6",
"desired_cuda": "cu126",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6",
"container_image": "pytorch/manylinux2_28-builder:cuda12.6-2.6",
"package_type": "manywheel",
"build_name": "manywheel-py3_13-cuda12_6",
"validation_runner": "linux.g5.4xlarge.nvidia.gpu",
Expand Down
Loading

0 comments on commit d8aa5aa

Please sign in to comment.