From be6704a395dfa62103c4388bed7488042de1312f Mon Sep 17 00:00:00 2001
From: iefgnoix <isaacwxf23@gmail.com>
Date: Fri, 17 May 2024 17:56:21 +0000
Subject: [PATCH] Revert "Fix error: Failed to CreateArtifact: Received
 non-retryable error: Failed request: (409) Conflict: an artifact with this
 name already exists on the workflow run"

This reverts commit d3e6244db4822a66bb5060dabdf889764d2be416.
---
 .github/workflows/_build_torch_with_cuda_and_xla.yml | 11 +++++++----
 .github/workflows/_test.yml                          | 12 ------------
 .github/workflows/build_and_test.yml                 |  1 -
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/_build_torch_with_cuda_and_xla.yml b/.github/workflows/_build_torch_with_cuda_and_xla.yml
index 3dfe1be24922..64c3099eb1cb 100644
--- a/.github/workflows/_build_torch_with_cuda_and_xla.yml
+++ b/.github/workflows/_build_torch_with_cuda_and_xla.yml
@@ -54,11 +54,14 @@ jobs:
         shell: bash
         run: |
           cd pytorch/xla/infra/ansible
-          ansible-playbook playbook.yaml -vvv -e "stage=build arch=amd64 accelerator=cuda cuda_compute_capabilities=5.2,7.5 src_root=${GITHUB_WORKSPACE} build_cpp_tests=0 git_versioned_xla_build=1 cache_suffix=-ci build_pytorch_with_cuda=1" --skip-tags=fetch_srcs,install_deps
-          # TODO(xw32): remove the line below
-          ls /dist/
+          ansible-playbook playbook.yaml -vvv -e "stage=build arch=amd64 accelerator=cuda cuda_compute_capabilities=5.2,7.5 src_root=${GITHUB_WORKSPACE} build_cpp_tests=1 git_versioned_xla_build=1 cache_suffix=-ci build_pytorch_with_cuda=1" --skip-tags=fetch_srcs,install_deps
       - name: Upload wheel
         uses: actions/upload-artifact@v4
         with:
-          name: torch-with-cuda-xla-with-cuda-wheels
+          name: torch-xla-wheels
           path: /dist/*.whl
+      - name: Upload CPP test binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: cpp-test-bin
+          path: /tmp/test/bin
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index c8cca2123ac3..8a454cc075bc 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -28,11 +28,6 @@ on:
         type: boolean
         default: false
         description: Whether to install CUDA plugin package
-      require-pytorch-cuda:
-        required: false
-        type: boolean
-        default: false
-        description: Whether the tests require pytorch built with CUDA enabled
 
     secrets:
       gcloud-service-key:
@@ -92,13 +87,6 @@ jobs:
         with:
           name: torch-xla-wheels
           path: /tmp/wheels/
-        if: $! {{ require-pytorch-cuda }}
-      - name: Fetch wheels (pytorch and pytorch/xla with CUDA enabled) if needed.
-        uses: actions/download-artifact@v4
-        with:
-          name: torch-with-cuda-xla-with-cuda-wheels
-          path: /tmp/wheels/
-        if: ${{ require-pytorch-cuda }}
       - name: Fetch CPP test binaries
         uses: actions/download-artifact@v4
         with:
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 91a3c5b754c2..f359360c25e0 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -79,7 +79,6 @@ jobs:
       timeout-minutes: 300
       collect-coverage: false
       install-cuda-plugin: true
-      require-pytorch-cuda: true
     secrets:
       gcloud-service-key: ${{ secrets.GCLOUD_SERVICE_KEY }}