From e5997ee3a82b7723393f80e7cce0a3385d59a3c7 Mon Sep 17 00:00:00 2001
From: vfdev <vfdev.5@gmail.com>
Date: Fri, 24 Nov 2023 10:44:34 +0100
Subject: [PATCH] Try to fix conda env issue on MPS tests (#3148)

* Try to fix conda env issue on MPS tests

* another try

* another attempt

* attempt 4

* attempt 5
---
 .github/workflows/mps-tests.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mps-tests.yml b/.github/workflows/mps-tests.yml
index 8e48c6053c6..951a4892c56 100644
--- a/.github/workflows/mps-tests.yml
+++ b/.github/workflows/mps-tests.yml
@@ -27,7 +27,7 @@ concurrency:
   cancel-in-progress: true
 
 # Cherry-picked from 
-# - https://github.com/pytorch/vision/main/.github/workflows/tests.yml
+# - https://github.com/pytorch/vision/blob/main/.github/workflows/tests.yml
 # - https://github.com/pytorch/test-infra/blob/main/.github/workflows/macos_job.yml
 
 jobs:
@@ -73,17 +73,24 @@ jobs:
       - name: Install PyTorch
         if: ${{ matrix.pytorch-channel == 'pytorch' }}
         shell: bash -l {0}
-        run: pip install torch torchvision
+        run: |
+          conda shell.bash hook
+          conda activate $CONDA_ENV
+          pip install torch torchvision
 
       - name: Install PyTorch (nightly)
         if: ${{ matrix.pytorch-channel == 'pytorch-nightly' }}
         shell: bash -l {0}
-        run: pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
+        run: |
+          conda shell.bash hook
+          conda activate $CONDA_ENV
+          pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
 
       - name: Install dependencies
         shell: bash -l {0}
         working-directory: ${{ github.repository }}
         run: |
+          conda activate $CONDA_ENV
           # TODO: We add set -xe to explicitly fail the CI if one of the commands is failing.
           # Somehow the step is passing even if a subcommand failed
           set -xe
@@ -110,6 +117,7 @@ jobs:
         shell: bash -l {0}
         working-directory: ${{ github.repository }}
         run: |
+          conda activate $CONDA_ENV
           SKIP_DISTRIB_TESTS=${{ matrix.skip-distrib-tests }} bash tests/run_cpu_tests.sh
 
       - name: Upload coverage to Codecov
@@ -122,4 +130,6 @@ jobs:
       - name: Run MNIST Examples
         shell: bash -l {0}
         working-directory: ${{ github.repository }}
-        run: python examples/mnist/mnist.py --epochs=1
+        run: |
+          conda activate $CONDA_ENV
+          python examples/mnist/mnist.py --epochs=1