From 40f3c1934fa3296ed7dd29a569978af57dab1c4e Mon Sep 17 00:00:00 2001
From: Jirka <jirka@pytorchlightning.ai>
Date: Mon, 29 Jun 2020 22:54:08 +0200
Subject: [PATCH] conda

---
 .github/workflows/pt-testing.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pt-testing.yml b/.github/workflows/pt-testing.yml
index 4000f24f6dab6f..9f98f127f491cb 100644
--- a/.github/workflows/pt-testing.yml
+++ b/.github/workflows/pt-testing.yml
@@ -42,6 +42,7 @@ jobs:
         update-conda: true
         python-version: ${{ matrix.python-version }}
         conda-channels: anaconda, conda-forge
+        activate-conda: true
 
     # TODO: add conda/pip caching
     # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
@@ -54,13 +55,6 @@ jobs:
     #    restore-keys: |
     #        ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-
 
-    - name: Create conda
-      run: |
-        conda init bash
-        # conda create --name ci-env
-        # conda activate ci-env
-      shell: bash
-
     - name: Install stable PyTorch version
       if: matrix.pytorch-version <= 1.6
       run: |
@@ -76,7 +70,7 @@ jobs:
     - name: Install dependencies
       run: |
         # python -m pip install --upgrade --user pip
-        HOROVOD_BUILD_ARCH_FLAGS="-mfma" conda env update --file environment.yml  # --name ci-env
+        HOROVOD_BUILD_ARCH_FLAGS="-mfma" conda env update --file environment.yml  --name base
         python --version
         conda info
         conda list
@@ -85,7 +79,7 @@ jobs:
     - name: Reinstall Horovod if necessary
       if: runner.os != 'windows' && matrix.python-version != '3.8'
       run: |
-        # conda activate ci-env
+        # conda activate base
         HOROVOD_BUILT=$(python -c "import horovod.torch; horovod.torch.nccl_built(); print('SUCCESS')")
         if [[ $HOROVOD_BUILT != "SUCCESS" ]]; then
           pip uninstall -y horovod
@@ -103,7 +97,7 @@ jobs:
 
     - name: Tests
       run: |
-        # conda activate ci-env
+        # conda activate base
         # NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
         python -m pytest pytorch_lightning tests pl_examples -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
         # coverage report