Skip to content

Commit 206e257

Browse files
authored
Move requirements into their own directory (#12547)
Signed-off-by: Harry Mellor <[email protected]>
1 parent e02883c commit 206e257

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+125
-128
lines changed

.buildkite/nightly-benchmarks/scripts/run-nightly-benchmarks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ main() {
426426

427427
pip install -U transformers
428428

429-
pip install -r requirements-dev.txt
429+
pip install -r requirements/dev.txt
430430
which genai-perf
431431

432432
# check storage

.buildkite/run-cpu-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function cpu_tests() {
3535
# Run basic model test
3636
docker exec cpu-test-"$BUILDKITE_BUILD_NUMBER"-"$NUMA_NODE" bash -c "
3737
set -e
38-
pip install -r vllm/requirements-test.txt
38+
pip install -r vllm/requirements/test.txt
3939
pytest -v -s tests/models/decoder_only/language -m cpu_model
4040
pytest -v -s tests/models/embedding/language -m cpu_model
4141
pytest -v -s tests/models/encoder_decoder/language -m cpu_model

.buildkite/test-pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
fast_check: true
3636
no_gpu: True
3737
commands:
38-
- pip install -r requirements-docs.txt
38+
- pip install -r ../../requirements/docs.txt
3939
- SPHINXOPTS=\"-W\" make html
4040
# Check API reference (if it fails, you may have missing mock imports)
4141
- grep \"sig sig-object py\" build/html/api/inference_params.html

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
# matrix:
5151
# os: ['ubuntu-20.04']
5252
# python-version: ['3.9', '3.10', '3.11', '3.12']
53-
# pytorch-version: ['2.4.0'] # Must be the most recent version that meets requirements-cuda.txt.
53+
# pytorch-version: ['2.4.0'] # Must be the most recent version that meets requirements/cuda.txt.
5454
# cuda-version: ['11.8', '12.1']
5555

5656
# steps:

.github/workflows/scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PATH=${cuda_home}/bin:$PATH
99
LD_LIBRARY_PATH=${cuda_home}/lib64:$LD_LIBRARY_PATH
1010

1111
# Install requirements
12-
$python_executable -m pip install -r requirements-build.txt -r requirements-cuda.txt
12+
$python_executable -m pip install -r requirements/build.txt -r requirements/cuda.txt
1313

1414
# Limit the number of parallel jobs to avoid OOM
1515
export MAX_JOBS=1

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ repos:
4444
rev: 0.6.2
4545
hooks:
4646
- id: pip-compile
47-
args: [requirements-test.in, -o, requirements-test.txt]
48-
files: ^requirements-test\.(in|txt)$
47+
args: [requirements/test.in, -o, requirements/test.txt]
48+
files: ^requirements/test\.(in|txt)$
4949
- repo: local
5050
hooks:
5151
- id: mypy-local

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ formats: []
1818
# Optionally declare the Python requirements required to build your docs
1919
python:
2020
install:
21-
- requirements: docs/requirements-docs.txt
21+
- requirements: requirements/docs.txt

Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ RUN --mount=type=cache,target=/root/.cache/uv \
5555
uv pip install --index-url https://download.pytorch.org/whl/nightly/cu126 "torch==2.7.0.dev20250121+cu126" "torchvision==0.22.0.dev20250121"; \
5656
fi
5757

58-
COPY requirements-common.txt requirements-common.txt
59-
COPY requirements-cuda.txt requirements-cuda.txt
58+
COPY requirements/common.txt requirements/common.txt
59+
COPY requirements/cuda.txt requirements/cuda.txt
6060
RUN --mount=type=cache,target=/root/.cache/uv \
61-
uv pip install -r requirements-cuda.txt
61+
uv pip install -r requirements/cuda.txt
6262

6363
# cuda arch list used by torch
6464
# can be useful for both `dev` and `test`
@@ -76,14 +76,14 @@ FROM base AS build
7676
ARG TARGETPLATFORM
7777

7878
# install build dependencies
79-
COPY requirements-build.txt requirements-build.txt
79+
COPY requirements/build.txt requirements/build.txt
8080

8181
# This timeout (in seconds) is necessary when installing some dependencies via uv since it's likely to time out
8282
# Reference: https://github.com/astral-sh/uv/pull/1694
8383
ENV UV_HTTP_TIMEOUT=500
8484

8585
RUN --mount=type=cache,target=/root/.cache/uv \
86-
uv pip install -r requirements-build.txt
86+
uv pip install -r requirements/build.txt
8787

8888
COPY . .
8989
ARG GIT_REPO_CHECK=0
@@ -151,11 +151,11 @@ FROM base as dev
151151
# Reference: https://github.com/astral-sh/uv/pull/1694
152152
ENV UV_HTTP_TIMEOUT=500
153153

154-
COPY requirements-lint.txt requirements-lint.txt
155-
COPY requirements-test.txt requirements-test.txt
156-
COPY requirements-dev.txt requirements-dev.txt
154+
COPY requirements/lint.txt requirements/lint.txt
155+
COPY requirements/test.txt requirements/test.txt
156+
COPY requirements/dev.txt requirements/dev.txt
157157
RUN --mount=type=cache,target=/root/.cache/uv \
158-
uv pip install -r requirements-dev.txt
158+
uv pip install -r requirements/dev.txt
159159
#################### DEV IMAGE ####################
160160

161161
#################### vLLM installation IMAGE ####################
@@ -230,9 +230,9 @@ COPY examples examples
230230
# some issues w.r.t. JIT compilation. Therefore we need to
231231
# install build dependencies for JIT compilation.
232232
# TODO: Remove this once FlashInfer AOT wheel is fixed
233-
COPY requirements-build.txt requirements-build.txt
233+
COPY requirements/build.txt requirements/build.txt
234234
RUN --mount=type=cache,target=/root/.cache/uv \
235-
uv pip install -r requirements-build.txt
235+
uv pip install -r requirements/build.txt
236236

237237
#################### vLLM installation IMAGE ####################
238238

@@ -249,7 +249,7 @@ ENV UV_HTTP_TIMEOUT=500
249249

250250
# install development dependencies (for testing)
251251
RUN --mount=type=cache,target=/root/.cache/uv \
252-
uv pip install -r requirements-dev.txt
252+
uv pip install -r requirements/dev.txt
253253

254254
# install development dependencies (for testing)
255255
RUN --mount=type=cache,target=/root/.cache/uv \

Dockerfile.arm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ WORKDIR /workspace
2626
ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu"
2727
ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
2828
RUN --mount=type=cache,target=/root/.cache/pip \
29-
--mount=type=bind,src=requirements-build.txt,target=requirements-build.txt \
29+
--mount=type=bind,src=requirements/build.txt,target=requirements/build.txt \
3030
pip install --upgrade pip && \
31-
pip install -r requirements-build.txt
31+
pip install -r requirements/build.txt
3232

3333
FROM cpu-test-arm AS build
3434

3535
WORKDIR /workspace/vllm
3636

3737
RUN --mount=type=cache,target=/root/.cache/pip \
38-
--mount=type=bind,src=requirements-common.txt,target=requirements-common.txt \
39-
--mount=type=bind,src=requirements-cpu.txt,target=requirements-cpu.txt \
40-
pip install -v -r requirements-cpu.txt
38+
--mount=type=bind,src=requirements/common.txt,target=requirements/common.txt \
39+
--mount=type=bind,src=requirements/cpu.txt,target=requirements/cpu.txt \
40+
pip install -v -r requirements/cpu.txt
4141

4242
COPY . .
4343
ARG GIT_REPO_CHECK=0

Dockerfile.cpu

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ WORKDIR /workspace
2929
ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu"
3030
ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
3131
RUN --mount=type=cache,target=/root/.cache/pip \
32-
--mount=type=bind,src=requirements-build.txt,target=requirements-build.txt \
32+
--mount=type=bind,src=requirements/build.txt,target=requirements/build.txt \
3333
pip install --upgrade pip && \
34-
pip install -r requirements-build.txt
34+
pip install -r requirements/build.txt
3535

3636
FROM cpu-test-1 AS build
3737

3838
WORKDIR /workspace/vllm
3939

4040
RUN --mount=type=cache,target=/root/.cache/pip \
41-
--mount=type=bind,src=requirements-common.txt,target=requirements-common.txt \
42-
--mount=type=bind,src=requirements-cpu.txt,target=requirements-cpu.txt \
43-
pip install -v -r requirements-cpu.txt
41+
--mount=type=bind,src=requirements/common.txt,target=requirements/common.txt \
42+
--mount=type=bind,src=requirements/cpu.txt,target=requirements/cpu.txt \
43+
pip install -v -r requirements/cpu.txt
4444

4545
COPY . .
4646
ARG GIT_REPO_CHECK=0

0 commit comments

Comments
 (0)