Skip to content

Commit 37724cd

Browse files
hmellorepwalsh
authored andcommitted
Deprecate --disable-log-requests and replace with --enable-log-requests (vllm-project#21739)
Signed-off-by: Harry Mellor <[email protected]>
1 parent fd841f1 commit 37724cd

File tree

18 files changed

+97
-79
lines changed

18 files changed

+97
-79
lines changed

.buildkite/nightly-benchmarks/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ We test the throughput by using `vllm bench serve` with request rate = inf to co
104104
"tensor_parallel_size": 1,
105105
"swap_space": 16,
106106
"disable_log_stats": "",
107-
"disable_log_requests": "",
108107
"load_format": "dummy"
109108
},
110109
"client_parameters": {

.buildkite/nightly-benchmarks/tests/genai-perf-tests.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
},
1212
"vllm_server_parameters": {
1313
"disable_log_stats": "",
14-
"disable_log_requests": "",
1514
"gpu_memory_utilization": 0.9,
1615
"num_scheduler_steps": 10,
1716
"max_num_seqs": 512,

.buildkite/nightly-benchmarks/tests/nightly-tests.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
},
3636
"vllm_server_parameters": {
3737
"disable_log_stats": "",
38-
"disable_log_requests": "",
3938
"gpu_memory_utilization": 0.9,
4039
"num_scheduler_steps": 10,
4140
"max_num_seqs": 512,
@@ -90,7 +89,6 @@
9089
},
9190
"vllm_server_parameters": {
9291
"disable_log_stats": "",
93-
"disable_log_requests": "",
9492
"gpu_memory_utilization": 0.9,
9593
"num_scheduler_steps": 10,
9694
"max_num_seqs": 512,
@@ -145,7 +143,6 @@
145143
},
146144
"vllm_server_parameters": {
147145
"disable_log_stats": "",
148-
"disable_log_requests": "",
149146
"gpu_memory_utilization": 0.9,
150147
"num_scheduler_steps": 10,
151148
"max_num_seqs": 512,
@@ -197,7 +194,6 @@
197194
},
198195
"vllm_server_parameters": {
199196
"disable_log_stats": "",
200-
"disable_log_requests": "",
201197
"gpu_memory_utilization": 0.9,
202198
"num_scheduler_steps": 10,
203199
"max_num_seqs": 512,
@@ -251,7 +247,6 @@
251247
},
252248
"vllm_server_parameters": {
253249
"disable_log_stats": "",
254-
"disable_log_requests": "",
255250
"gpu_memory_utilization": 0.9,
256251
"num_scheduler_steps": 10,
257252
"max_num_seqs": 512,
@@ -305,7 +300,6 @@
305300
},
306301
"vllm_server_parameters": {
307302
"disable_log_stats": "",
308-
"disable_log_requests": "",
309303
"gpu_memory_utilization": 0.9,
310304
"num_scheduler_steps": 10,
311305
"max_num_seqs": 512,

.buildkite/nightly-benchmarks/tests/serving-tests-cpu-snc2.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"block_size": 128,
1818
"trust_remote_code": "",
1919
"disable_log_stats": "",
20-
"disable_log_requests": "",
2120
"enforce_eager": "",
2221
"max_num_batched_tokens": 2048,
2322
"max_num_seqs": 256,
@@ -50,7 +49,6 @@
5049
"block_size": 128,
5150
"trust_remote_code": "",
5251
"disable_log_stats": "",
53-
"disable_log_requests": "",
5452
"enforce_eager": "",
5553
"max_num_batched_tokens": 2048,
5654
"max_num_seqs": 256,
@@ -83,7 +81,6 @@
8381
"block_size": 128,
8482
"trust_remote_code": "",
8583
"disable_log_stats": "",
86-
"disable_log_requests": "",
8784
"enforce_eager": "",
8885
"max_num_batched_tokens": 2048,
8986
"max_num_seqs": 256,
@@ -117,7 +114,6 @@
117114
"trust_remote_code": "",
118115
"enable_chunked_prefill": "",
119116
"disable_log_stats": "",
120-
"disable_log_requests": "",
121117
"enforce_eager": "",
122118
"max_num_batched_tokens": 2048,
123119
"max_num_seqs": 256,
@@ -153,7 +149,6 @@
153149
"trust_remote_code": "",
154150
"enable_chunked_prefill": "",
155151
"disable_log_stats": "",
156-
"disable_log_requests": "",
157152
"enforce_eager": "",
158153
"max_num_batched_tokens": 2048,
159154
"max_num_seqs": 256,
@@ -189,7 +184,6 @@
189184
"trust_remote_code": "",
190185
"enable_chunked_prefill": "",
191186
"disable_log_stats": "",
192-
"disable_log_requests": "",
193187
"enforce_eager": "",
194188
"max_num_batched_tokens": 2048,
195189
"max_num_seqs": 256,

.buildkite/nightly-benchmarks/tests/serving-tests-cpu-snc3.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"block_size": 128,
1818
"trust_remote_code": "",
1919
"disable_log_stats": "",
20-
"disable_log_requests": "",
2120
"enforce_eager": "",
2221
"max_num_batched_tokens": 2048,
2322
"max_num_seqs": 256,
@@ -50,7 +49,6 @@
5049
"block_size": 128,
5150
"trust_remote_code": "",
5251
"disable_log_stats": "",
53-
"disable_log_requests": "",
5452
"enforce_eager": "",
5553
"max_num_batched_tokens": 2048,
5654
"max_num_seqs": 256,
@@ -84,7 +82,6 @@
8482
"block_size": 128,
8583
"trust_remote_code": "",
8684
"disable_log_stats": "",
87-
"disable_log_requests": "",
8885
"enforce_eager": "",
8986
"max_num_batched_tokens": 2048,
9087
"max_num_seqs": 256,
@@ -118,7 +115,6 @@
118115
"trust_remote_code": "",
119116
"enable_chunked_prefill": "",
120117
"disable_log_stats": "",
121-
"disable_log_requests": "",
122118
"enforce_eager": "",
123119
"max_num_batched_tokens": 2048,
124120
"max_num_seqs": 256,
@@ -154,7 +150,6 @@
154150
"trust_remote_code": "",
155151
"enable_chunked_prefill": "",
156152
"disable_log_stats": "",
157-
"disable_log_requests": "",
158153
"enforce_eager": "",
159154
"max_num_batched_tokens": 2048,
160155
"max_num_seqs": 256,
@@ -191,7 +186,6 @@
191186
"trust_remote_code": "",
192187
"enable_chunked_prefill": "",
193188
"disable_log_stats": "",
194-
"disable_log_requests": "",
195189
"enforce_eager": "",
196190
"max_num_batched_tokens": 2048,
197191
"max_num_seqs": 256,

.buildkite/nightly-benchmarks/tests/serving-tests-cpu.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"block_size": 128,
1818
"trust_remote_code": "",
1919
"disable_log_stats": "",
20-
"disable_log_requests": "",
2120
"enforce_eager": "",
2221
"max_num_batched_tokens": 2048,
2322
"max_num_seqs": 256,
@@ -50,7 +49,6 @@
5049
"block_size": 128,
5150
"trust_remote_code": "",
5251
"disable_log_stats": "",
53-
"disable_log_requests": "",
5452
"enforce_eager": "",
5553
"max_num_batched_tokens": 2048,
5654
"max_num_seqs": 256,
@@ -83,7 +81,6 @@
8381
"block_size": 128,
8482
"trust_remote_code": "",
8583
"disable_log_stats": "",
86-
"disable_log_requests": "",
8784
"enforce_eager": "",
8885
"max_num_batched_tokens": 2048,
8986
"max_num_seqs": 256,
@@ -117,7 +114,6 @@
117114
"trust_remote_code": "",
118115
"enable_chunked_prefill": "",
119116
"disable_log_stats": "",
120-
"disable_log_requests": "",
121117
"enforce_eager": "",
122118
"max_num_batched_tokens": 2048,
123119
"max_num_seqs": 256,
@@ -153,7 +149,6 @@
153149
"trust_remote_code": "",
154150
"enable_chunked_prefill": "",
155151
"disable_log_stats": "",
156-
"disable_log_requests": "",
157152
"enforce_eager": "",
158153
"max_num_batched_tokens": 2048,
159154
"max_num_seqs": 256,

.buildkite/nightly-benchmarks/tests/serving-tests.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"tensor_parallel_size": 1,
88
"swap_space": 16,
99
"disable_log_stats": "",
10-
"disable_log_requests": "",
1110
"load_format": "dummy"
1211
},
1312
"client_parameters": {
@@ -26,7 +25,6 @@
2625
"tensor_parallel_size": 4,
2726
"swap_space": 16,
2827
"disable_log_stats": "",
29-
"disable_log_requests": "",
3028
"load_format": "dummy"
3129
},
3230
"client_parameters": {
@@ -45,7 +43,6 @@
4543
"tensor_parallel_size": 2,
4644
"swap_space": 16,
4745
"disable_log_stats": "",
48-
"disable_log_requests": "",
4946
"load_format": "dummy"
5047
},
5148
"client_parameters": {
@@ -60,8 +57,7 @@
6057
"test_name": "serving_llama70B_tp4_sharegpt_specdecode",
6158
"qps_list": [2],
6259
"server_parameters": {
63-
"model": "meta-llama/Meta-Llama-3.1-70B-Instruct",
64-
"disable_log_requests": "",
60+
"model": "meta-llama/Meta-Llama-3.1-70B-Instruct",
6561
"tensor_parallel_size": 4,
6662
"swap_space": 16,
6763
"speculative_config": {

tests/config/test_mp_reducer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def test_mp_reducer(monkeypatch):
2828
max_model_len=32,
2929
gpu_memory_utilization=0.1,
3030
disable_log_stats=True,
31-
disable_log_requests=True,
3231
)
3332

3433
async_llm = AsyncLLM.from_engine_args(

tests/mq_llm_engine/test_load.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
NUM_REQUESTS = 10000
1717

1818
# Scenarios to test for num generated token.
19-
ENGINE_ARGS = AsyncEngineArgs(model=MODEL, disable_log_requests=True)
19+
ENGINE_ARGS = AsyncEngineArgs(model=MODEL)
2020

2121

2222
@pytest.fixture(scope="function")

tests/v1/engine/test_async_llm.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@
2626
TEXT_ENGINE_ARGS = AsyncEngineArgs(
2727
model="meta-llama/Llama-3.2-1B-Instruct",
2828
enforce_eager=True,
29-
disable_log_requests=True,
3029
)
3130

3231
VISION_ENGINE_ARGS = AsyncEngineArgs(model="Qwen/Qwen2-VL-2B-Instruct",
33-
enforce_eager=True,
34-
disable_log_requests=True)
32+
enforce_eager=True)
3533

3634
TEXT_PROMPT = "Hello my name is Robert and"
3735

0 commit comments

Comments
 (0)