Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Commit

Permalink
Removed conda and packages installation because they are now included…
Browse files Browse the repository at this point in the history
… in image

Signed-off-by: Gregory Shimansky <[email protected]>
  • Loading branch information
gshimansky committed Dec 1, 2023
1 parent c3d1b5b commit c12fe07
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 29 deletions.
7 changes: 0 additions & 7 deletions .github/actions/build_mlir/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
22 changes: 5 additions & 17 deletions .github/actions/initial_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: 1
with:
path: ${{ env.CONDA }}/envs
key: >-
Expand All @@ -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 env update -n ${{ inputs.conda_env }}-test -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: |
conda activate ${{ inputs.conda_env }}
pip install -e .
1 change: 1 addition & 0 deletions .github/workflows/mlp-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
- name: Run MLP test on specific compiler
shell: bash -el {0}
run: |
conda activate ${{ inputs.conda_env }}
benchmark-run \
--host spr \
--benchmark mlp \
Expand Down
2 changes: 1 addition & 1 deletion tests/conda-envs/cpu.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: cpu-test
name: cpu
channels:
- pytorch
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion tests/conda-envs/cuda.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: cuda-test
name: cuda
channels:
- pytorch
- nvidia
Expand Down
2 changes: 1 addition & 1 deletion tests/conda-envs/ipex.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ipex-test
name: ipex
channels:
- intel
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion tests/conda-envs/mlir.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: mlir-test
name: mlir
channels:
- intel
dependencies:
Expand Down
Empty file added tests/docker/README.md
Empty file.
2 changes: 1 addition & 1 deletion tests/scripts/build-mlir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if (( $# != 1 )); then
>&2 echo "Need path to torch-mlir repository as an argument."
fi

conda activate mlir-test
conda activate mlir

cd $1
pip install -r requirements.txt
Expand Down

0 comments on commit c12fe07

Please sign in to comment.