Skip to content

Commit f495096

Browse files
author
BrianPark314
committed
Merge branch 'main' into feature/router-hpa
# Conflicts: # helm/values.yaml
2 parents 04d2c33 + 13f5281 commit f495096

File tree

105 files changed

+5166
-2268
lines changed

Some content is hidden

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

105 files changed

+5166
-2268
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FIX #xxxx (*link existing issues this PR will resolve*)
66

77
---
88

9-
- [ ] Make sure the code changes pass the [pre-commit](../CONTRIBUTING.md) checks.
9+
- [ ] Make sure the code changes pass the [pre-commit](https://github.com/vllm-project/production-stack/blob/main/CONTRIBUTING.md) checks.
1010
- [ ] Sign-off your commit by using <code>-s</code> when doing <code>git commit</code>
1111
- [ ] Try to classify PRs for easy understanding of the type of changes, such as `[Bugfix]`, `[Feat]`, and `[CI]`.
1212

.github/workflows/functionality-helm-chart.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Validate the installation and send query to the stack
6767
run: |
6868
bash .github/port-forward.sh curl-05-secure-vllm
69-
timeout-minutes: 2
69+
timeout-minutes: 3
7070
- name: Archive functionality results
7171
uses: actions/upload-artifact@v4
7272
if: always()
@@ -112,7 +112,7 @@ jobs:
112112
- name: Validate the installation and send query to the stack
113113
run: |
114114
bash .github/port-forward.sh curl-02-two-pods
115-
timeout-minutes: 2
115+
timeout-minutes: 3
116116
- name: Archive functionality results
117117
uses: actions/upload-artifact@v4
118118
if: always()
@@ -156,7 +156,7 @@ jobs:
156156
- name: Validate the installation and send query to the stack
157157
run: |
158158
bash .github/port-forward.sh curl-04-multiple-models
159-
timeout-minutes: 3
159+
timeout-minutes: 5
160160
- name: Archive functionality results
161161
uses: actions/upload-artifact@v4
162162
if: always()

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- run: echo "::add-matcher::.github/workflows/matchers/actionlint.json"
1717
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
1818
- run: pip install ruff
19-
- run: ruff check src/tests
19+
- run: ruff check src
2020

2121
pre-commit-manual:
2222
strategy:

.github/workflows/router-e2e-test.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,10 @@ jobs:
109109
- name: Check out repository code
110110
uses: actions/checkout@v4
111111

112-
- name: Setup Python
113-
uses: actions/setup-python@v5
114-
with:
115-
python-version: "3.12"
116-
117112
- name: Install Python dependencies
118113
run: |
114+
source /usr/local/bin/conda-init
115+
conda activate llmstack
119116
python -m pip install --upgrade pip
120117
pip install -r benchmarks/multi-round-qa/requirements.txt
121118
pip install -e .
@@ -142,6 +139,8 @@ jobs:
142139
143140
- name: Run all k8s discovery routing tests
144141
run: |
142+
source /usr/local/bin/conda-init
143+
conda activate llmstack
145144
echo "🧪 Running all k8s discovery routing tests"
146145
./tests/e2e/run-k8s-routing-test.sh all \
147146
--model "facebook/opt-125m" \
@@ -173,23 +172,24 @@ jobs:
173172
- name: Check out repository code
174173
uses: actions/checkout@v4
175174

176-
- name: Setup Python
177-
uses: actions/setup-python@v5
178-
with:
179-
python-version: "3.12"
180-
181175
- name: Install Python dependencies
182176
run: |
177+
source /usr/local/bin/conda-init
178+
conda activate llmstack
183179
python -m pip install --upgrade pip
184180
pip install -e .
185181
186182
- name: Install vLLM and lmcache
187183
run: |
184+
source /usr/local/bin/conda-init
185+
conda activate llmstack
188186
pip install vllm
189187
pip install lmcache
190188
191189
- name: Start 2 vLLM serve backends
192190
run: |
191+
source /usr/local/bin/conda-init
192+
conda activate llmstack
193193
echo "🚀 Starting vLLM serve backend"
194194
mkdir -p "$LOG_DIR"
195195
CUDA_VISIBLE_DEVICES=0 vllm serve facebook/opt-125m --port 8001 --gpu-memory-utilization 0.7 --chat-template .github/template-chatml.jinja > "$LOG_DIR/backend1.log" 2>&1 &
@@ -202,9 +202,9 @@ jobs:
202202
./tests/e2e/wait-for-backends.sh 180 "http://localhost:8001" "http://localhost:8002"
203203
204204
- name: Run All Static Discovery Routing Tests
205-
env:
206-
PYTHONPATH: ${{ github.workspace }}/src
207205
run: |
206+
source /usr/local/bin/conda-init
207+
conda activate llmstack
208208
echo "🧪 Running all static discovery routing tests sequentially"
209209
chmod +x tests/e2e/run-static-discovery-routing-test.sh
210210
./tests/e2e/run-static-discovery-routing-test.sh all \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
## Community Events
1313

14-
We host **weekly** community meetings at **alternating** times to accommodate different time zones.
14+
We host **weekly** community meetings at the following timeslot:
1515

16-
- Tuesdays at 6:00 PM PT – [Add to Calendar](https://drive.usercontent.google.com/u/0/uc?id=1iKpFrt-grVZSIbIXpnVlZyEvADcxLMj_&export=download)
16+
- Tuesdays at 5:30 PM PT – [Add to Calendar](https://drive.usercontent.google.com/u/0/uc?id=1E4rcnwZHV84IEFXAGtJ-TP3o1rslNDei&export=download)
1717

18-
Meetings alternate weekly between the two times. All are welcome to join!
18+
All are welcome to join!
1919

2020
## Introduction
2121

docs/source/benchmarks/multiround-qa.rst

Lines changed: 0 additions & 133 deletions
This file was deleted.

docs/source/community/meetings.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Community Meetings
2+
==================
3+
4+
Community Events
5+
----------------
6+
7+
We host bi-weekly community meetings at the following timeslot:
8+
9+
**Every other Tuesday at 5:30 PM PT starting July 29th** – `Add to Calendar <https://github.com/vllm-project/production-stack/blob/main/community/prod_stack_community_meeting.ics>`_
10+
11+
All are welcome to join!

0 commit comments

Comments
 (0)