Skip to content

Commit 81311b9

Browse files
ScottToddeagarvey-amd
authored andcommitted
Move requirements-iree-*.txt to top level. (#765)
This is prep work for #760. I also considered putting the files under `build_tools/` or `shark-ai/`, but we already have a few requirements files in the repository root. Still not as many as https://github.com/vllm-project/vllm though 😛.
1 parent 1995b3c commit 81311b9

7 files changed

+27
-10
lines changed

.github/workflows/ci-libshortfin.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ jobs:
101101
cache: "pip"
102102
cache-dependency-path: |
103103
'shortfin/requirements-tests.txt'
104-
'shortfin/requirements-iree-compiler.txt'
104+
'requirements-iree-pinned.txt'
105105
- name: Install Python packages
106106
working-directory: ${{ env.LIBSHORTFIN_DIR }}
107107
run: |
108108
pip install -r requirements-tests.txt
109-
pip install -r requirements-iree-compiler.txt
109+
pip install -r ../requirements-iree-pinned.txt
110110
pip freeze
111111
112112
- name: Build shortfin

.github/workflows/ci-sdxl.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
working-directory: ${{ env.LIBSHORTFIN_DIR }}
6666
run: |
6767
pip install -r requirements-tests.txt
68-
pip install -r requirements-iree-compiler.txt
68+
pip install -r ../requirements-iree-pinned.txt
6969
pip freeze
7070
7171
- name: Install shortfin

.github/workflows/ci_linux_x64_asan-libshortfin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
run: |
125125
eval "$(pyenv init -)"
126126
pip install -r requirements-tests.txt
127-
pip install -r requirements-iree-compiler.txt
127+
pip install -r ../requirements-iree-pinned.txt
128128
pip freeze
129129
130130
- name: Save Python dependencies cache

requirements-iree-pinned.txt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Pinned versions of IREE dependencies.
2+
3+
# Keep these versions synced with SHORTFIN_IREE_GIT_TAG in shortfin/CMakeLists.txt
4+
--pre
5+
--find-links https://iree.dev/pip-release-links.html
6+
iree-base-compiler==3.1.0rc20241204
7+
iree-base-runtime==3.1.0rc20241204
8+
9+
# TODO(#760): include iree-turbine in this requirements file too?
10+
# iree-turbine==3.1.0rc20241205

requirements-iree-unpinned.txt

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Unpinned versions of IREE dependencies.
2+
3+
--pre
4+
--find-links https://iree.dev/pip-release-links.html
5+
iree-base-compiler
6+
iree-base-runtime
7+
8+
# TODO(#760): include iree-turbine in this requirements file too?
9+
# iree-turbine

shortfin/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ endif()
4343
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
4444
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
4545

46-
# Pins
47-
# Keep in sync with requirements-iree-compiler.txt.
46+
# Version pins for dependencies.
47+
# Prefer to keep the IREE git tag synced with the Python package version in the
48+
# requirements-iree-pinned.txt file. At a minimum, the compiler from those
49+
# packages must be compatible with the runtime at this source ref.
4850
set(SHORTFIN_IREE_GIT_TAG "iree-3.1.0rc20241220")
4951

5052
# build options

shortfin/requirements-iree-compiler.txt

-4
This file was deleted.

0 commit comments

Comments
 (0)