From 595d3484c46d70787e1ad19e926109d4905acec2 Mon Sep 17 00:00:00 2001 From: Li Wang Date: Fri, 9 Jan 2026 09:23:36 +0800 Subject: [PATCH] [Nightly] Move ops to the correct path (#5642) ### What this PR does / why we need it? Move ops to the correct path where they belong - vLLM version: v0.13.0 - vLLM main: https://github.com/vllm-project/vllm/commit/2f4e6548efec402b913ffddc8726230d9311948d Signed-off-by: wangli --- .github/workflows/_e2e_nightly_single_node.yaml | 6 +----- .github/workflows/nightly_test_a2.yaml | 3 +++ .github/workflows/nightly_test_a3.yaml | 4 ++-- .../test_matmul_allreduce_add_rmsnorm.py | 0 .../ops/{multicard_ops => multicard_ops_a3}/__init__.py | 0 .../test_dispatch_ffn_combine.py | 0 .../test_dispatch_gmm_combine_decode.py | 0 7 files changed, 6 insertions(+), 7 deletions(-) rename tests/e2e/nightly/single_node/ops/{singlecard_ops => multicard_ops_a2}/test_matmul_allreduce_add_rmsnorm.py (100%) rename tests/e2e/nightly/single_node/ops/{multicard_ops => multicard_ops_a3}/__init__.py (100%) rename tests/e2e/nightly/single_node/ops/{singlecard_ops => multicard_ops_a3}/test_dispatch_ffn_combine.py (100%) rename tests/e2e/nightly/single_node/ops/{multicard_ops => multicard_ops_a3}/test_dispatch_gmm_combine_decode.py (100%) diff --git a/.github/workflows/_e2e_nightly_single_node.yaml b/.github/workflows/_e2e_nightly_single_node.yaml index 660f593c..4e8fa1a6 100644 --- a/.github/workflows/_e2e_nightly_single_node.yaml +++ b/.github/workflows/_e2e_nightly_single_node.yaml @@ -142,10 +142,6 @@ jobs: run: | # ignore test_dispatch_ffn_combine until the test is fixed pytest -sv ${{ inputs.tests }} \ - --ignore=tests/e2e/nightly/ops/test_dispatch_ffn_combine.py \ - --ignore=tests/e2e/nightly/ops/test_fused_moe.py \ - --ignore=tests/e2e/nightly/ops/test_rotary_embedding.py \ - --ignore=tests/e2e/nightly/ops/test_matmul_allreduce_add_rmsnorm.py - + --ignore=tests/e2e/nightly/single_node/ops/singlecard_ops/test_fused_moe.py diff --git a/.github/workflows/nightly_test_a2.yaml b/.github/workflows/nightly_test_a2.yaml index 6e9bcc0d..01a76b65 100644 --- a/.github/workflows/nightly_test_a2.yaml +++ b/.github/workflows/nightly_test_a2.yaml @@ -61,6 +61,9 @@ jobs: - name: test_custom_op os: linux-aarch64-a2-1 tests: tests/e2e/nightly/single_node/ops/singlecard_ops + - name: test_custom_op_multi_card + os: linux-aarch64-a2-4 + tests: tests/e2e/nightly/single_node/ops/multicard_ops_a2/ uses: ./.github/workflows/_e2e_nightly_single_node.yaml with: vllm: v0.13.0 diff --git a/.github/workflows/nightly_test_a3.yaml b/.github/workflows/nightly_test_a3.yaml index 8c4c5b4d..74c762f1 100644 --- a/.github/workflows/nightly_test_a3.yaml +++ b/.github/workflows/nightly_test_a3.yaml @@ -158,9 +158,9 @@ jobs: fail-fast: false matrix: test_config: - - name: custom-op-dispatch_gmm_combine_decode + - name: custom-multi-ops os: linux-aarch64-a3-16 - tests: tests/e2e/nightly/single_node/ops/multicard_ops/test_dispatch_gmm_combine_decode.py + tests: tests/e2e/nightly/single_node/ops/multicard_ops_a3/ uses: ./.github/workflows/_e2e_nightly_single_node.yaml with: runner: ${{ matrix.test_config.os }} diff --git a/tests/e2e/nightly/single_node/ops/singlecard_ops/test_matmul_allreduce_add_rmsnorm.py b/tests/e2e/nightly/single_node/ops/multicard_ops_a2/test_matmul_allreduce_add_rmsnorm.py similarity index 100% rename from tests/e2e/nightly/single_node/ops/singlecard_ops/test_matmul_allreduce_add_rmsnorm.py rename to tests/e2e/nightly/single_node/ops/multicard_ops_a2/test_matmul_allreduce_add_rmsnorm.py diff --git a/tests/e2e/nightly/single_node/ops/multicard_ops/__init__.py b/tests/e2e/nightly/single_node/ops/multicard_ops_a3/__init__.py similarity index 100% rename from tests/e2e/nightly/single_node/ops/multicard_ops/__init__.py rename to tests/e2e/nightly/single_node/ops/multicard_ops_a3/__init__.py diff --git a/tests/e2e/nightly/single_node/ops/singlecard_ops/test_dispatch_ffn_combine.py b/tests/e2e/nightly/single_node/ops/multicard_ops_a3/test_dispatch_ffn_combine.py similarity index 100% rename from tests/e2e/nightly/single_node/ops/singlecard_ops/test_dispatch_ffn_combine.py rename to tests/e2e/nightly/single_node/ops/multicard_ops_a3/test_dispatch_ffn_combine.py diff --git a/tests/e2e/nightly/single_node/ops/multicard_ops/test_dispatch_gmm_combine_decode.py b/tests/e2e/nightly/single_node/ops/multicard_ops_a3/test_dispatch_gmm_combine_decode.py similarity index 100% rename from tests/e2e/nightly/single_node/ops/multicard_ops/test_dispatch_gmm_combine_decode.py rename to tests/e2e/nightly/single_node/ops/multicard_ops_a3/test_dispatch_gmm_combine_decode.py