Fixed workflow to run on new github actions runners (#25)

* Removed conda and packages installation because they are now included in image Signed-off-by: Gregory Shimansky <[email protected]> * Fixed conda command line Signed-off-by: Gregory Shimansky <[email protected]> * Fixed conda command lines Signed-off-by: Gregory Shimansky <[email protected]> * DEBUG1 * Added conda bash hook to build mlir script * More fixes to run conda from script * Fixed conda activate in workflows * Added --solver libmamba explicit switch Signed-off-by: Gregory Shimansky <[email protected]> --------- Signed-off-by: Gregory Shimansky <[email protected]>
intel · Dec 1, 2023 · 568475f · 568475f
1 parent c3d1b5b
commit 568475f
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 30 deletions.
diff --git a/.github/actions/build_mlir/action.yml b/.github/actions/build_mlir/action.yml
@@ -11,13 +11,6 @@ runs:
               path: torch-mlir
               ref: 'cpu-proto'
               submodules: recursive
-        - name: Install system and Intel packages
-          shell: bash -el {0}
-          run: |
-              curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
-              echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-              sudo apt-get update
-              sudo apt-get install -y build-essential intel-basekit
         - name: Build torch-mlir
           shell: bash -el {0}
           run: |

diff --git a/.github/actions/initial_setup/action.yml b/.github/actions/initial_setup/action.yml
@@ -14,13 +14,6 @@ inputs:
 runs:
     using: composite
     steps:
-        - uses: conda-incubator/setup-miniconda@v2
-          with:
-              miniforge-variant: Mambaforge
-              miniforge-version: latest
-              use-mamba: true
-              activate-environment: ${{ inputs.conda_env }}-test
-
         - name: Get Date
           id: get-date
           run: echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
@@ -31,7 +24,7 @@ runs:
           uses: actions/cache@v3
           env:
               # Increase this value to reset cache if etc/example-environment.yml has not changed
-              CACHE_NUMBER: 0
+              CACHE_NUMBER: 2
           with:
               path: ${{ env.CONDA }}/envs
               key: >-
@@ -43,18 +36,13 @@ runs:
         - name: Update conda env
           if: steps.conda-cache.outputs.cache-hit != 'true'
           shell: bash -el {0}
-          run: mamba env update -n ${{ inputs.conda_env }}-test -f tests/conda-envs/${{ inputs.conda_env }}.yaml
+          run: ${CONDA}/bin/conda env update --solver libmamba -n ${{ inputs.conda_env }} -f tests/conda-envs/${{ inputs.conda_env }}.yaml
 
         - uses: ./.github/actions/build_mlir
           if: ${{ inputs.conda_env == 'mlir' }}
 
-        - name: Install compiler for dynamo
-          shell: bash -el {0}
-          run: |
-              sudo apt-get update
-              sudo apt-get install -y build-essential
-          if: ${{ inputs.compiler == 'dynamo' }}
-
         - name: Setup benchmarks package
           shell: bash -el {0}
-          run: pip install -e .
+          run: |
+              source ${CONDA}/bin/activate ${{ inputs.conda_env }}
+              pip install -e .
diff --git a/.github/workflows/mlp-test.yml b/.github/workflows/mlp-test.yml
@@ -41,6 +41,7 @@ jobs:
             - name: Run MLP test on specific compiler
               shell: bash -el {0}
               run: |
+                  source ${CONDA}/bin/activate ${{ inputs.conda_env }}
                   benchmark-run \
                     --host spr \
                     --benchmark mlp \

diff --git a/tests/conda-envs/cpu.yaml b/tests/conda-envs/cpu.yaml
@@ -1,4 +1,4 @@
-name: cpu-test
+name: cpu
 channels:
   - pytorch
 dependencies:

diff --git a/tests/conda-envs/cuda.yaml b/tests/conda-envs/cuda.yaml
@@ -1,4 +1,4 @@
-name: cuda-test
+name: cuda
 channels:
   - pytorch
   - nvidia

diff --git a/tests/conda-envs/ipex.yaml b/tests/conda-envs/ipex.yaml
@@ -1,4 +1,4 @@
-name: ipex-test
+name: ipex
 channels:
   - intel
   - conda-forge

diff --git a/tests/conda-envs/mlir.yaml b/tests/conda-envs/mlir.yaml
@@ -1,4 +1,4 @@
-name: mlir-test
+name: mlir
 channels:
   - intel
 dependencies:

diff --git a/tests/docker/README.md b/tests/docker/README.md
diff --git a/tests/scripts/build-mlir.sh b/tests/scripts/build-mlir.sh
@@ -4,7 +4,10 @@ if (( $# != 1 )); then
     >&2 echo "Need path to torch-mlir repository as an argument."
 fi
 
-conda activate mlir-test
+source ${CONDA}/bin/activate mlir
+
+env
+${CONDA}/bin/conda list
 
 cd $1
 pip install -r requirements.txt

diff --git a/tests/scripts/create-mlir-env.sh b/tests/scripts/create-mlir-env.sh
@@ -6,5 +6,5 @@ fi
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 ./create-env.sh ${SCRIPT_DIR}/../conda-envs/mlir.yaml
-source ${CONDA_PREFIX}/bin/activate mlir-test
+source ${CONDA}/bin/activate mlir
 pip install -r $1/requirements.txt