From 10633d9e77fddb931cf8c7090492f7777cd89efa Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:39:43 +0000
Subject: [PATCH 01/10] `requirements-x.txt` -> `requirements/x.txt`

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 .../build.txt                                 |  0
 .../common.txt                                |  0
 requirements-cpu.txt => requirements/cpu.txt  |  2 +-
 .../cuda.txt                                  |  2 +-
 requirements-dev.txt => requirements/dev.txt  |  4 +-
 requirements-hpu.txt => requirements/hpu.txt  |  2 +-
 .../lint.txt                                  |  0
 .../neuron.txt                                |  2 +-
 .../openvino.txt                              |  2 +-
 .../rocm.txt                                  |  2 +-
 requirements-test.in => requirements/test.in  |  0
 .../test.txt                                  | 58 +++++++++----------
 requirements-tpu.txt => requirements/tpu.txt  |  2 +-
 requirements-xpu.txt => requirements/xpu.txt  |  2 +-
 14 files changed, 39 insertions(+), 39 deletions(-)
 rename requirements-build.txt => requirements/build.txt (100%)
 rename requirements-common.txt => requirements/common.txt (100%)
 rename requirements-cpu.txt => requirements/cpu.txt (93%)
 rename requirements-cuda.txt => requirements/cuda.txt (94%)
 rename requirements-dev.txt => requirements/dev.txt (67%)
 rename requirements-hpu.txt => requirements/hpu.txt (88%)
 rename requirements-lint.txt => requirements/lint.txt (100%)
 rename requirements-neuron.txt => requirements/neuron.txt (81%)
 rename requirements-openvino.txt => requirements/openvino.txt (94%)
 rename requirements-rocm.txt => requirements/rocm.txt (83%)
 rename requirements-test.in => requirements/test.in (100%)
 rename requirements-test.txt => requirements/test.txt (91%)
 rename requirements-tpu.txt => requirements/tpu.txt (97%)
 rename requirements-xpu.txt => requirements/xpu.txt (95%)

diff --git a/requirements-build.txt b/requirements/build.txt
similarity index 100%
rename from requirements-build.txt
rename to requirements/build.txt
diff --git a/requirements-common.txt b/requirements/common.txt
similarity index 100%
rename from requirements-common.txt
rename to requirements/common.txt
diff --git a/requirements-cpu.txt b/requirements/cpu.txt
similarity index 93%
rename from requirements-cpu.txt
rename to requirements/cpu.txt
index 056fbf5a7ade..61a59505c3f5 100644
--- a/requirements-cpu.txt
+++ b/requirements/cpu.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 # Dependencies for CPUs
 torch==2.5.1+cpu; platform_machine != "ppc64le" and platform_machine != "aarch64" and platform_system != "Darwin"
diff --git a/requirements-cuda.txt b/requirements/cuda.txt
similarity index 94%
rename from requirements-cuda.txt
rename to requirements/cuda.txt
index 8002fbd8ee5b..0c716e563c1d 100644
--- a/requirements-cuda.txt
+++ b/requirements/cuda.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 # Dependencies for NVIDIA GPUs
 ray[default] >= 2.9
diff --git a/requirements-dev.txt b/requirements/dev.txt
similarity index 67%
rename from requirements-dev.txt
rename to requirements/dev.txt
index 421aa2e796ec..e75821eb4a81 100644
--- a/requirements-dev.txt
+++ b/requirements/dev.txt
@@ -1,5 +1,5 @@
--r requirements-lint.txt
--r requirements-test.txt
+-r lint.txt
+-r test.txt
 
 # Avoid adding requirements directly to this file.
 # Instead, modify the two files referenced above.
diff --git a/requirements-hpu.txt b/requirements/hpu.txt
similarity index 88%
rename from requirements-hpu.txt
rename to requirements/hpu.txt
index 63a5f8b18f6b..a61d72d04f40 100644
--- a/requirements-hpu.txt
+++ b/requirements/hpu.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 # Dependencies for HPU code
 ray
diff --git a/requirements-lint.txt b/requirements/lint.txt
similarity index 100%
rename from requirements-lint.txt
rename to requirements/lint.txt
diff --git a/requirements-neuron.txt b/requirements/neuron.txt
similarity index 81%
rename from requirements-neuron.txt
rename to requirements/neuron.txt
index 5e08d101fcd6..960984ab9155 100644
--- a/requirements-neuron.txt
+++ b/requirements/neuron.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 # Dependencies for Neuron devices
 transformers-neuronx >= 0.13.0
diff --git a/requirements-openvino.txt b/requirements/openvino.txt
similarity index 94%
rename from requirements-openvino.txt
rename to requirements/openvino.txt
index ac9d851d661b..04b8c3b009a2 100644
--- a/requirements-openvino.txt
+++ b/requirements/openvino.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 torch == 2.5.1 #  should be aligned with "common" vLLM torch version
 openvino >= 2024.4.0 # since 2024.4.0 both CPU and GPU support Paged Attention
diff --git a/requirements-rocm.txt b/requirements/rocm.txt
similarity index 83%
rename from requirements-rocm.txt
rename to requirements/rocm.txt
index ccc906234177..a7d517018bfc 100644
--- a/requirements-rocm.txt
+++ b/requirements/rocm.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 # Dependencies for AMD GPUs
 awscli
diff --git a/requirements-test.in b/requirements/test.in
similarity index 100%
rename from requirements-test.in
rename to requirements/test.in
diff --git a/requirements-test.txt b/requirements/test.txt
similarity index 91%
rename from requirements-test.txt
rename to requirements/test.txt
index 09e009c2e21f..92289d0b1703 100644
--- a/requirements-test.txt
+++ b/requirements/test.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    python3.12 -m piptools compile requirements-test.in -o requirements-test.txt
+#    python3.12 -m piptools compile requirements/test.in -o requirements/test.txt
 #
 absl-py==2.1.0
     # via rouge-score
@@ -36,9 +36,9 @@ attrs==24.2.0
 audioread==3.0.1
     # via librosa
 awscli==1.35.23
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 bitsandbytes==0.45.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 black==24.10.0
     # via datamodel-code-generator
 boto3==1.35.57
@@ -51,7 +51,7 @@ botocore==1.35.57
 bounded-pool-executor==0.0.3
     # via pqdm
 buildkite-test-collector==0.1.9
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 certifi==2024.8.30
     # via
     #   httpcore
@@ -82,7 +82,7 @@ cupy-cuda12x==13.3.0
 cycler==0.12.1
     # via matplotlib
 datamodel-code-generator==0.26.3
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 dataproperty==1.0.1
     # via
     #   pytablewriter
@@ -94,7 +94,7 @@ datasets==3.0.2
 decorator==5.1.1
     # via librosa
 decord==0.6.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 dill==0.3.8
     # via
     #   datasets
@@ -106,7 +106,7 @@ dnspython==2.7.0
 docutils==0.16
     # via awscli
 einops==0.8.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 email-validator==2.2.0
     # via pydantic
 evaluate==0.4.3
@@ -138,7 +138,7 @@ fsspec[http]==2024.9.0
     #   huggingface-hub
     #   torch
 genai-perf==0.0.8
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 genson==1.3.0
     # via datamodel-code-generator
 h11==0.14.0
@@ -148,7 +148,7 @@ hiredis==3.0.0
 httpcore==1.0.6
     # via httpx
 httpx==0.27.2
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 huggingface-hub==0.26.2
     # via
     #   accelerate
@@ -202,11 +202,11 @@ lazy-loader==0.4
 libnacl==2.1.0
     # via tensorizer
 librosa==0.10.2.post1
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 llvmlite==0.43.0
     # via numba
 lm-eval[api]==0.4.4
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 lxml==5.3.0
     # via sacrebleu
 markdown-it-py==3.0.0
@@ -214,7 +214,7 @@ markdown-it-py==3.0.0
 markupsafe==3.0.2
     # via jinja2
 matplotlib==3.9.2
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 mbstrdecoder==1.1.3
     # via
     #   dataproperty
@@ -224,7 +224,7 @@ mdurl==0.1.2
     # via markdown-it-py
 mistral-common[opencv]==1.5.1
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   mistral-common
 more-itertools==10.5.0
     # via lm-eval
@@ -254,7 +254,7 @@ numexpr==2.10.1
     # via lm-eval
 numpy==1.26.4
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   accelerate
     #   bitsandbytes
     #   contourpy
@@ -352,7 +352,7 @@ patsy==1.0.1
     # via statsmodels
 peft==0.13.2
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   lm-eval
 pillow==10.4.0
     # via
@@ -374,7 +374,7 @@ pooch==1.8.2
 portalocker==2.10.1
     # via sacrebleu
 pqdm==0.2.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 propcache==0.2.0
     # via yarl
 protobuf==5.28.3
@@ -412,7 +412,7 @@ pytablewriter==1.2.0
     # via lm-eval
 pytest==8.3.3
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   buildkite-test-collector
     #   genai-perf
     #   pytest-asyncio
@@ -421,15 +421,15 @@ pytest==8.3.3
     #   pytest-rerunfailures
     #   pytest-shard
 pytest-asyncio==0.24.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 pytest-forked==1.6.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 pytest-mock==3.14.0
     # via genai-perf
 pytest-rerunfailures==14.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 pytest-shard==0.1.2
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 python-dateutil==2.9.0.post0
     # via
     #   botocore
@@ -456,7 +456,7 @@ pyyaml==6.0.2
     #   timm
     #   transformers
 ray[adag]==2.40.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 redis==5.2.0
     # via tensorizer
 referencing==0.35.1
@@ -518,7 +518,7 @@ scipy==1.13.1
     #   sentence-transformers
     #   statsmodels
 sentence-transformers==3.2.1
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 sentencepiece==0.2.0
     # via mistral-common
 six==1.16.0
@@ -531,7 +531,7 @@ sniffio==1.3.1
     #   httpx
 soundfile==0.12.1
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   librosa
 soxr==0.5.0.post1
     # via librosa
@@ -552,7 +552,7 @@ tenacity==9.0.0
     #   lm-eval
     #   plotly
 tensorizer==2.9.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 threadpoolctl==3.5.0
     # via scikit-learn
 tiktoken==0.7.0
@@ -560,12 +560,12 @@ tiktoken==0.7.0
     #   lm-eval
     #   mistral-common
 timm==1.0.11
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 tokenizers==0.21.0
     # via transformers
 torch==2.5.1
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   accelerate
     #   bitsandbytes
     #   lm-eval
@@ -597,12 +597,12 @@ transformers==4.47.0
     #   sentence-transformers
     #   transformers-stream-generator
 transformers-stream-generator==0.0.5
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 triton==3.1.0
     # via torch
 tritonclient==2.51.0
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   genai-perf
 typepy[datetime]==1.3.2
     # via
diff --git a/requirements-tpu.txt b/requirements/tpu.txt
similarity index 97%
rename from requirements-tpu.txt
rename to requirements/tpu.txt
index 1abde714af7c..ced60b8125e6 100644
--- a/requirements-tpu.txt
+++ b/requirements/tpu.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 # Dependencies for TPU
 cmake>=3.26
diff --git a/requirements-xpu.txt b/requirements/xpu.txt
similarity index 95%
rename from requirements-xpu.txt
rename to requirements/xpu.txt
index 42c6c321d040..458f62a0c302 100644
--- a/requirements-xpu.txt
+++ b/requirements/xpu.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 ray >= 2.9
 cmake>=3.26

From c6d1cce275eae5259cf6ddbdad5002790a829e51 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:44:45 +0000
Subject: [PATCH 02/10] Update references to requirements files

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 .../scripts/run-nightly-benchmarks.sh         |  2 +-
 .buildkite/run-cpu-test.sh                    |  2 +-
 .github/workflows/publish.yml                 |  2 +-
 .github/workflows/scripts/build.sh            |  2 +-
 Dockerfile                                    | 24 +++++++++----------
 Dockerfile.arm                                | 10 ++++----
 Dockerfile.cpu                                | 10 ++++----
 Dockerfile.hpu                                |  2 +-
 Dockerfile.neuron                             |  2 +-
 Dockerfile.openvino                           |  2 +-
 Dockerfile.ppc64le                            |  4 ++--
 Dockerfile.rocm                               |  6 ++---
 Dockerfile.tpu                                |  2 +-
 Dockerfile.xpu                                |  6 ++---
 MANIFEST.in                                   | 10 ++++----
 docs/source/contributing/overview.md          |  2 +-
 .../ai_accelerator/hpu-gaudi.inc.md           |  4 ++--
 .../installation/ai_accelerator/neuron.inc.md |  2 +-
 .../ai_accelerator/openvino.inc.md            |  2 +-
 .../installation/ai_accelerator/tpu.inc.md    |  2 +-
 .../installation/cpu/apple.inc.md             |  2 +-
 .../installation/cpu/build.inc.md             |  2 +-
 .../installation/gpu/cuda.inc.md              |  2 +-
 .../installation/gpu/rocm.inc.md              |  2 +-
 .../installation/gpu/xpu.inc.md               |  2 +-
 format.sh                                     |  2 +-
 pyproject.toml                                |  2 +-
 setup.py                                      | 18 +++++++-------
 28 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/.buildkite/nightly-benchmarks/scripts/run-nightly-benchmarks.sh b/.buildkite/nightly-benchmarks/scripts/run-nightly-benchmarks.sh
index 32bd34c431c8..4d01a314adc4 100644
--- a/.buildkite/nightly-benchmarks/scripts/run-nightly-benchmarks.sh
+++ b/.buildkite/nightly-benchmarks/scripts/run-nightly-benchmarks.sh
@@ -426,7 +426,7 @@ main() {
 
   pip install -U transformers
 
-  pip install -r requirements-dev.txt
+  pip install -r requirements/dev.txt
   which genai-perf
 
   # check storage
diff --git a/.buildkite/run-cpu-test.sh b/.buildkite/run-cpu-test.sh
index e19ace782feb..a34783c790dd 100644
--- a/.buildkite/run-cpu-test.sh
+++ b/.buildkite/run-cpu-test.sh
@@ -35,7 +35,7 @@ function cpu_tests() {
   # Run basic model test
   docker exec cpu-test-"$BUILDKITE_BUILD_NUMBER"-"$NUMA_NODE" bash -c "
     set -e
-    pip install -r vllm/requirements-test.txt
+    pip install -r vllm/requirements/test.txt
     pytest -v -s tests/models/decoder_only/language -m cpu_model
     pytest -v -s tests/models/embedding/language -m cpu_model
     pytest -v -s tests/models/encoder_decoder/language -m cpu_model
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e40ceaaa8b03..fc6739eb3558 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -50,7 +50,7 @@ jobs:
   #     matrix:
   #         os: ['ubuntu-20.04']
   #         python-version: ['3.9', '3.10', '3.11', '3.12']
-  #         pytorch-version: ['2.4.0']  # Must be the most recent version that meets requirements-cuda.txt.
+  #         pytorch-version: ['2.4.0']  # Must be the most recent version that meets requirements/cuda.txt.
   #         cuda-version: ['11.8', '12.1']
 
   #   steps:
diff --git a/.github/workflows/scripts/build.sh b/.github/workflows/scripts/build.sh
index 122e4e101e20..0f010832b465 100644
--- a/.github/workflows/scripts/build.sh
+++ b/.github/workflows/scripts/build.sh
@@ -9,7 +9,7 @@ PATH=${cuda_home}/bin:$PATH
 LD_LIBRARY_PATH=${cuda_home}/lib64:$LD_LIBRARY_PATH
 
 # Install requirements
-$python_executable -m pip install -r requirements-build.txt -r requirements-cuda.txt
+$python_executable -m pip install -r requirements/build.txt -r requirements/cuda.txt
 
 # Limit the number of parallel jobs to avoid OOM
 export MAX_JOBS=1
diff --git a/Dockerfile b/Dockerfile
index 0b9f74e08dc6..f21f98c854e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,10 +55,10 @@ RUN --mount=type=cache,target=/root/.cache/pip \
         python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cu126 "torch==2.7.0.dev20250121+cu126" "torchvision==0.22.0.dev20250121";  \
     fi
 
-COPY requirements-common.txt requirements-common.txt
-COPY requirements-cuda.txt requirements-cuda.txt
+COPY requirements/common.txt requirements/common.txt
+COPY requirements/cuda.txt requirements/cuda.txt
 RUN --mount=type=cache,target=/root/.cache/pip \
-    python3 -m pip install -r requirements-cuda.txt
+    python3 -m pip install -r requirements/cuda.txt
 
 # cuda arch list used by torch
 # can be useful for both `dev` and `test`
@@ -76,10 +76,10 @@ FROM base AS build
 ARG TARGETPLATFORM
 
 # install build dependencies
-COPY requirements-build.txt requirements-build.txt
+COPY requirements/build.txt requirements/build.txt
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-    python3 -m pip install -r requirements-build.txt
+    python3 -m pip install -r requirements/build.txt
 
 COPY . .
 ARG GIT_REPO_CHECK=0
@@ -140,11 +140,11 @@ RUN if [ "$RUN_WHEEL_CHECK" = "true" ]; then \
 #################### DEV IMAGE ####################
 FROM base as dev
 
-COPY requirements-lint.txt requirements-lint.txt
-COPY requirements-test.txt requirements-test.txt
-COPY requirements-dev.txt requirements-dev.txt
+COPY requirements/lint.txt requirements/lint.txt
+COPY requirements/test.txt requirements/test.txt
+COPY requirements/dev.txt requirements/dev.txt
 RUN --mount=type=cache,target=/root/.cache/pip \
-    python3 -m pip install -r requirements-dev.txt
+    python3 -m pip install -r requirements/dev.txt
 #################### DEV IMAGE ####################
 
 #################### vLLM installation IMAGE ####################
@@ -215,9 +215,9 @@ COPY examples examples
 # some issues w.r.t. JIT compilation. Therefore we need to
 # install build dependencies for JIT compilation.
 # TODO: Remove this once FlashInfer AOT wheel is fixed
-COPY requirements-build.txt requirements-build.txt
+COPY requirements/build.txt requirements/build.txt
 RUN --mount=type=cache,target=/root/.cache/pip \
-    python3 -m pip install -r requirements-build.txt
+    python3 -m pip install -r requirements/build.txt
 
 #################### vLLM installation IMAGE ####################
 
@@ -230,7 +230,7 @@ ADD . /vllm-workspace/
 
 # install development dependencies (for testing)
 RUN --mount=type=cache,target=/root/.cache/pip \
-    python3 -m pip install -r requirements-dev.txt
+    python3 -m pip install -r requirements/dev.txt
 
 # install development dependencies (for testing)
 RUN --mount=type=cache,target=/root/.cache/pip \
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 093ee2209222..bad093684239 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -26,18 +26,18 @@ WORKDIR /workspace
 ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu"
 ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
 RUN --mount=type=cache,target=/root/.cache/pip \
-    --mount=type=bind,src=requirements-build.txt,target=requirements-build.txt \
+    --mount=type=bind,src=requirements/build.txt,target=requirements/build.txt \
     pip install --upgrade pip && \
-    pip install -r requirements-build.txt
+    pip install -r requirements/build.txt
 
 FROM cpu-test-arm AS build
 
 WORKDIR /workspace/vllm
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-    --mount=type=bind,src=requirements-common.txt,target=requirements-common.txt \
-    --mount=type=bind,src=requirements-cpu.txt,target=requirements-cpu.txt \
-    pip install -v -r requirements-cpu.txt
+    --mount=type=bind,src=requirements/common.txt,target=requirements/common.txt \
+    --mount=type=bind,src=requirements/cpu.txt,target=requirements/cpu.txt \
+    pip install -v -r requirements/cpu.txt
 
 COPY . .
 ARG GIT_REPO_CHECK=0
diff --git a/Dockerfile.cpu b/Dockerfile.cpu
index ebe226cf6d14..08a4e188f4c1 100644
--- a/Dockerfile.cpu
+++ b/Dockerfile.cpu
@@ -29,18 +29,18 @@ WORKDIR /workspace
 ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu"
 ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
 RUN --mount=type=cache,target=/root/.cache/pip \
-    --mount=type=bind,src=requirements-build.txt,target=requirements-build.txt \
+    --mount=type=bind,src=requirements/build.txt,target=requirements/build.txt \
     pip install --upgrade pip && \
-    pip install -r requirements-build.txt
+    pip install -r requirements/build.txt
 
 FROM cpu-test-1 AS build
 
 WORKDIR /workspace/vllm
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-    --mount=type=bind,src=requirements-common.txt,target=requirements-common.txt \
-    --mount=type=bind,src=requirements-cpu.txt,target=requirements-cpu.txt \
-    pip install -v -r requirements-cpu.txt
+    --mount=type=bind,src=requirements/common.txt,target=requirements/common.txt \
+    --mount=type=bind,src=requirements/cpu.txt,target=requirements/cpu.txt \
+    pip install -v -r requirements/cpu.txt
 
 COPY . .
 ARG GIT_REPO_CHECK=0
diff --git a/Dockerfile.hpu b/Dockerfile.hpu
index 66cf68c32f2c..48211c88f872 100644
--- a/Dockerfile.hpu
+++ b/Dockerfile.hpu
@@ -4,7 +4,7 @@ COPY ./ /workspace/vllm
 
 WORKDIR /workspace/vllm
 
-RUN pip install -v -r requirements-hpu.txt
+RUN pip install -v -r requirements/hpu.txt
 
 ENV no_proxy=localhost,127.0.0.1
 ENV PT_HPU_ENABLE_LAZY_COLLECTIVES=true
diff --git a/Dockerfile.neuron b/Dockerfile.neuron
index e9cb82889dec..ce00c4a56a6b 100644
--- a/Dockerfile.neuron
+++ b/Dockerfile.neuron
@@ -34,7 +34,7 @@ RUN --mount=type=bind,source=.git,target=.git \
 
 RUN python3 -m pip install -U \
         'cmake>=3.26' ninja packaging 'setuptools-scm>=8' wheel jinja2 \
-        -r requirements-neuron.txt
+        -r requirements/neuron.txt
 
 ENV VLLM_TARGET_DEVICE neuron
 RUN --mount=type=bind,source=.git,target=.git \
diff --git a/Dockerfile.openvino b/Dockerfile.openvino
index 32bcbfa9cc16..445c70ab89d4 100644
--- a/Dockerfile.openvino
+++ b/Dockerfile.openvino
@@ -16,7 +16,7 @@ RUN --mount=type=bind,source=.git,target=.git \
 
 RUN python3 -m pip install -U pip
 # install build requirements
-RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" python3 -m pip install -r /workspace/requirements-build.txt
+RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" python3 -m pip install -r /workspace/requirements/build.txt
 # build vLLM with OpenVINO backend
 RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" VLLM_TARGET_DEVICE="openvino" python3 -m pip install /workspace
 
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
index d3cd1c7b313b..0125ec81f046 100644
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -6,7 +6,7 @@ ENV PATH="/usr/local/cargo/bin:$PATH:/opt/conda/bin/"
 
 RUN apt-get update -y && apt-get install -y git wget curl vim libnuma-dev libsndfile-dev libprotobuf-dev build-essential ffmpeg libsm6 libxext6 libgl1 libssl-dev 
 
-# Some packages in requirements-cpu are installed here
+# Some packages in requirements/cpu are installed here
 # IBM provides optimized packages for ppc64le processors in the open-ce project for mamba
 # Currently these may not be available for venv or pip directly
 RUN micromamba install -y -n base -c https://ftp.osuosl.org/pub/open-ce/1.11.0-p10/ -c defaults python=3.10 torchvision-cpu=0.16.2 rust && micromamba clean --all --yes
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/root/.cache/pip  \
     RUSTFLAGS='-L /opt/conda/lib' pip install -v --prefer-binary --extra-index-url https://repo.fury.io/mgiessing \
         'cmake>=3.26' ninja packaging 'setuptools-scm>=8' wheel jinja2 \
         torch==2.3.1 \
-        -r requirements-cpu.txt \
+        -r requirements/cpu.txt \
         xformers uvloop==0.20.0
 
 RUN --mount=type=bind,source=.git,target=.git \
diff --git a/Dockerfile.rocm b/Dockerfile.rocm
index 14c522afd7f9..02ccb8eff4e4 100644
--- a/Dockerfile.rocm
+++ b/Dockerfile.rocm
@@ -38,7 +38,7 @@ FROM fetch_vllm AS build_vllm
 ARG USE_CYTHON
 # Build vLLM
 RUN cd vllm \
-    && python3 -m pip install -r requirements-rocm.txt \
+    && python3 -m pip install -r requirements/rocm.txt \
     && python3 setup.py clean --all  \
     && if [ ${USE_CYTHON} -eq "1" ]; then python3 setup_cython.py build_ext --inplace; fi \
     && python3 setup.py bdist_wheel --dist-dir=dist
@@ -60,7 +60,7 @@ RUN python3 -m pip install --upgrade pip && rm -rf /var/lib/apt/lists/*
 # Install vLLM
 RUN --mount=type=bind,from=export_vllm,src=/,target=/install \
     cd /install \
-    && pip install -U -r requirements-rocm.txt \
+    && pip install -U -r requirements/rocm.txt \
     && pip uninstall -y vllm \
     && pip install *.whl
 
@@ -99,7 +99,7 @@ RUN if [ ${BUILD_RPD} -eq "1" ]; then \
 # Install vLLM
 RUN --mount=type=bind,from=export_vllm,src=/,target=/install \
     cd /install \
-    && pip install -U -r requirements-rocm.txt \
+    && pip install -U -r requirements/rocm.txt \
     && pip uninstall -y vllm \
     && pip install *.whl
 
diff --git a/Dockerfile.tpu b/Dockerfile.tpu
index e268b3947666..960dc8e9ed9b 100644
--- a/Dockerfile.tpu
+++ b/Dockerfile.tpu
@@ -19,7 +19,7 @@ ENV VLLM_TARGET_DEVICE="tpu"
 RUN --mount=type=cache,target=/root/.cache/pip \
     --mount=type=bind,source=.git,target=.git \
     python3 -m pip install \
-        -r requirements-tpu.txt
+        -r requirements/tpu.txt
 RUN python3 setup.py develop
 
 # install development dependencies (for testing)
diff --git a/Dockerfile.xpu b/Dockerfile.xpu
index a374f20d7d94..530809bcd4df 100644
--- a/Dockerfile.xpu
+++ b/Dockerfile.xpu
@@ -25,12 +25,12 @@ RUN apt-get update -y && \
     wget
 
 WORKDIR /workspace/vllm
-COPY requirements-xpu.txt /workspace/vllm/requirements-xpu.txt
-COPY requirements-common.txt /workspace/vllm/requirements-common.txt
+COPY requirements/xpu.txt /workspace/vllm/requirements/xpu.txt
+COPY requirements/common.txt /workspace/vllm/requirements/common.txt
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install --no-cache-dir \
-    -r requirements-xpu.txt
+    -r requirements/xpu.txt
 
 RUN git clone https://github.com/intel/pti-gpu && \
     cd pti-gpu/sdk && \
diff --git a/MANIFEST.in b/MANIFEST.in
index 82be639ef4d7..82fd22b845f0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,9 @@
 include LICENSE
-include requirements-common.txt
-include requirements-cuda.txt
-include requirements-rocm.txt
-include requirements-neuron.txt
-include requirements-cpu.txt
+include requirements/common.txt
+include requirements/cuda.txt
+include requirements/rocm.txt
+include requirements/neuron.txt
+include requirements/cpu.txt
 include CMakeLists.txt
 
 recursive-include cmake *
diff --git a/docs/source/contributing/overview.md b/docs/source/contributing/overview.md
index 36cf8e7440ec..d6e72f69ecd4 100644
--- a/docs/source/contributing/overview.md
+++ b/docs/source/contributing/overview.md
@@ -23,7 +23,7 @@ Check out the [building from source](#build-from-source) documentation for detai
 ## Testing
 
 ```bash
-pip install -r requirements-dev.txt
+pip install -r requirements/dev.txt
 
 # Linting, formatting and static type checking
 pre-commit install
diff --git a/docs/source/getting_started/installation/ai_accelerator/hpu-gaudi.inc.md b/docs/source/getting_started/installation/ai_accelerator/hpu-gaudi.inc.md
index ae42dd0c0d08..dcb586e14ae0 100644
--- a/docs/source/getting_started/installation/ai_accelerator/hpu-gaudi.inc.md
+++ b/docs/source/getting_started/installation/ai_accelerator/hpu-gaudi.inc.md
@@ -59,7 +59,7 @@ To build and install vLLM from source, run:
 ```console
 git clone https://github.com/vllm-project/vllm.git
 cd vllm
-pip install -r requirements-hpu.txt
+pip install -r requirements/hpu.txt
 python setup.py develop
 ```
 
@@ -69,7 +69,7 @@ Currently, the latest features and performance optimizations are developed in Ga
 git clone https://github.com/HabanaAI/vllm-fork.git
 cd vllm-fork
 git checkout habana_main
-pip install -r requirements-hpu.txt
+pip install -r requirements/hpu.txt
 python setup.py develop
 ```
 
diff --git a/docs/source/getting_started/installation/ai_accelerator/neuron.inc.md b/docs/source/getting_started/installation/ai_accelerator/neuron.inc.md
index 575a9f9c2e2f..c564ab9e35c6 100644
--- a/docs/source/getting_started/installation/ai_accelerator/neuron.inc.md
+++ b/docs/source/getting_started/installation/ai_accelerator/neuron.inc.md
@@ -112,7 +112,7 @@ Once neuronx-cc and transformers-neuronx packages are installed, we will be able
 ```console
 git clone https://github.com/vllm-project/vllm.git
 cd vllm
-pip install -U -r requirements-neuron.txt
+pip install -U -r requirements/neuron.txt
 VLLM_TARGET_DEVICE="neuron" pip install .
 ```
 
diff --git a/docs/source/getting_started/installation/ai_accelerator/openvino.inc.md b/docs/source/getting_started/installation/ai_accelerator/openvino.inc.md
index a7867472583d..f62002024496 100644
--- a/docs/source/getting_started/installation/ai_accelerator/openvino.inc.md
+++ b/docs/source/getting_started/installation/ai_accelerator/openvino.inc.md
@@ -26,7 +26,7 @@ Second, install prerequisites vLLM OpenVINO backend installation:
 
 ```console
 pip install --upgrade pip
-pip install -r requirements-build.txt --extra-index-url https://download.pytorch.org/whl/cpu
+pip install -r requirements/build.txt --extra-index-url https://download.pytorch.org/whl/cpu
 ```
 
 Finally, install vLLM with OpenVINO backend:
diff --git a/docs/source/getting_started/installation/ai_accelerator/tpu.inc.md b/docs/source/getting_started/installation/ai_accelerator/tpu.inc.md
index 6a911cc6b9eb..5f026ca4bbe5 100644
--- a/docs/source/getting_started/installation/ai_accelerator/tpu.inc.md
+++ b/docs/source/getting_started/installation/ai_accelerator/tpu.inc.md
@@ -147,7 +147,7 @@ pip uninstall torch torch-xla -y
 Install build dependencies:
 
 ```bash
-pip install -r requirements-tpu.txt
+pip install -r requirements/tpu.txt
 sudo apt-get install libopenblas-base libopenmpi-dev libomp-dev
 ```
 
diff --git a/docs/source/getting_started/installation/cpu/apple.inc.md b/docs/source/getting_started/installation/cpu/apple.inc.md
index 56545253b1ef..fb52b48e3fb5 100644
--- a/docs/source/getting_started/installation/cpu/apple.inc.md
+++ b/docs/source/getting_started/installation/cpu/apple.inc.md
@@ -21,7 +21,7 @@ After installation of XCode and the Command Line Tools, which include Apple Clan
 ```console
 git clone https://github.com/vllm-project/vllm.git
 cd vllm
-pip install -r requirements-cpu.txt
+pip install -r requirements/cpu.txt
 pip install -e . 
 ```
 
diff --git a/docs/source/getting_started/installation/cpu/build.inc.md b/docs/source/getting_started/installation/cpu/build.inc.md
index f8d1044a0d19..ab83f2261f9a 100644
--- a/docs/source/getting_started/installation/cpu/build.inc.md
+++ b/docs/source/getting_started/installation/cpu/build.inc.md
@@ -11,7 +11,7 @@ Second, install Python packages for vLLM CPU backend building:
 ```console
 pip install --upgrade pip
 pip install cmake>=3.26 wheel packaging ninja "setuptools-scm>=8" numpy
-pip install -v -r requirements-cpu.txt --extra-index-url https://download.pytorch.org/whl/cpu
+pip install -v -r requirements/cpu.txt --extra-index-url https://download.pytorch.org/whl/cpu
 ```
 
 Finally, build and install vLLM CPU backend:
diff --git a/docs/source/getting_started/installation/gpu/cuda.inc.md b/docs/source/getting_started/installation/gpu/cuda.inc.md
index 4cce65278c06..a9724f185f48 100644
--- a/docs/source/getting_started/installation/gpu/cuda.inc.md
+++ b/docs/source/getting_started/installation/gpu/cuda.inc.md
@@ -138,7 +138,7 @@ To build vLLM using an existing PyTorch installation:
 git clone https://github.com/vllm-project/vllm.git
 cd vllm
 python use_existing_torch.py
-pip install -r requirements-build.txt
+pip install -r requirements/build.txt
 pip install -e . --no-build-isolation
 ```
 
diff --git a/docs/source/getting_started/installation/gpu/rocm.inc.md b/docs/source/getting_started/installation/gpu/rocm.inc.md
index 69238f6e36fb..ac911d9e2efc 100644
--- a/docs/source/getting_started/installation/gpu/rocm.inc.md
+++ b/docs/source/getting_started/installation/gpu/rocm.inc.md
@@ -86,7 +86,7 @@ for instructions on how to use this prebuilt docker image.
     # Install dependencies
     $ pip install --upgrade numba scipy huggingface-hub[cli]
     $ pip install "numpy<2"
-    $ pip install -r requirements-rocm.txt
+    $ pip install -r requirements/rocm.txt
 
     # Build vLLM for MI210/MI250/MI300.
     $ export PYTORCH_ROCM_ARCH="gfx90a;gfx942"
diff --git a/docs/source/getting_started/installation/gpu/xpu.inc.md b/docs/source/getting_started/installation/gpu/xpu.inc.md
index 577986eba74f..660d176351ee 100644
--- a/docs/source/getting_started/installation/gpu/xpu.inc.md
+++ b/docs/source/getting_started/installation/gpu/xpu.inc.md
@@ -21,7 +21,7 @@ Currently, there are no pre-built XPU wheels.
 ```console
 source /opt/intel/oneapi/setvars.sh
 pip install --upgrade pip
-pip install -v -r requirements-xpu.txt
+pip install -v -r requirements/xpu.txt
 ```
 
 - Finally, build and install vLLM XPU backend:
diff --git a/format.sh b/format.sh
index 4bcd0be0c96e..15e2cfff7744 100755
--- a/format.sh
+++ b/format.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 echo "vLLM linting system has been moved from format.sh to pre-commit hook."
-echo "Please run 'pip install -r requirements-lint.txt' and 'pre-commit install' to install the pre-commit hook."
+echo "Please run 'pip install -r requirements/lint.txt' and 'pre-commit install' to install the pre-commit hook."
 echo "Then linters will run automatically before each commit."
diff --git a/pyproject.toml b/pyproject.toml
index 8f2e20d0f580..8f8d2c9f07f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-# Should be mirrored in requirements-build.txt
+# Should be mirrored in requirements/build.txt
 requires = [
     "cmake>=3.26",
     "ninja",
diff --git a/setup.py b/setup.py
index 59ece870b558..9698bc60b743 100755
--- a/setup.py
+++ b/setup.py
@@ -554,9 +554,9 @@ def _read_requirements(filename: str) -> List[str]:
         return resolved_requirements
 
     if _no_device():
-        requirements = _read_requirements("requirements-cpu.txt")
+        requirements = _read_requirements("requirements/cpu.txt")
     elif _is_cuda():
-        requirements = _read_requirements("requirements-cuda.txt")
+        requirements = _read_requirements("requirements/cuda.txt")
         cuda_major, cuda_minor = torch.version.cuda.split(".")
         modified_requirements = []
         for req in requirements:
@@ -568,19 +568,19 @@ def _read_requirements(filename: str) -> List[str]:
             modified_requirements.append(req)
         requirements = modified_requirements
     elif _is_hip():
-        requirements = _read_requirements("requirements-rocm.txt")
+        requirements = _read_requirements("requirements/rocm.txt")
     elif _is_neuron():
-        requirements = _read_requirements("requirements-neuron.txt")
+        requirements = _read_requirements("requirements/neuron.txt")
     elif _is_hpu():
-        requirements = _read_requirements("requirements-hpu.txt")
+        requirements = _read_requirements("requirements/hpu.txt")
     elif _is_openvino():
-        requirements = _read_requirements("requirements-openvino.txt")
+        requirements = _read_requirements("requirements/openvino.txt")
     elif _is_tpu():
-        requirements = _read_requirements("requirements-tpu.txt")
+        requirements = _read_requirements("requirements/tpu.txt")
     elif _is_cpu():
-        requirements = _read_requirements("requirements-cpu.txt")
+        requirements = _read_requirements("requirements/cpu.txt")
     elif _is_xpu():
-        requirements = _read_requirements("requirements-xpu.txt")
+        requirements = _read_requirements("requirements/xpu.txt")
     else:
         raise ValueError(
             "Unsupported platform, please use CUDA, ROCm, Neuron, HPU, "

From 4c9751ca0893ace23c422d6aaf77c8ac6d92f5b3 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Wed, 19 Feb 2025 19:29:12 +0100
Subject: [PATCH 03/10] Fix setup.py

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 setup.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 1b3cde507630..9c7dd65441af 100755
--- a/setup.py
+++ b/setup.py
@@ -478,10 +478,6 @@ def get_nvcc_cuda_version() -> Version:
     return nvcc_cuda_version
 
 
-def get_path(*filepath) -> str:
-    return os.path.join(ROOT_DIR, *filepath)
-
-
 def get_gaudi_sw_version():
     """
     Returns the driver version.
@@ -550,8 +546,8 @@ def get_vllm_version() -> str:
 def get_requirements() -> List[str]:
     """Get Python package dependencies from requirements.txt."""
 
-    def _read_requirements(filename: str) -> List[str]:
-        with open(get_path(filename)) as f:
+    def _read_requirements(path: str) -> List[str]:
+        with open(os.path.join(ROOT_DIR, path)) as f:
             requirements = f.read().strip().split("\n")
         resolved_requirements = []
         for line in requirements:

From 0a44bb759947bc118cff5bfcea90fcdf41e7e67e Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Wed, 19 Feb 2025 20:18:56 +0100
Subject: [PATCH 04/10] Fix setup.py

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9c7dd65441af..1de36f430bca 100755
--- a/setup.py
+++ b/setup.py
@@ -552,7 +552,9 @@ def _read_requirements(path: str) -> List[str]:
         resolved_requirements = []
         for line in requirements:
             if line.startswith("-r "):
-                resolved_requirements += _read_requirements(line.split()[1])
+                resolved_requirements += _read_requirements(
+                    os.path.join("requirements",
+                                 line.split()[1]))
             elif line.startswith("--"):
                 continue
             else:

From 3611a33049abf1783e63b471e8b02a2a489b75d5 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:59:28 +0100
Subject: [PATCH 05/10] Update

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 .pre-commit-config.yaml                          |  4 ++--
 Dockerfile.s390x                                 |  8 ++++----
 .../rocm-build.txt                               |  2 +-
 requirements/test.txt                            | 16 ++++++++--------
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename requirements-rocm-build.txt => requirements/rocm-build.txt (89%)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 23a38d49638f..074ac9d122bf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -44,8 +44,8 @@ repos:
   rev: 0.6.2
   hooks:
     - id: pip-compile
-      args: [requirements-test.in, -o, requirements-test.txt]
-      files: ^requirements-test\.(in|txt)$
+      args: [requirements/test.in, -o, requirements/test.txt]
+      files: ^requirements/test\.(in|txt)$
 - repo: local
   hooks:
   - id: mypy-local
diff --git a/Dockerfile.s390x b/Dockerfile.s390x
index b499d4cb21dd..5a84dc12d8f7 100644
--- a/Dockerfile.s390x
+++ b/Dockerfile.s390x
@@ -58,7 +58,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     cd ../../python && \
     export PYARROW_PARALLEL=4 && \
     export ARROW_BUILD_TYPE=release && \
-    uv pip install -r requirements-build.txt && \
+    uv pip install -r requirements/build.txt && \
     python setup.py build_ext --build-type=$ARROW_BUILD_TYPE --bundle-arrow-cpp bdist_wheel
 
 FROM python-install AS numa-build
@@ -120,7 +120,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,from=rust,source=/root/.rustup,target=/root/.rustup,rw \
     --mount=type=bind,from=pyarrow,source=/tmp/arrow/python/dist,target=/tmp/arrow-wheels \
     --mount=type=bind,from=torch-vision,source=/tmp/vision/dist,target=/tmp/vision-wheels/ \
-     sed -i '/^torch/d' requirements-build.txt && \
+     sed -i '/^torch/d' requirements/build.txt && \
      ARROW_WHL_FILE=$(ls /tmp/arrow-wheels/pyarrow-*.whl | head -n 1) && \
      VISION_WHL_FILE=$(ls /tmp/vision-wheels/*.whl | head -n 1) && \
     uv pip install -v \    
@@ -128,8 +128,8 @@ RUN --mount=type=cache,target=/root/.cache/uv \
         $VISION_WHL_FILE \
         --extra-index-url https://download.pytorch.org/whl/nightly/cpu \
         --index-strategy unsafe-best-match \
-        -r requirements-build.txt \
-        -r requirements-cpu.txt 
+        -r requirements/build.txt \
+        -r requirements/cpu.txt 
 
 # Build and install vllm
 RUN --mount=type=cache,target=/root/.cache/uv \
diff --git a/requirements-rocm-build.txt b/requirements/rocm-build.txt
similarity index 89%
rename from requirements-rocm-build.txt
rename to requirements/rocm-build.txt
index 00ae0340fc52..4d4945b007eb 100644
--- a/requirements-rocm-build.txt
+++ b/requirements/rocm-build.txt
@@ -1,5 +1,5 @@
 # Common dependencies
--r requirements-common.txt
+-r common.txt
 
 --extra-index-url https://download.pytorch.org/whl/rocm6.2
 torch==2.5.1
diff --git a/requirements/test.txt b/requirements/test.txt
index 6a3b8bdf877f..f112320725c6 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile requirements-test.in -o requirements-test.txt
+#    uv pip compile requirements/test.in -o requirements/test.txt
 absl-py==2.1.0
     # via rouge-score
 accelerate==1.0.1
@@ -187,7 +187,7 @@ jinja2==3.1.4
     #   datamodel-code-generator
     #   torch
 jiwer==3.0.5
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 jmespath==1.0.1
     # via
     #   boto3
@@ -218,7 +218,7 @@ librosa==0.10.2.post1
 llvmlite==0.43.0
     # via numba
 lm-eval==0.4.4
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 lxml==5.3.0
     # via sacrebleu
 markdown-it-py==3.0.0
@@ -235,7 +235,7 @@ mbstrdecoder==1.1.3
 mdurl==0.1.2
     # via markdown-it-py
 mistral-common==1.5.1
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 more-itertools==10.5.0
     # via lm-eval
 mpmath==1.3.0
@@ -473,7 +473,7 @@ pyyaml==6.0.2
 rapidfuzz==3.12.1
     # via jiwer
 ray==2.43.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 redis==5.2.0
     # via tensorizer
 referencing==0.35.1
@@ -512,9 +512,9 @@ rpds-py==0.20.1
 rsa==4.7.2
     # via awscli
 runai-model-streamer==0.11.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 runai-model-streamer-s3==0.11.0
-    # via -r requirements-test.in
+    # via -r requirements/test.in
 s3transfer==0.10.3
     # via
     #   awscli
@@ -630,7 +630,7 @@ tqdm-multiprocess==0.0.11
     # via lm-eval
 transformers==4.48.2
     # via
-    #   -r requirements-test.in
+    #   -r requirements/test.in
     #   genai-perf
     #   lm-eval
     #   peft

From 2012bdfe588b1a915fe17b5af3777a5d68403250 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Fri, 7 Mar 2025 11:09:20 +0100
Subject: [PATCH 06/10] Clean up `setup.py`

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 setup.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index f9b1ec5aefe0..d18fe53f12de 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def load_module_from_path(module_name, path):
     return module
 
 
-ROOT_DIR = os.path.dirname(__file__)
+ROOT_DIR = Path(__file__).parent
 logger = logging.getLogger(__name__)
 
 # cannot import envs directly because it depends on vllm,
@@ -587,16 +587,15 @@ def get_vllm_version() -> str:
 
 def get_requirements() -> list[str]:
     """Get Python package dependencies from requirements.txt."""
+    requirements_dir = ROOT_DIR / "requirements"
 
     def _read_requirements(filename: str) -> list[str]:
-        with open(os.path.join(ROOT_DIR, filename)) as f:
+        with open(requirements_dir / filename) as f:
             requirements = f.read().strip().split("\n")
         resolved_requirements = []
         for line in requirements:
             if line.startswith("-r "):
-                resolved_requirements += _read_requirements(
-                    os.path.join("requirements",
-                                 line.split()[1]))
+                resolved_requirements += _read_requirements(line.split()[1])
             elif line.startswith("--"):
                 continue
             else:
@@ -604,9 +603,9 @@ def _read_requirements(filename: str) -> list[str]:
         return resolved_requirements
 
     if _no_device():
-        requirements = _read_requirements("requirements/common.txt")
+        requirements = _read_requirements("common.txt")
     elif _is_cuda():
-        requirements = _read_requirements("requirements/cuda.txt")
+        requirements = _read_requirements("cuda.txt")
         cuda_major, cuda_minor = torch.version.cuda.split(".")
         modified_requirements = []
         for req in requirements:
@@ -617,19 +616,19 @@ def _read_requirements(filename: str) -> list[str]:
             modified_requirements.append(req)
         requirements = modified_requirements
     elif _is_hip():
-        requirements = _read_requirements("requirements/rocm.txt")
+        requirements = _read_requirements("rocm.txt")
     elif _is_neuron():
-        requirements = _read_requirements("requirements/neuron.txt")
+        requirements = _read_requirements("neuron.txt")
     elif _is_hpu():
-        requirements = _read_requirements("requirements/hpu.txt")
+        requirements = _read_requirements("hpu.txt")
     elif _is_openvino():
-        requirements = _read_requirements("requirements/openvino.txt")
+        requirements = _read_requirements("openvino.txt")
     elif _is_tpu():
-        requirements = _read_requirements("requirements/tpu.txt")
+        requirements = _read_requirements("tpu.txt")
     elif _is_cpu():
-        requirements = _read_requirements("requirements/cpu.txt")
+        requirements = _read_requirements("cpu.txt")
     elif _is_xpu():
-        requirements = _read_requirements("requirements/xpu.txt")
+        requirements = _read_requirements("xpu.txt")
     else:
         raise ValueError(
             "Unsupported platform, please use CUDA, ROCm, Neuron, HPU, "

From 7eeab9dd07b92cb23ec53c795ca1433f8036b6a0 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Fri, 7 Mar 2025 12:02:55 +0100
Subject: [PATCH 07/10] Move `requirements-docs.txt` too

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 .buildkite/test-pipeline.yaml                       | 2 +-
 .readthedocs.yaml                                   | 2 +-
 docs/README.md                                      | 2 +-
 docs/requirements-docs.txt => requirements/docs.txt | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename docs/requirements-docs.txt => requirements/docs.txt (100%)

diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml
index 7b74bc9c3520..91da2465e138 100644
--- a/.buildkite/test-pipeline.yaml
+++ b/.buildkite/test-pipeline.yaml
@@ -35,7 +35,7 @@ steps:
   fast_check: true
   no_gpu: True
   commands:
-  - pip install -r requirements-docs.txt
+  - pip install -r requirements/docs.txt
   - SPHINXOPTS=\"-W\" make html
   # Check API reference (if it fails, you may have missing mock imports)
   - grep \"sig sig-object py\" build/html/api/inference_params.html
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 284196bc2d27..2781ec223b66 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -18,4 +18,4 @@ formats: []
 # Optionally declare the Python requirements required to build your docs
 python:
   install:
-    - requirements: docs/requirements-docs.txt
+    - requirements: requirements/docs.txt
diff --git a/docs/README.md b/docs/README.md
index 1a44c1341f4f..74e05ce02636 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,7 +4,7 @@
 
 ```bash
 # Install dependencies.
-pip install -r requirements-docs.txt
+pip install -r ../requirements/docs.txt
 
 # Build the docs.
 make clean
diff --git a/docs/requirements-docs.txt b/requirements/docs.txt
similarity index 100%
rename from docs/requirements-docs.txt
rename to requirements/docs.txt

From 9a9885f51ae4ca98d743327e1884ff2e58579103 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Fri, 7 Mar 2025 12:12:21 +0100
Subject: [PATCH 08/10] Update path

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 .buildkite/test-pipeline.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml
index 91da2465e138..f12f5ed87373 100644
--- a/.buildkite/test-pipeline.yaml
+++ b/.buildkite/test-pipeline.yaml
@@ -35,7 +35,7 @@ steps:
   fast_check: true
   no_gpu: True
   commands:
-  - pip install -r requirements/docs.txt
+  - pip install -r ../requirements/docs.txt
   - SPHINXOPTS=\"-W\" make html
   # Check API reference (if it fails, you may have missing mock imports)
   - grep \"sig sig-object py\" build/html/api/inference_params.html

From ca83d991ac80f0038b36eb4be448b738a269ce5d Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Fri, 7 Mar 2025 20:36:52 +0100
Subject: [PATCH 09/10] Update path 2

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 .buildkite/test-pipeline.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml
index f12f5ed87373..ed9287385926 100644
--- a/.buildkite/test-pipeline.yaml
+++ b/.buildkite/test-pipeline.yaml
@@ -35,7 +35,7 @@ steps:
   fast_check: true
   no_gpu: True
   commands:
-  - pip install -r ../requirements/docs.txt
+  - pip install -r ../../requirements/docs.txt
   - SPHINXOPTS=\"-W\" make html
   # Check API reference (if it fails, you may have missing mock imports)
   - grep \"sig sig-object py\" build/html/api/inference_params.html

From c26463f71ca0f22ba572ee0615b8f0cd58d45179 Mon Sep 17 00:00:00 2001
From: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Date: Sat, 8 Mar 2025 08:38:53 +0100
Subject: [PATCH 10/10] Fix `use_existing_torch.py`

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
---
 use_existing_torch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/use_existing_torch.py b/use_existing_torch.py
index a578328b0357..7d352c6ca6fa 100644
--- a/use_existing_torch.py
+++ b/use_existing_torch.py
@@ -2,7 +2,7 @@
 
 import glob
 
-requires_files = glob.glob('requirements*.txt')
+requires_files = glob.glob('requirements/*.txt')
 requires_files += ["pyproject.toml"]
 for file in requires_files:
     print(f">>> cleaning {file}")