Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch workflows to use new requirements-iree-*.txt files. #813

Merged
merged 4 commits into from
Jan 13, 2025
+34 −51
Merged

Switch workflows to use new requirements-iree-*.txt files. #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f71074
Switch workflows to use new requirements-iree-unpinned.txt file.
ScottTodd Jan 10, 2025
ca5f053
Don't use root requirements.txt.
ScottTodd Jan 13, 2025
4552d08
Unpin requirements in ci-sglang-benchmark.yml.
ScottTodd Jan 13, 2025
5077a1f
Merge remote-tracking branch 'upstream/main' into requirements-iree-u…
ScottTodd Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions .github/workflows/ci-llama-large-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,12 @@ jobs:
python -m pip install --no-compile --upgrade pip

# Note: We install in three steps in order to satisfy requirements
# from non default locations first. Installing the PyTorch CPU
# wheels saves multiple minutes and a lot of bandwidth on runner setup.
# from non default locations first.
pip install --no-compile -r pytorch-cpu-requirements.txt

# Install nightly IREE packages.
# We could also pin to a known working or stable version.
pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \
iree-base-compiler \
iree-base-runtime \
iree-turbine

pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
marbre marked this conversation as resolved.
Show resolved Hide resolved
pip install -r requirements-iree-unpinned.txt
pip install --no-compile \
-r sharktank/requirements-tests.txt \
-e sharktank/

pip freeze

Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/ci-sglang-benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,19 @@ jobs:
run: |
source ${VENV_DIR}/bin/activate
python -m pip install --no-compile --upgrade pip

# Note: We install in three steps in order to satisfy requirements
# from non default locations first. Installing the PyTorch CPU
# wheels saves multiple minutes and a lot of bandwidth on runner setup.
# from non default locations first.
pip install --no-compile -r pytorch-cpu-requirements.txt
pip install -f https://iree.dev/pip-release-links.html --pre iree-turbine
pip install --no-compile -r requirements.txt -e sharktank/ shortfin/

# Pin to known-working versions.
pip install -f https://iree.dev/pip-release-links.html \
iree-base-compiler==3.1.0rc20241220 \
iree-base-runtime==3.1.0rc20241220 \
"numpy<2.0"

# Use newest possible releases to be able to track commits that may
# cause errors or performance changes.
pip install -r requirements-iree-unpinned.txt

pip install --no-compile \
-r sharktank/requirements-tests.txt \
-r shortfin/requirements-tests.txt \
-e sharktank/ shortfin/

# Install SGLang
pip install "git+https://github.com/nod-ai/sglang.git#subdirectory=python"
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/ci-sglang-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,17 @@ jobs:
python -m pip install --no-compile --upgrade pip

# Note: We install in three steps in order to satisfy requirements
# from non default locations first. Installing the PyTorch CPU
# wheels saves multiple minutes and a lot of bandwidth on runner setup.
# from non default locations first.
pip install --no-compile -r pytorch-cpu-requirements.txt

# Use newest possible releases to be able to track commits that may
# cause errors.
pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \
iree-base-compiler \
iree-base-runtime \
iree-turbine \
"numpy<2.0"
pip install -r requirements-iree-unpinned.txt

pip install --no-compile -r requirements.txt -e sharktank/ shortfin/
pip install --no-compile \
-r sharktank/requirements-tests.txt \
-r shortfin/requirements-tests.txt \
-e sharktank/ shortfin/

# Install SGLang and sentence_transformers
pip install "git+https://github.com/nod-ai/sglang.git#subdirectory=python"
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci-tuner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ jobs:
- name: Install tuner dependencies
run: |
pip install -r tuner/requirements-tuner.txt
python -m pip install \
--find-links https://iree.dev/pip-release-links.html \
--upgrade --pre \
iree-base-compiler iree-base-runtime
pip install -r requirements-iree-unpinned.txt

- name: Run tuner tests
run: pytest tuner/
Expand Down
29 changes: 11 additions & 18 deletions .github/workflows/ci_eval.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,13 @@ jobs:
python -m pip install --no-compile --upgrade pip

# Note: We install in three steps in order to satisfy requirements
# from non default locations first. Installing the PyTorch CPU
# wheels saves multiple minutes and a lot of bandwidth on runner setup.
# from non default locations first.
pip install --no-compile -r pytorch-cpu-requirements.txt
pip install -r requirements-iree-unpinned.txt
pip install --no-compile \
-r sharktank/requirements-tests.txt \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not following here. What change do you want made?

I believe

          pip install --no-compile \
            -r sharktank/requirements-tests.txt \
            -e sharktank/

is sufficient, no need to also install sharktank/requirements.txt or sharktank/requirements-dev.txt

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As commented above with this, this drops installing the dependencies specified in sharktank/requirements-dev.txt. Just wanted to point out that this is the same here but that might have been a little to short. No change needed.

-e sharktank/

# Install nightly IREE packages.
# We could also pin to a known working or stable version.
pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \
iree-base-compiler \
iree-base-runtime \
iree-turbine

pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
pip freeze

- name: Run perplexity test with IREE
Expand Down Expand Up @@ -112,16 +107,14 @@ jobs:
python -m pip install --no-compile --upgrade pip

# Note: We install in three steps in order to satisfy requirements
# from non default locations first. Installing the PyTorch CPU
# wheels saves multiple minutes and a lot of bandwidth on runner setup.
# from non default locations first.
pip install --no-compile -r pytorch-cpu-requirements.txt
pip install -r requirements-iree-unpinned.txt
pip install --no-compile \
-r sharktank/requirements-tests.txt \
-e sharktank/

# Install nightly iree-turbine.
# We could also pin to a known working or stable version.
pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \
iree-turbine

pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/
pip freeze

- name: Run perplexity test with Torch
run: |
Expand Down
Loading