Skip to content

Commit

Permalink
Switch to new IREE package names and versions. (#449)
Browse files Browse the repository at this point in the history
IREE is renaming its Python packages from `iree-compiler` and
`iree-runtime` to `iree-base-compiler` and `iree-base-runtime`, in order
to switch to a new versioning scheme:
iree-org/iree#18938. This switches to using
the new package names and versions and cleans up some related
documentation along the way.
  • Loading branch information
ScottTodd authored Nov 8, 2024
1 parent 661a800 commit 27b061e
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 24 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci-llama-large-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,10 @@ jobs:
-e "git+https://github.com/iree-org/iree-turbine.git#egg=iree-turbine"
pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
# Try with the latest nightly releases, not what iree-turbine pins.
# We could also pin to a known working or stable version.
# This should eventually stabilize. Do the best we can for now.
# Test with pinned nightly releases, not what iree-turbine uses.
pip install -f https://iree.dev/pip-release-links.html --upgrade \
iree-compiler==20241106.1070 \
iree-runtime==20241106.1070 \
iree-base-compiler==2.9.0rc20241107 \
iree-base-runtime==2.9.0rc20241107 \
"numpy<2.0"
- name: Run llama tests
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/ci-llama-quick-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,10 @@ jobs:
-e "git+https://github.com/iree-org/iree-turbine.git#egg=iree-turbine"
pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
# Try with the latest nightly releases, not what iree-turbine pins.
# We could also pin to a known working or stable version.
# This should eventually stabilize. Do the best we can for now.
# Test with pinned nightly releases, not what iree-turbine uses.
pip install -f https://iree.dev/pip-release-links.html --upgrade \
iree-compiler==20241106.1070 \
iree-runtime==20241106.1070 \
iree-base-compiler==2.9.0rc20241107 \
iree-base-runtime==2.9.0rc20241107 \
"numpy<2.0"
- name: Run llama 8b tests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-shark-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ jobs:
-e "git+https://github.com/iree-org/iree-turbine.git#egg=iree-turbine"
pip install --no-compile -r requirements.txt -e sharktank/ shortfin/
# Try with the latest nightly releases, not what iree-turbine pins.
# Try with the latest nightly releases, not what iree-turbine uses.
# We could also pin to a known working or stable version.
# This should eventually stabilize. Do the best we can for now.
pip install -f https://iree.dev/pip-release-links.html --upgrade \
iree-compiler \
iree-runtime \
iree-base-compiler \
iree-base-runtime \
"numpy<2.0"
- name: Run LLM Integration Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tuner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
python -m pip install \
--find-links https://iree.dev/pip-release-links.html \
--upgrade \
iree-compiler iree-runtime
iree-base-compiler iree-base-runtime
- name: Run tuner tests
run: pytest tuner/
6 changes: 3 additions & 3 deletions .github/workflows/ci_eval.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ jobs:
-e "git+https://github.com/iree-org/iree-turbine.git#egg=iree-turbine"
pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
# Try with the latest nightly releases, not what iree-turbine pins.
# Try with the latest nightly releases, not what iree-turbine uses.
# We could also pin to a known working or stable version.
# This should eventually stabilize. Do the best we can for now.
pip install -f https://iree.dev/pip-release-links.html --upgrade \
iree-compiler \
iree-runtime \
iree-base-compiler \
iree-base-runtime \
"numpy<2.0"
- name: Run perplexity test with vmfb
run: pytest -n 8 -v -s sharktank/tests/evaluate/perplexity_vmfb_test.py --longrun --iree-device='hip://7' --iree-hip-target=gfx942 --iree-hal-target-backends=rocm --llama3-8b-f16-model-path=/data/llama3.1/8b/llama8b_f16.irpa --llama3-8b-tokenizer-path=/data/llama3.1/8b/tokenizer_config.json
Expand Down
8 changes: 4 additions & 4 deletions docs/nightly_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,18 @@ python -m pip install --src deps \
-e "git+https://github.com/iree-org/iree-turbine.git#egg=iree-turbine"
```

To install the `iree-compiler` and `iree-runtime` packages from nightly
releases:
To install the `iree-base-compiler` and `iree-base-runtime` packages from
nightly releases:

```bash
python -m pip install -f https://iree.dev/pip-release-links.html --upgrade \
iree-compiler iree-runtime
iree-base-compiler iree-base-runtime
```

To install all three packages together:

```bash
python -m pip install -f https://iree.dev/pip-release-links.html --upgrade \
iree-compiler iree-runtime --src deps \
iree-base-compiler iree-base-runtime --src deps \
-e "git+https://github.com/iree-org/iree-turbine.git#egg=iree-turbine"
```
2 changes: 1 addition & 1 deletion shortfin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ elseif (SHORTFIN_BUNDLE_DEPS)
FetchContent_Declare(
shortfin_iree
GIT_REPOSITORY https://github.com/iree-org/iree.git
GIT_TAG candidate-20241106.1070
GIT_TAG iree-2.9.0rc20241107
GIT_SUBMODULES ${IREE_SUBMODULES}
GIT_SHALLOW TRUE
SYSTEM
Expand Down
4 changes: 2 additions & 2 deletions shortfin/requirements-iree-compiler.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Keep in sync with IREE_REF in CI and GIT_TAG in CMakeLists.txt
-f https://iree.dev/pip-release-links.html
iree-compiler==20241106.1070
iree-runtime==20241106.1070
iree-base-compiler==2.9.0rc20241107
iree-base-runtime==2.9.0rc20241107

0 comments on commit 27b061e

Please sign in to comment.