From 6a15e32ab70145e6cb0c54b0d8b93ed8a5e4b3e5 Mon Sep 17 00:00:00 2001 From: Ting Lu Date: Mon, 16 Dec 2024 12:17:49 -0800 Subject: [PATCH 1/2] Test w/o json changes --- tools/tests/update_test_assets.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/tests/update_test_assets.sh b/tools/tests/update_test_assets.sh index 6617d7331a..17a5f9fef4 100755 --- a/tools/tests/update_test_assets.sh +++ b/tools/tests/update_test_assets.sh @@ -1,12 +1,12 @@ -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda_norocm.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_nocpu.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-rocm disable --with-xpu enable > ../tests/assets/build_matrix_linux_wheel_xpu.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --with-cuda disable --with-rocm disable > ../tests/assets/build_matrix_macos_wheel.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --package-type conda > ../tests/assets/build_matrix_macos_conda.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" --package-type conda > ../tests/assets/build_matrix_windows_conda_cuda.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_cuda.json -python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-cuda disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_xpu.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda_norocm.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_nocpu.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-rocm disable --with-xpu enable > ../tests/assets/build_matrix_linux_wheel_xpu.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --with-cuda disable --with-rocm disable > ../tests/assets/build_matrix_macos_wheel.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --package-type conda > ../tests/assets/build_matrix_macos_conda.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" --package-type conda > ../tests/assets/build_matrix_windows_conda_cuda.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_cuda.json +python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-cuda disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_xpu.json From bf1d488a51a32ae8e5812cf2022c1c146c4d09f2 Mon Sep 17 00:00:00 2001 From: Ting Lu Date: Mon, 16 Dec 2024 12:20:02 -0800 Subject: [PATCH 2/2] Add changes for binary_build_matrix --- tools/scripts/generate_binary_build_matrix.py | 4 ++-- tools/tests/update_test_assets.sh | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py index 6449eb44fc..5d38962e99 100755 --- a/tools/scripts/generate_binary_build_matrix.py +++ b/tools/scripts/generate_binary_build_matrix.py @@ -163,7 +163,7 @@ def initialize_globals(channel: str, build_python_only: bool) -> None: 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", - CUDA_AARCH64: "pytorch/manylinuxaarch64-builder:cuda12.4", + CUDA_AARCH64: "pytorch/manylinuxaarch64-builder:cuda12.6", } LIBTORCH_CONTAINER_IMAGES = { **{ @@ -191,7 +191,7 @@ def translate_desired_cuda(gpu_arch_type: str, gpu_arch_version: str) -> str: return { CPU: "cpu", CPU_AARCH64: CPU, - CUDA_AARCH64: "cu124", + CUDA_AARCH64: "cu126", CUDA: f"cu{gpu_arch_version.replace('.', '')}", ROCM: f"rocm{gpu_arch_version}", XPU: "xpu", diff --git a/tools/tests/update_test_assets.sh b/tools/tests/update_test_assets.sh index 17a5f9fef4..6617d7331a 100755 --- a/tools/tests/update_test_assets.sh +++ b/tools/tests/update_test_assets.sh @@ -1,12 +1,12 @@ -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda_norocm.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_nocpu.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-rocm disable --with-xpu enable > ../tests/assets/build_matrix_linux_wheel_xpu.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --with-cuda disable --with-rocm disable > ../tests/assets/build_matrix_macos_wheel.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --package-type conda > ../tests/assets/build_matrix_macos_conda.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" --package-type conda > ../tests/assets/build_matrix_windows_conda_cuda.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_cuda.json -python3 ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-cuda disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_xpu.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_cuda_norocm.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-xpu disable > ../tests/assets/build_matrix_linux_wheel_nocpu.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-cpu disable --with-rocm disable --with-xpu enable > ../tests/assets/build_matrix_linux_wheel_xpu.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --package-type conda > ../tests/assets/build_matrix_linux_conda_cuda.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --with-cuda disable --with-rocm disable > ../tests/assets/build_matrix_macos_wheel.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="macos" --package-type conda > ../tests/assets/build_matrix_macos_conda.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" --package-type conda > ../tests/assets/build_matrix_windows_conda_cuda.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_cuda.json +python ../scripts/generate_binary_build_matrix.py --build-python-only disable --with-rocm disable --with-cuda disable --operating-system="windows" > ../tests/assets/build_matrix_windows_wheel_xpu.json