From f6c5d6db328cd54916852ac1a3dda8cb5506b6f6 Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Tue, 17 Dec 2024 20:06:33 +0000 Subject: [PATCH] Use rocm images for rocm validations and set devtoolset correctly similar to xpu (#6080) --- .github/scripts/validate_binaries.sh | 7 ++++++- .github/workflows/validate-linux-binaries.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh index aeec178d78..3c3bd1634a 100755 --- a/.github/scripts/validate_binaries.sh +++ b/.github/scripts/validate_binaries.sh @@ -78,8 +78,13 @@ else pushd ${PWD}/.ci/pytorch/ - if [[ ${MATRIX_GPU_ARCH_VERSION} == "12.6" || ${MATRIX_GPU_ARCH_TYPE} == "xpu" ]]; then + if [[ ${MATRIX_GPU_ARCH_VERSION} == "12.6" || ${MATRIX_GPU_ARCH_TYPE} == "xpu" || ${MATRIX_GPU_ARCH_TYPE} == "rocm" ]]; then export DESIRED_DEVTOOLSET="cxx11-abi" + + # TODO: enable torch-compile on ROCM + if [[ ${MATRIX_GPU_ARCH_TYPE} == "rocm" ]]; then + TEST_SUFFIX=${TEST_SUFFIX}" --torch-compile-check disabled" + fi fi if [[ ${TARGET_OS} == 'linux' ]]; then diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 30cb39792e..6268742832 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -134,7 +134,7 @@ jobs: repository: "pytorch/pytorch" ref: main job-name: ${{ matrix.build_name }} - docker-image: ${{ (matrix.gpu_arch_type == 'xpu' && matrix.container_image) || (matrix.gpu_arch_version == '12.6' && 'pytorch/almalinux-builder:cpu-main') || 'pytorch/conda-builder' }} + docker-image: ${{ ((matrix.gpu_arch_type == 'xpu' || matrix.gpu_arch_type == 'rocm') && matrix.container_image) || (matrix.gpu_arch_version == '12.6' && 'pytorch/almalinux-builder:cpu-main') || 'pytorch/conda-builder' }} binary-matrix: ${{ toJSON(matrix) }} docker-build-dir: "skip-docker-build" timeout: 180