From 93a3888212e7baa5251ba21df8bee3a109a94210 Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Tue, 26 Nov 2024 13:31:05 -0500 Subject: [PATCH 1/3] Use cuda 12.6 wheels with Manylinux 2.28. Use Manylinux2014 for CPU, CUDA11.8, CUDA12.4 --- tools/scripts/generate_binary_build_matrix.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py index 9d7eb06f1e..bddc09694e 100755 --- a/tools/scripts/generate_binary_build_matrix.py +++ b/tools/scripts/generate_binary_build_matrix.py @@ -148,15 +148,14 @@ def initialize_globals(channel: str, build_python_only: bool) -> None: else: PYTHON_ARCHES = PYTHON_ARCHES_DICT[channel] WHEEL_CONTAINER_IMAGES = { - **{ - gpu_arch: f"pytorch/manylinux2_28-builder:cuda{gpu_arch}" - for gpu_arch in CUDA_ARCHES - }, + "11.8": f"pytorch/manylinux-builder:cuda11.8-{DEFAULT_TAG}", + "12.4": f"pytorch/manylinux-builder:cuda12.4-{DEFAULT_TAG}", + "12.6": f"pytorch/manylinux2_28-builder:cuda12.6-{DEFAULT_TAG}", **{ gpu_arch: f"pytorch/manylinux-builder:rocm{gpu_arch}" for gpu_arch in ROCM_ARCHES }, - CPU: "pytorch/manylinux2_28-builder:cpu", + CPU: "pytorch/manylinux-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", From 04a487ff476741b405e89f938b19228c47199a8c Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Tue, 26 Nov 2024 13:36:19 -0500 Subject: [PATCH 2/3] Update generate_binary_build_matrix.py --- tools/scripts/generate_binary_build_matrix.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py index bddc09694e..5a3647a5b5 100755 --- a/tools/scripts/generate_binary_build_matrix.py +++ b/tools/scripts/generate_binary_build_matrix.py @@ -148,9 +148,9 @@ def initialize_globals(channel: str, build_python_only: bool) -> None: else: PYTHON_ARCHES = PYTHON_ARCHES_DICT[channel] WHEEL_CONTAINER_IMAGES = { - "11.8": f"pytorch/manylinux-builder:cuda11.8-{DEFAULT_TAG}", - "12.4": f"pytorch/manylinux-builder:cuda12.4-{DEFAULT_TAG}", - "12.6": f"pytorch/manylinux2_28-builder:cuda12.6-{DEFAULT_TAG}", + "11.8": f"pytorch/manylinux-builder:cuda11.8", + "12.4": f"pytorch/manylinux-builder:cuda12.4", + "12.6": f"pytorch/manylinux2_28-builder:cuda12.6", **{ gpu_arch: f"pytorch/manylinux-builder:rocm{gpu_arch}" for gpu_arch in ROCM_ARCHES From e1c8585b76691e632975631ae3313386c61cc28f Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Tue, 26 Nov 2024 13:41:31 -0500 Subject: [PATCH 3/3] Update generate_binary_build_matrix.py --- tools/scripts/generate_binary_build_matrix.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py index 5a3647a5b5..3048c52998 100755 --- a/tools/scripts/generate_binary_build_matrix.py +++ b/tools/scripts/generate_binary_build_matrix.py @@ -148,9 +148,9 @@ def initialize_globals(channel: str, build_python_only: bool) -> None: else: PYTHON_ARCHES = PYTHON_ARCHES_DICT[channel] WHEEL_CONTAINER_IMAGES = { - "11.8": f"pytorch/manylinux-builder:cuda11.8", - "12.4": f"pytorch/manylinux-builder:cuda12.4", - "12.6": f"pytorch/manylinux2_28-builder:cuda12.6", + "11.8": "pytorch/manylinux-builder:cuda11.8", + "12.4": "pytorch/manylinux-builder:cuda12.4", + "12.6": "pytorch/manylinux2_28-builder:cuda12.6", **{ gpu_arch: f"pytorch/manylinux-builder:rocm{gpu_arch}" for gpu_arch in ROCM_ARCHES