From ae12d200bbcda3d912c28b8de468343a8d6cbdd5 Mon Sep 17 00:00:00 2001 From: chuanqiw Date: Tue, 10 Sep 2024 08:31:18 -0700 Subject: [PATCH 1/4] Fix xpu linux wheel test for release build --- .github/workflows/validate-linux-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 16c9e9256..ac653856b 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -139,6 +139,7 @@ jobs: repository: "pytorch/builder" ref: ${{ inputs.ref || github.ref }} job-name: ${{ matrix.build_name }} + docker-image: ${{ matrix.gpu_arch_type == 'xpu' && matrix.container_image || 'pytorch/conda-builder' }} binary-matrix: ${{ toJSON(matrix) }} timeout: 180 script: | From c7ae8b39808549d96e359163cfb138f4a7546fca Mon Sep 17 00:00:00 2001 From: chuanqiw Date: Tue, 10 Sep 2024 10:02:47 -0700 Subject: [PATCH 2/4] install conda for xpu binary test image --- .github/workflows/validate-linux-binaries.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index ac653856b..beb2c8727 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -158,6 +158,10 @@ jobs: export USE_FORCE_REINSTALL=${{ inputs.use-force-reinstall }} export TARGET_OS="linux" + # Due to xpu doesn't use pytorch/conda-builder image, need to install conda firstly + if [[ ${{ matrix.gpu_arch_type }} == 'xpu' ]]; then + source ./common/install_conda.sh + fi eval "$(conda shell.bash hook)" printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json From 5a2266359dc918d00ee4c27bfb54ad93ca53ad1b Mon Sep 17 00:00:00 2001 From: chuanqiw Date: Tue, 10 Sep 2024 10:27:06 -0700 Subject: [PATCH 3/4] activate xpu env --- .github/workflows/validate-linux-binaries.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index beb2c8727..a9beb3aa4 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -161,6 +161,8 @@ jobs: # Due to xpu doesn't use pytorch/conda-builder image, need to install conda firstly if [[ ${{ matrix.gpu_arch_type }} == 'xpu' ]]; then source ./common/install_conda.sh + source /opt/intel/oneapi/pytorch-gpu-dev-0.5/oneapi-vars.sh + source /opt/intel/oneapi/pti/latest/env/vars.sh fi eval "$(conda shell.bash hook)" printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json From 23f1445690184479e142a356828a4da96d0cc583 Mon Sep 17 00:00:00 2001 From: chuanqiw Date: Wed, 11 Sep 2024 08:43:34 -0700 Subject: [PATCH 4/4] remvoe xpu env activate due to duplicated --- .github/workflows/validate-linux-binaries.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index a9beb3aa4..beb2c8727 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -161,8 +161,6 @@ jobs: # Due to xpu doesn't use pytorch/conda-builder image, need to install conda firstly if [[ ${{ matrix.gpu_arch_type }} == 'xpu' ]]; then source ./common/install_conda.sh - source /opt/intel/oneapi/pytorch-gpu-dev-0.5/oneapi-vars.sh - source /opt/intel/oneapi/pti/latest/env/vars.sh fi eval "$(conda shell.bash hook)" printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json