Skip to content

Commit f1d22d6

Browse files
committed
[CI] Optimize test execution with single-GPU parallelism and log collection
1 parent 0e4606d commit f1d22d6

5 files changed

Lines changed: 24 additions & 14 deletions

File tree

fastdeploy/model_executor/layers/batch_invariant_ops/batch_invariant_ops.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -690,15 +690,13 @@ def addmm_batch_invariant(
690690
return result
691691

692692

693-
# def _log_softmax_batch_invariant(x: paddle.Tensor, axis: int = -1, out=None) -> paddle.Tensor:
694-
# result = log_softmax(input=x, axis=axis)
695-
# # Handle out parameter if provided
696-
# if out is not None:
697-
# out.copy_(result)
698-
# return out
699-
# return result
700-
def _log_softmax_batch_invariant(x: paddle.Tensor, axis: int = -1) -> paddle.Tensor:
701-
return log_softmax(input=x, axis=axis)
693+
def _log_softmax_batch_invariant(x: paddle.Tensor, axis: int = -1, out=None) -> paddle.Tensor:
694+
result = log_softmax(input=x, axis=axis)
695+
# Handle out parameter if provided
696+
if out is not None:
697+
out.copy_(result)
698+
return out
699+
return result
702700

703701

704702
def mean_batch_invariant(

scripts/coverage_run.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,19 @@ if [ "$failed_count" -ne 0 ]; then
327327
echo "Failed test cases are listed in $failed_tests_file"
328328
cat "$failed_tests_file"
329329

330+
# clean the empty directories
331+
if [ -d "${run_path}/unittest_logs" ]; then
332+
echo "Cleaning empty directories..."
333+
334+
# perform multi-round clean until no more empty directories are found
335+
while true; do
336+
before=$(find "${run_path}/unittest_logs" -type d | wc -l)
337+
find "${run_path}/unittest_logs" -mindepth 1 -type d -empty -delete || true
338+
after=$(find "${run_path}/unittest_logs" -type d | wc -l)
339+
[ "$before" -eq "$after" ] && break
340+
done
341+
fi
342+
330343
# Only package logs when there are failures
331344
echo "===================================="
332345
echo "Step 5: Packaging logs (only on failure)"

tests/e2e/test_EB_Lite_serving.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,9 +1389,8 @@ def test_streaming_chat_finish_reason(openai_client):
13891389

13901390
def test_profile_reset_block_num():
13911391
"""测试profile reset_block_num功能,与baseline diff不能超过5%"""
1392-
log_file = "./log/config.log"
1393-
# log_dir = os.getenv("FD_LOG_DIR", "log")
1394-
# log_file = os.path.join(log_dir, "config.log")
1392+
log_dir = os.getenv("FD_LOG_DIR", "log")
1393+
log_file = os.path.join(log_dir, "config.log")
13951394
baseline = 31446
13961395

13971396
if not os.path.exists(log_file):

tests/e2e/test_ernie_03b_pd_router_v1_ipc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,4 +418,4 @@ def test_non_chat_usage_non_stream(api_url):
418418
total_tokens = usage["completion_tokens"] + usage["prompt_tokens"]
419419
assert payload["max_tokens"] >= usage["completion_tokens"], "completion_tokens大于max_tokens"
420420
assert payload["metadata"]["min_tokens"] <= usage["completion_tokens"], "completion_tokens小于min_tokens"
421-
assert usage["total_tokens"] != total_tokens, "total_tokens不等于prompt_tokens + completion_tokens"
421+
assert usage["total_tokens"] == total_tokens, "total_tokens不等于prompt_tokens + completion_tokens"

tests/e2e/test_ernie_03b_pd_router_v1_rdma_global_cache.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def setup_and_run_server():
218218
for k, v in mooncake_env.items():
219219
env_prefill[k] = v
220220

221-
prefill_log_path = os.path.join(prefill_log_dir, "nohup")
221+
prefill_log_path = os.path.join(prefill_log_dir, "nohup.log")
222222
prefill_cmd = [
223223
sys.executable,
224224
"-m",

0 commit comments

Comments
 (0)