From 6246827a824526c4a3cc61eecda29da263ca6272 Mon Sep 17 00:00:00 2001 From: Jithun Nair Date: Fri, 6 Dec 2024 01:31:34 +0000 Subject: [PATCH 1/2] Update to use 6.2.4 and manylinux2_28 images for ROCm --- tools/scripts/generate_binary_build_matrix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py index 5af01135c0..a1efbd03ea 100755 --- a/tools/scripts/generate_binary_build_matrix.py +++ b/tools/scripts/generate_binary_build_matrix.py @@ -30,7 +30,7 @@ "release": ["11.8", "12.1", "12.4"], } ROCM_ARCHES_DICT = { - "nightly": ["6.1", "6.2"], + "nightly": ["6.1", "6.2.4"], "test": ["6.1", "6.2"], "release": ["6.1", "6.2"], } @@ -153,7 +153,7 @@ def initialize_globals(channel: str, build_python_only: bool) -> None: "12.4": "pytorch/manylinux-builder:cuda12.4", "12.6": "pytorch/manylinux2_28-builder:cuda12.6", **{ - gpu_arch: f"pytorch/manylinux-builder:rocm{gpu_arch}" + gpu_arch: f"pytorch/manylinux2_28-builder:rocm{gpu_arch}" for gpu_arch in ROCM_ARCHES }, CPU: "pytorch/manylinux-builder:cpu", From 4ea8fb36914f73cfc659ac084f686306d8b0d02e Mon Sep 17 00:00:00 2001 From: Jithun Nair Date: Fri, 6 Dec 2024 02:09:27 +0000 Subject: [PATCH 2/2] Update assets --- .../assets/build_matrix_linux_wheel_cuda.json | 48 +++++++++---------- .../build_matrix_linux_wheel_nocpu.json | 48 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tools/tests/assets/build_matrix_linux_wheel_cuda.json b/tools/tests/assets/build_matrix_linux_wheel_cuda.json index 7c57b7468b..62c34c3eaf 100644 --- a/tools/tests/assets/build_matrix_linux_wheel_cuda.json +++ b/tools/tests/assets/build_matrix_linux_wheel_cuda.json @@ -65,7 +65,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_9-rocm6_1", "validation_runner": "linux.2xlarge", @@ -78,13 +78,13 @@ { "python_version": "3.9", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_9-rocm6_2", + "build_name": "manywheel-py3_9-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", @@ -155,7 +155,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_10-rocm6_1", "validation_runner": "linux.2xlarge", @@ -168,13 +168,13 @@ { "python_version": "3.10", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_10-rocm6_2", + "build_name": "manywheel-py3_10-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", @@ -245,7 +245,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_11-rocm6_1", "validation_runner": "linux.2xlarge", @@ -258,13 +258,13 @@ { "python_version": "3.11", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_11-rocm6_2", + "build_name": "manywheel-py3_11-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", @@ -335,7 +335,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_12-rocm6_1", "validation_runner": "linux.2xlarge", @@ -348,13 +348,13 @@ { "python_version": "3.12", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_12-rocm6_2", + "build_name": "manywheel-py3_12-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", diff --git a/tools/tests/assets/build_matrix_linux_wheel_nocpu.json b/tools/tests/assets/build_matrix_linux_wheel_nocpu.json index 3d139504fb..dbf87f230d 100644 --- a/tools/tests/assets/build_matrix_linux_wheel_nocpu.json +++ b/tools/tests/assets/build_matrix_linux_wheel_nocpu.json @@ -50,7 +50,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_9-rocm6_1", "validation_runner": "linux.2xlarge", @@ -63,13 +63,13 @@ { "python_version": "3.9", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_9-rocm6_2", + "build_name": "manywheel-py3_9-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", @@ -125,7 +125,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_10-rocm6_1", "validation_runner": "linux.2xlarge", @@ -138,13 +138,13 @@ { "python_version": "3.10", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_10-rocm6_2", + "build_name": "manywheel-py3_10-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", @@ -200,7 +200,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_11-rocm6_1", "validation_runner": "linux.2xlarge", @@ -213,13 +213,13 @@ { "python_version": "3.11", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_11-rocm6_2", + "build_name": "manywheel-py3_11-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1", @@ -275,7 +275,7 @@ "gpu_arch_type": "rocm", "gpu_arch_version": "6.1", "desired_cuda": "rocm6.1", - "container_image": "pytorch/manylinux-builder:rocm6.1", + "container_image": "pytorch/manylinux2_28-builder:rocm6.1", "package_type": "manywheel", "build_name": "manywheel-py3_12-rocm6_1", "validation_runner": "linux.2xlarge", @@ -288,13 +288,13 @@ { "python_version": "3.12", "gpu_arch_type": "rocm", - "gpu_arch_version": "6.2", - "desired_cuda": "rocm6.2", - "container_image": "pytorch/manylinux-builder:rocm6.2", + "gpu_arch_version": "6.2.4", + "desired_cuda": "rocm6.2.4", + "container_image": "pytorch/manylinux2_28-builder:rocm6.2.4", "package_type": "manywheel", - "build_name": "manywheel-py3_12-rocm6_2", + "build_name": "manywheel-py3_12-rocm6_2_4", "validation_runner": "linux.2xlarge", - "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2", + "installation": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2.4", "channel": "nightly", "upload_to_base_bucket": "no", "stable_version": "2.5.1",