[Dist][EP] Remove ETP/EP maintained in vllm-ascend (#1681)
### What this PR does / why we need it?
Remove ETP/EP maintained in branch main. We drop this as there is no
relevant scenarios to use ETP now, and we may subsequently advocate
implementing expert tensor parallelism in vLLM to support scenarios
where the expert is needed to be sliced
This is a part of #1422 backport.
Fixes https://github.com/vllm-project/vllm-ascend/issues/1396
https://github.com/vllm-project/vllm-ascend/issues/1154
### Does this PR introduce _any_ user-facing change?
We'll not maintain etp/ep in vllm-ascend anymore, and use the tp/ep in
vllm instead.
### How was this patch tested?
CI passed with new added and existing test.
- vLLM version: v0.9.2
- vLLM main:
fe8a2c544a
Signed-off-by: MengqingCao <cmq0113@163.com>
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
export TASK_QUEUE_ENABLE=1
|
||||
source /usr/local/Ascend/ascend-toolkit/set_env.sh
|
||||
source /usr/local/Ascend/nnal/atb/set_env.sh
|
||||
export ASCEND_LAUNCH_BLOCKING=0
|
||||
export VLLM_VERSION=0.9.1
|
||||
|
||||
nohup python -m vllm.entrypoints.openai.api_server --model=/mnt/deepseek/DeepSeek-R1-W8A8-VLLM \
|
||||
--served-model-name auto \
|
||||
--quantization ascend \
|
||||
--trust-remote-code \
|
||||
--distributed-executor-backend=mp \
|
||||
--port 8006 \
|
||||
-tp=8 \
|
||||
-dp=2 \
|
||||
--max-num-seqs 24 \
|
||||
--max-model-len 32768 \
|
||||
--max-num-batched-tokens 32768 \
|
||||
--block-size 128 \
|
||||
--no-enable-prefix-caching \
|
||||
--additional-config '{"torchair_graph_config":{"enabled":true,"use_cached_graph":true,"graph_batch_sizes":[24]},"ascend_scheduler_config":{"enabled":true},"expert_tensor_parallel_size":16}' \
|
||||
--gpu-memory-utilization 0.96 &> run.log &
|
||||
disown
|
||||
@@ -1,57 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Concurrency array
|
||||
concurrency_array=(48)
|
||||
#best rate
|
||||
rate_array=(0.7)
|
||||
|
||||
# Result file
|
||||
result_file="benchmark_results.txt"
|
||||
echo "Benchmark Results" > $result_file
|
||||
echo "===================" >> $result_file
|
||||
|
||||
# Loop through all combinations
|
||||
for concurrency in "${concurrency_array[@]}"; do
|
||||
for rate in "${rate_array[@]}"; do
|
||||
echo "Testing with concurrency=$concurrency, rate=$rate"
|
||||
echo "" >> $result_file
|
||||
echo "Concurrency: $concurrency, Request Rate: $rate" >> $result_file
|
||||
echo "-------------------" >> $result_file
|
||||
|
||||
# Run benchmark test
|
||||
python /mnt/deepseek/vllm/benchmarks/benchmark_serving.py \
|
||||
--backend vllm \
|
||||
--trust-remote-code \
|
||||
--model auto \
|
||||
--tokenizer /mnt/deepseek/DeepSeek-R1-W8A8-VLLM \
|
||||
--dataset-name random \
|
||||
--random-input-len 4096 \
|
||||
--random-output-len 1536 \
|
||||
--ignore-eos \
|
||||
--num-prompts 400 \
|
||||
--max-concurrency $concurrency \
|
||||
--request-rate $rate \
|
||||
--metric-percentiles 90 \
|
||||
--base-url http://localhost:8006 2>&1 | tee -a $result_file
|
||||
|
||||
# Wait for system cool down
|
||||
sleep 30
|
||||
done
|
||||
done
|
||||
|
||||
# Analyze results
|
||||
echo "Analysis Results" > analysis_results.txt
|
||||
echo "=================" >> analysis_results.txt
|
||||
|
||||
# Extract and analyze TPOT data
|
||||
echo "TPOT Analysis:" >> analysis_results.txt
|
||||
grep "Mean TPOT" $result_file | awk -F':' '{
|
||||
printf "Concurrency %s, Rate %s: %s ms\n", $1, $2, $3
|
||||
}' >> analysis_results.txt
|
||||
|
||||
# Extract and analyze throughput data
|
||||
echo -e "\nThroughput Analysis:" >> analysis_results.txt
|
||||
grep "Output token throughput" $result_file | awk -F':' '{
|
||||
printf "Concurrency %s, Rate %s: %s tokens/s\n", $1, $2, $3
|
||||
}' >> analysis_results.txt
|
||||
|
||||
echo "Testing completed. Results saved in $result_file and analysis in analysis_results.txt"
|
||||
Reference in New Issue
Block a user