Follow up cleanup after #2149 (#3050)

Signed-off-by: Anatoly Myachev <[email protected]>

.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

.github/pins/pytorch.txt

@@ -1 +1 @@
-22ce6c6508d1d13b263d4c8b1fd6b98505983e92
+61dc5e9c0a36d590adc47b4110efd94d9eb59306

.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 }}

.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 }}
 

.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

.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

.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: |

.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

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
 

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
   )