From ff6883711cac1c15046846fd3d15702a00ea07de Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Thu, 7 Nov 2024 13:54:45 -0800 Subject: [PATCH] Switch to new IREE package names and versions. --- .github/workflows/ci-llama-large-tests.yaml | 8 +++----- .github/workflows/ci-llama-quick-tests.yaml | 8 +++----- .github/workflows/ci-shark-platform.yml | 6 +++--- .github/workflows/ci-tuner.yml | 2 +- .github/workflows/ci_eval.yaml | 6 +++--- docs/nightly_releases.md | 8 ++++---- shortfin/CMakeLists.txt | 2 +- shortfin/requirements-iree-compiler.txt | 4 ++-- 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci-llama-large-tests.yaml b/.github/workflows/ci-llama-large-tests.yaml index ae8b965e3..4d4924978 100644 --- a/.github/workflows/ci-llama-large-tests.yaml +++ b/.github/workflows/ci-llama-large-tests.yaml @@ -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 diff --git a/.github/workflows/ci-llama-quick-tests.yaml b/.github/workflows/ci-llama-quick-tests.yaml index a2873bd47..390730d18 100644 --- a/.github/workflows/ci-llama-quick-tests.yaml +++ b/.github/workflows/ci-llama-quick-tests.yaml @@ -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 diff --git a/.github/workflows/ci-shark-platform.yml b/.github/workflows/ci-shark-platform.yml index d9f4a35da..3b556ebd3 100644 --- a/.github/workflows/ci-shark-platform.yml +++ b/.github/workflows/ci-shark-platform.yml @@ -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 diff --git a/.github/workflows/ci-tuner.yml b/.github/workflows/ci-tuner.yml index 71ddc978b..f1fcebfdc 100644 --- a/.github/workflows/ci-tuner.yml +++ b/.github/workflows/ci-tuner.yml @@ -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/ diff --git a/.github/workflows/ci_eval.yaml b/.github/workflows/ci_eval.yaml index b5a2e8f69..f7d4a8e47 100644 --- a/.github/workflows/ci_eval.yaml +++ b/.github/workflows/ci_eval.yaml @@ -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 diff --git a/docs/nightly_releases.md b/docs/nightly_releases.md index c6b4e1bba..5376081d9 100644 --- a/docs/nightly_releases.md +++ b/docs/nightly_releases.md @@ -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" ``` diff --git a/shortfin/CMakeLists.txt b/shortfin/CMakeLists.txt index 5e38bd8cb..13e9ae8a8 100644 --- a/shortfin/CMakeLists.txt +++ b/shortfin/CMakeLists.txt @@ -183,7 +183,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 diff --git a/shortfin/requirements-iree-compiler.txt b/shortfin/requirements-iree-compiler.txt index b700e6b3e..1b8568886 100644 --- a/shortfin/requirements-iree-compiler.txt +++ b/shortfin/requirements-iree-compiler.txt @@ -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