Merge branch 'main' into main

Author: zzzzwwjj

.github/workflows/image_310p_openeuler.yml

@@ -36,6 +36,12 @@ on:
       - '.github/workflows/image_310p_openeuler.yml'
       - 'Dockerfile.310p.openEuler'
       - 'vllm_ascend/**'
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'csrc/**'
 
 jobs:
   build:

.github/workflows/image_310p_ubuntu.yml

@@ -36,6 +36,12 @@ on:
       - '.github/workflows/image_310p_ubuntu.yml'
       - 'Dockerfile.310p'
       - 'vllm_ascend/**'
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'csrc/**'
 jobs:
 
   build:

.github/workflows/image_a3_openeuler.yml

@@ -36,6 +36,12 @@ on:
       - '.github/workflows/image_a3_openeuler.yml'
       - 'Dockerfile.a3.openEuler'
       - 'vllm_ascend/**'
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'csrc/**'
 
 jobs:
   build:

.github/workflows/image_a3_ubuntu.yml

@@ -36,6 +36,12 @@ on:
       - '.github/workflows/image_a3_ubuntu.yml'
       - 'Dockerfile.a3'
       - 'vllm_ascend/**'
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'csrc/**'
 jobs:
 
   build:

.github/workflows/image_openeuler.yml

@@ -35,6 +35,12 @@ on:
       - '.github/workflows/image_openeuler.yml'
       - 'Dockerfile.openEuler'
       - 'vllm_ascend/**'
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'csrc/**'
 
 jobs:
   build:

.github/workflows/image_ubuntu.yml

@@ -36,6 +36,12 @@ on:
       - '.github/workflows/image_ubuntu.yml'
       - 'Dockerfile'
       - 'vllm_ascend/**'
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'cmake/**'
+      - 'CMakeLists.txt'
+      - 'csrc/**'
 jobs:
 
   build:

examples/data_parallel.py

@@ -122,7 +122,8 @@ def mock_distributed():
 @pytest.fixture
 def mock_forward_context():
     forward_context = Mock(in_profile_run=False, with_prefill=False)
-    with patch("vllm_ascend.models.deepseek_v2.get_forward_context", return_value=forward_context):
+    with patch("vllm_ascend.models.deepseek_v2.get_forward_context",
+               return_value=forward_context):
         yield
 
 
@@ -213,7 +214,8 @@ def test_custom_deepseek_v2_mlp(mock_distributed, base_config):
                             quant_config=None)
 
 
-def test_custom_deepseek_v2_moe(mock_distributed, base_config, mock_forward_context):
+def test_custom_deepseek_v2_moe(mock_distributed, base_config,
+                                mock_forward_context):
     base_config.n_shared_experts = 1
     moe = CustomDeepseekV2MoE(config=base_config,
                               quant_config=None,