Skip to content

Commit ab6f741

Browse files
authored
Merge branch 'develop' into update_ep
2 parents 3670530 + ffe7af8 commit ab6f741

36 files changed

+1088
-102
lines changed

.github/workflows/_accuracy_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
'
5757
58-
wget -q ${fd_archive_url}
58+
wget -q --no-proxy ${fd_archive_url}
5959
tar -xf FastDeploy.tar.gz
6060
rm -rf FastDeploy.tar.gz
6161
cd FastDeploy

.github/workflows/_base_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
'
5757
58-
wget -q ${fd_archive_url}
58+
wget -q --no-proxy ${fd_archive_url}
5959
tar -xf FastDeploy.tar.gz
6060
rm -rf FastDeploy.tar.gz
6161
cd FastDeploy

.github/workflows/_build_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
fi
8383
'
8484
85-
wget -q ${fd_archive_url}
85+
wget -q --no-proxy ${fd_archive_url}
8686
tar -xf FastDeploy.tar.gz
8787
rm -rf FastDeploy.tar.gz
8888
cd FastDeploy

.github/workflows/_ci_image_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
fi
5454
'
5555
56-
wget -q ${fd_archive_url}
56+
wget -q --no-proxy ${fd_archive_url}
5757
tar -xf FastDeploy.tar.gz
5858
rm -rf FastDeploy.tar.gz
5959
cd FastDeploy

.github/workflows/_logprob_test_linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ on:
3232
jobs:
3333
run_tests_logprob:
3434
runs-on: [self-hosted, GPU-h20-1Cards]
35+
timeout-minutes: 60
3536
steps:
3637
- name: Code Prepare
3738
shell: bash
@@ -47,7 +48,7 @@ jobs:
4748
${docker_image} /bin/bash -c '
4849
rm -rf /workspace/*
4950
'
50-
wget -q ${paddletest_archive_url}
51+
wget -q --no-proxy ${paddletest_archive_url}
5152
tar -xf PaddleTest.tar.gz
5253
rm -rf PaddleTest.tar.gz
5354
cd PaddleTest

.github/workflows/_pre_ce_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fi
5858
'
5959
60-
wget -q ${fd_archive_url}
60+
wget -q --no-proxy ${fd_archive_url}
6161
tar -xf FastDeploy.tar.gz
6262
rm -rf FastDeploy.tar.gz
6363
cd FastDeploy

.github/workflows/_stable_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fi
5656
'
5757
58-
wget -q ${fd_archive_url}
58+
wget -q --no-proxy ${fd_archive_url}
5959
tar -xf FastDeploy.tar.gz
6060
rm -rf FastDeploy.tar.gz
6161
cd FastDeploy

.github/workflows/_unit_test_coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
fi
7272
'
7373
74-
wget -q ${fd_archive_url}
74+
wget -q --no-proxy ${fd_archive_url}
7575
tar -xf FastDeploy.tar.gz
7676
rm -rf FastDeploy.tar.gz
7777
cd FastDeploy
@@ -300,7 +300,7 @@ jobs:
300300
env:
301301
diff_cov_file_url: ${{ needs.run_tests_with_coverage.outputs.diff_cov_file_url }}
302302
run: |
303-
wget ${fd_archive_url}
303+
wget -q --no-proxy ${fd_archive_url}
304304
tar -xf FastDeploy.tar.gz
305305
cd FastDeploy
306306
if [ -z "${diff_cov_file_url}" ]; then

.github/workflows/publish_job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ jobs:
302302
rm -rf ${REPO_NAME}*
303303
fi
304304
'
305-
wget -q ${fd_archive_url}
305+
wget -q --no-proxy ${fd_archive_url}
306306
tar -xf FastDeploy.tar.gz
307307
rm -rf FastDeploy.tar.gz
308308
cd FastDeploy

benchmarks/backend_request_func.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ class RequestFuncOutput:
5858
"""Output for requesting LLMs via API"""
5959

6060
no: int = 0
61+
request_id: str = ""
6162
generated_text: str = ""
6263
reasoning_content: str = ""
6364
success: bool = False
6465
latency: float = 0.0
66+
end_timestamp: float = 0.0 # 模型完全返回的时间戳(秒, perf_counter基准)
6567
output_tokens: int = 0
6668
ttft: float = 0.0 # Time to first token
6769
arrival_time: list = field(default_factory=list) # arrival_time
@@ -154,6 +156,8 @@ async def async_request_eb_openai_chat_completions(
154156
most_recent_timestamp = timestamp
155157

156158
# output.generated_text = generated_text
159+
# 在流式结束时,记录最后一个 chunk 收到的时间戳
160+
output.end_timestamp = most_recent_timestamp
157161
if output.generated_text.strip() == "":
158162
output.success = False
159163
output.error = "No generated text found!"
@@ -170,6 +174,7 @@ async def async_request_eb_openai_chat_completions(
170174
)
171175
output.error = error_text or ""
172176
output.success = False
177+
output.request_id = data.get("id", "")
173178
except Exception:
174179
output.success = False
175180
exc_info = sys.exc_info()

0 commit comments

Comments
 (0)