From 178d49dd470e51c182f964d8ad6900f7c0ac68f3 Mon Sep 17 00:00:00 2001 From: Anatoly Myachev Date: Fri, 20 Dec 2024 17:29:58 +0100 Subject: [PATCH] Follow up cleanup after #2149 (#3050) Signed-off-by: Anatoly Myachev --- .github/actions/setup-pytorch/action.yml | 16 ++-------------- .github/pins/ipex.txt | 1 - .github/pins/pytorch-upstream.txt | 1 - .github/pins/pytorch.txt | 2 +- .github/workflows/auto-update-translator-cid.yml | 2 -- .github/workflows/build-test-reusable.yml | 1 - .github/workflows/e2e-reusable.yml | 1 - .github/workflows/inductor-tests-reusable.yml | 1 - .github/workflows/nightly-wheels.yml | 4 +--- .github/workflows/triton-benchmarks.yml | 2 -- scripts/install-pytorch.sh | 2 +- scripts/test-triton.sh | 2 +- 12 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 .github/pins/ipex.txt delete mode 100644 .github/pins/pytorch-upstream.txt diff --git a/.github/actions/setup-pytorch/action.yml b/.github/actions/setup-pytorch/action.yml index 17153cfc0e..cbee7cc959 100644 --- a/.github/actions/setup-pytorch/action.yml +++ b/.github/actions/setup-pytorch/action.yml @@ -12,7 +12,7 @@ inputs: default: /opt/intel/oneapi repository: description: Repository name with owner - default: Stonepia/pytorch + default: pytorch/pytorch ref: description: Branch, tag, commit id default: "" @@ -26,11 +26,7 @@ runs: if: inputs.ref == '' shell: bash run: | - if [[ "${{ inputs.repository }}" == "Stonepia/pytorch" ]]; then - PYTORCH_COMMIT_ID="$(<.github/pins/pytorch.txt)" - else - PYTORCH_COMMIT_ID="$(<.github/pins/pytorch-upstream.txt)" - fi + PYTORCH_COMMIT_ID="$(<.github/pins/pytorch.txt)" echo "PYTORCH_REPO=${{ inputs.repository }}" | tee -a "$GITHUB_ENV" echo "PYTORCH_COMMIT_ID=$PYTORCH_COMMIT_ID" | tee -a "$GITHUB_ENV" @@ -58,7 +54,6 @@ runs: fi # PyTorch build process expects Intel oneAPI in /opt/intel/oneapi - # https://github.com/Stonepia/pytorch/blob/c9153c96f547f269581743e7443aa86d7e003505/cmake/Modules/FindMKL.cmake#L44 - name: Set up oneAPI shell: bash run: | @@ -106,13 +101,6 @@ runs: cd pytorch ../scripts/patch-pytorch.sh - # FIXME: Old PyTorch does not work with numpy==2.0.0 - - name: Install numpy < 2.0.0 - if: ${{ inputs.repository == 'Stonepia/pytorch' }} - shell: bash - run: | - pip install 'numpy<2.0.0' - - name: Build PyTorch if: ${{ steps.pytorch-cache.outputs.status == 'miss' && inputs.mode == 'source' }} shell: bash diff --git a/.github/pins/ipex.txt b/.github/pins/ipex.txt deleted file mode 100644 index a137631e11..0000000000 --- a/.github/pins/ipex.txt +++ /dev/null @@ -1 +0,0 @@ -15ef7db18b0a50101b41d9c78780d35ea7937ffc diff --git a/.github/pins/pytorch-upstream.txt b/.github/pins/pytorch-upstream.txt deleted file mode 100644 index 18f3d3ae5b..0000000000 --- a/.github/pins/pytorch-upstream.txt +++ /dev/null @@ -1 +0,0 @@ -61dc5e9c0a36d590adc47b4110efd94d9eb59306 diff --git a/.github/pins/pytorch.txt b/.github/pins/pytorch.txt index 2e4cce8862..18f3d3ae5b 100644 --- a/.github/pins/pytorch.txt +++ b/.github/pins/pytorch.txt @@ -1 +1 @@ -22ce6c6508d1d13b263d4c8b1fd6b98505983e92 +61dc5e9c0a36d590adc47b4110efd94d9eb59306 diff --git a/.github/workflows/auto-update-translator-cid.yml b/.github/workflows/auto-update-translator-cid.yml index a815c12a94..718cc1f02a 100644 --- a/.github/workflows/auto-update-translator-cid.yml +++ b/.github/workflows/auto-update-translator-cid.yml @@ -55,8 +55,6 @@ jobs: - name: Setup PyTorch if: ${{ env.TARGET_PRID == null }} uses: ./.github/actions/setup-pytorch - with: - repository: pytorch/pytorch - name: Install test dependencies if: ${{ env.TARGET_PRID == null }} diff --git a/.github/workflows/build-test-reusable.yml b/.github/workflows/build-test-reusable.yml index b91b0b9248..8f209a17e7 100644 --- a/.github/workflows/build-test-reusable.yml +++ b/.github/workflows/build-test-reusable.yml @@ -114,7 +114,6 @@ jobs: - name: Setup PyTorch uses: ./.github/actions/setup-pytorch with: - repository: pytorch/pytorch ref: ${{ inputs.pytorch_ref }} mode: ${{ inputs.pytorch_mode }} diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml index bdbb24a0c7..42b77e2864 100644 --- a/.github/workflows/e2e-reusable.yml +++ b/.github/workflows/e2e-reusable.yml @@ -95,7 +95,6 @@ jobs: - name: Setup PyTorch uses: ./.github/actions/setup-pytorch with: - repository: pytorch/pytorch ref: ${{ inputs.pytorch_ref }} - name: Set benchmark repository diff --git a/.github/workflows/inductor-tests-reusable.yml b/.github/workflows/inductor-tests-reusable.yml index 6567fe4281..3c7a871ea3 100644 --- a/.github/workflows/inductor-tests-reusable.yml +++ b/.github/workflows/inductor-tests-reusable.yml @@ -65,7 +65,6 @@ jobs: - name: Setup PyTorch uses: ./.github/actions/setup-pytorch with: - repository: ${{ env.PYTORCH_REPO}} ref: ${{ inputs.pytorch_ref }} - name: Setup Triton diff --git a/.github/workflows/nightly-wheels.yml b/.github/workflows/nightly-wheels.yml index 69be19aaf9..87d6fb18b5 100644 --- a/.github/workflows/nightly-wheels.yml +++ b/.github/workflows/nightly-wheels.yml @@ -9,7 +9,7 @@ on: - main paths: - .github/workflows/nightly-wheels.yml - - .github/pins/pytorch-upstream.txt + - .github/pins/pytorch.txt permissions: read-all @@ -56,8 +56,6 @@ jobs: - name: Setup PyTorch uses: ./.github/actions/setup-pytorch - with: - repository: pytorch/pytorch - name: Identify pinned versions run: | diff --git a/.github/workflows/triton-benchmarks.yml b/.github/workflows/triton-benchmarks.yml index 440162bd01..26213fb028 100644 --- a/.github/workflows/triton-benchmarks.yml +++ b/.github/workflows/triton-benchmarks.yml @@ -113,8 +113,6 @@ jobs: - name: Setup PyTorch uses: ./.github/actions/setup-pytorch - with: - repository: pytorch/pytorch - name: Build Triton wheels uses: ./.github/actions/setup-triton diff --git a/scripts/install-pytorch.sh b/scripts/install-pytorch.sh index 74b3ac5158..b07ca6abea 100755 --- a/scripts/install-pytorch.sh +++ b/scripts/install-pytorch.sh @@ -51,7 +51,7 @@ ROOT=$(cd $(dirname "$0")/.. && pwd) # Check installed torch if [ "$BUILD_LATEST" = false ]; then - PYTORCH_PINNED_COMMIT="$(<$ROOT/.github/pins/pytorch-upstream.txt)" + PYTORCH_PINNED_COMMIT="$(<$ROOT/.github/pins/pytorch.txt)" echo "***** Using pinned PyTorch commit $PYTORCH_PINNED_COMMIT by default. *****" fi diff --git a/scripts/test-triton.sh b/scripts/test-triton.sh index 2ee7ad1a23..1ddc91aca4 100755 --- a/scripts/test-triton.sh +++ b/scripts/test-triton.sh @@ -326,7 +326,7 @@ run_instrumentation_tests() { run_inductor_tests() { test -d pytorch || ( git clone https://github.com/pytorch/pytorch - rev=$(cat .github/pins/pytorch-upstream.txt) + rev=$(cat .github/pins/pytorch.txt) cd pytorch git checkout $rev )