main2main

Signed-off-by: wangli <[email protected]>

Author: Potabk

.github/workflows/pr_test_full.yaml

@@ -74,7 +74,7 @@ jobs:
     name: e2e-full
     strategy:
       matrix:
-        vllm_version: [ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0]
+        vllm_version: [b75f826fca4febb17a76c12a45d5e315111c7618, v0.12.0]
     needs: [changes]
     if: ${{ needs.changes.outputs.e2e_tracker == 'true' }}
     uses: ./.github/workflows/_e2e_test.yaml

.github/workflows/pr_test_light.yaml

@@ -42,7 +42,7 @@ jobs:
   lint:
     uses: ./.github/workflows/_pre_commit.yml
     with:
-      vllm: ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9
+      vllm: b75f826fca4febb17a76c12a45d5e315111c7618
   changes:
     runs-on: linux-aarch64-a2-0
     outputs:
@@ -90,7 +90,7 @@ jobs:
         SOC_VERSION: ascend910b1
     strategy:
       matrix:
-        vllm_version: [ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0]
+        vllm_version: [b75f826fca4febb17a76c12a45d5e315111c7618, v0.12.0]
 
     steps:
       - name: Free up disk space
@@ -154,7 +154,7 @@ jobs:
     name: e2e-light
     strategy:
       matrix:
-        vllm_version: [ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0]
+        vllm_version: [b75f826fca4febb17a76c12a45d5e315111c7618, v0.12.0]
     # Note (yikun): If CI resource are limited we can split job into two chain jobs
     needs: [lint, changes]
     # only trigger e2e test after lint passed and the change is e2e related with pull request.

docs/source/community/versioning_policy.md

@@ -45,7 +45,7 @@ The table below is the release compatibility matrix for vLLM Ascend release.
 For main branch of vLLM Ascend, we usually make it compatible with the latest vLLM release and a newer commit hash of vLLM. Please note that this table is usually updated. Please check it regularly.
 | vLLM Ascend | vLLM         | Python           | Stable CANN | PyTorch/torch_npu  |
 |-------------|--------------|------------------|-------------|--------------------|
-|     main    | ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9,  v0.12.0 tag | >= 3.10, < 3.12   | 8.3.RC2 | 2.8.0 / 2.8.0 |
+|     main    | b75f826fca4febb17a76c12a45d5e315111c7618,  v0.12.0 tag | >= 3.10, < 3.12   | 8.3.RC2 | 2.8.0 / 2.8.0 |
 
 ## Release cadence
 

tests/e2e/multicard/test_shared_expert_dp.py

@@ -8,6 +8,7 @@
 
 MODELS = [
     "deepseek-ai/DeepSeek-V2-Lite",
+    "deepseek-ai/DeepSeek-V2-Lite",
 ]
 os.environ["VLLM_WORKER_MULTIPROC_METHOD"] = "spawn"
 

tests/ut/compilation/test_acl_graph.py

@@ -803,7 +803,9 @@ def test_update_mla_dcp_pcp_params(self, _mock_graph_task_end):
             (q_nope, q_pe, k_nope, k_pe, block_table, seq_lens, num_heads,
              scale, num_kv_heads, out, lse))
 
-        update_mla_attn_dcp_pcp_params(self.update_stream, forward_context, 4)
+        with patch("torch_npu._C._npu_setStream", return_value=None):
+            update_mla_attn_dcp_pcp_params(self.update_stream, forward_context,
+                                           4)
 
         _mock_graph_task_end.assert_called_once()
 
@@ -842,6 +844,7 @@ def test_update_attn_dcp_pcp_params(self, _mock_graph_task_end):
              block_table, 128, actual_seq_lengths_kv, actual_seq_lengths_q,
              out, lse, 2, 0, 0))
 
-        update_attn_dcp_pcp_params(self.update_stream, forward_context, 4)
+        with patch("torch_npu._C._npu_setStream", return_value=None):
+            update_attn_dcp_pcp_params(self.update_stream, forward_context, 4)
 
         _mock_graph_task_end.assert_called_once()

tests/ut/spec_decode/test_eagle_proposer.py

@@ -95,6 +95,8 @@ def test_load_model_pp1(self, mock_pp_group, mock_get_model,
         mock_model = MagicMock()
         mock_model.model.embed_tokens = MagicMock()
         mock_model.lm_head = MagicMock()
+        mock_model.multimodal_cpu_fields = None
+        mock_model.merge_by_field_config = None
         mock_get_model.return_value = MagicMock()
         self.proposer.name = SpecDcodeType.EAGLE
 
@@ -117,6 +119,8 @@ def test_load_model_pp_gt1(self, mock_pp_group, mock_get_model,
 
         mock_model = MagicMock()
         original_embed = MagicMock()
+        mock_model.multimodal_cpu_fields = None
+        mock_model.merge_by_field_config = None
         mock_get_model.return_value = MagicMock(model=MagicMock(
             embed_tokens=original_embed))
 

vllm_ascend/eplb/utils.py

@@ -24,7 +24,7 @@
 
 
 def get_expert_map(self, layer_id):
-    return self.model.layers[layer_id].mlp.experts.get_map()
+    return self.model.layers[layer_id].mlp.experts.expert_map
 
 
 def get_log2phy_map(self, layer_id):

vllm_ascend/ops/fused_moe/fused_moe.py

@@ -153,7 +153,7 @@ def __init__(self, *args, **kwargs):
         AscendFusedMoE.moe_counter += 1
         self.moe_instance_id = AscendFusedMoE.moe_counter
 
-        self.expert_map = None
+        self._expert_map = None
         self.log2phy = None
 
         if self.quant_config is None:
@@ -184,7 +184,7 @@ def __init__(self, *args, **kwargs):
                 dtype=vllm_config.model_config.dtype)
 
         # init moe.
-        self.local_num_experts, self.expert_map, _ = determine_expert_map(
+        self.local_num_experts, self._expert_map, _ = determine_expert_map(
             self.ep_size, self.ep_rank, self.global_num_experts)
         # TODO: Temporary flag to indicate if static EPLB is enabled. This is a
         # workaround to bypass a quantization check that fails with float weights.
@@ -200,7 +200,7 @@ def __init__(self, *args, **kwargs):
                 self.expert_load_balancer.get_global_redundant_expert_num())
             self.global_num_experts = num_experts + self.global_redundant_expert_num
             try:
-                self.local_num_experts, self.expert_map = (
+                self.local_num_experts, self._expert_map = (
                     self.expert_load_balancer.get_rank_placement_map(
                         self.moe_instance_id, self.ep_rank))
                 self.log2phy = self.expert_load_balancer.get_rank_log2phy_map(
@@ -216,16 +216,16 @@ def __init__(self, *args, **kwargs):
             if self.dynamic_eplb:
                 self.log2phy = determine_default_log2phy_map(
                     self.global_num_experts, self.ep_size, self.ep_rank).npu()
-        if self.expert_map is not None and isinstance(self.expert_map,
-                                                      torch.Tensor):
+        if self._expert_map is not None and isinstance(self._expert_map,
+                                                       torch.Tensor):
             logger.info_once(
                 "[EP Rank %s/%s] Expert parallelism is enabled. Local/global"
                 " number of experts: %s/%s. Experts local to global index map:"
                 " %s.", self.ep_rank, self.ep_size, self.local_num_experts,
                 self.global_num_experts,
-                get_compressed_expert_map(self.expert_map))
+                get_compressed_expert_map(self._expert_map))
         local_num_experts = (torch.sum(
-            self.expert_map != -1) if self.expert_map is not None else
+            self._expert_map != -1) if self._expert_map is not None else
                              self.global_num_experts)
         if self.dynamic_eplb:
             self.moe_load = torch.zeros(local_num_experts,
@@ -276,10 +276,16 @@ def _get_quant_type(self) -> QuantType:
             return QuantType.NONE
 
     def update_expert_map(self, new_expert_map):
-        self.expert_map = new_expert_map
+        self._expert_map = new_expert_map
 
-    def get_map(self):
-        return self.expert_map
+    @property
+    def expert_map(self) -> torch.Tensor | None:
+        return self._expert_map
+
+    @expert_map.setter
+    def expert_map(self, new_expert_map):
+        # TODO(Potabk): Remove this once we drop vllm v0.12.0(This makes backward compatibility with vllm v0.12.0)
+        self._expert_map = new_expert_map
 
     def get_log2phy_map(self):
         return self.log2phy

vllm_ascend/patch/platform/__init__.py

@@ -17,10 +17,15 @@
 import os
 
 import vllm_ascend.patch.platform.patch_distributed  # noqa
-import vllm_ascend.patch.platform.patch_ec_connector  # noqa
 import vllm_ascend.patch.platform.patch_mamba_config  # noqa
 import vllm_ascend.patch.platform.patch_sched_yield  # noqa
+from vllm_ascend.utils import vllm_version_is
 
 if os.getenv("DYNAMIC_EPLB", "false").lower() in ("true", "1") or os.getenv(
         "EXPERT_MAP_RECORD", "false") == "true":
     import vllm_ascend.patch.platform.patch_multiproc_executor  # noqa
+
+if vllm_version_is("0.12.0"):
+    import vllm_ascend.patch.platform.patch_ec_connector012  # noqa
+else:
+    import vllm_ascend.patch.platform.patch_ec_connector  # noqa

vllm_ascend/patch/platform/patch_ec_connector.py

@@ -1,16 +1,15 @@
-import vllm.distributed.ec_transfer.ec_connector.shared_storage_connector
+import vllm.distributed.ec_transfer.ec_connector.example_connector
 from safetensors.torch import load_file
-from vllm.distributed.ec_transfer.ec_connector.base import ECConnectorMetadata
-from vllm.distributed.ec_transfer.ec_connector.shared_storage_connector import (
-    ECSharedStorageConnector, ECSharedStorageConnectorMetadata)
+from vllm.distributed.ec_transfer.ec_connector.example_connector import (
+    ECConnectorMetadata, ECExampleConnector)
 from vllm.logger import logger
 
 
-class AscendECSharedStorageConnector(ECSharedStorageConnector):
+class AscendECExampleConnector(ECExampleConnector):
 
     def start_load_caches(self, encoder_cache, **kwargs) -> None:
         metadata: ECConnectorMetadata = self._get_connector_metadata()
-        assert isinstance(metadata, ECSharedStorageConnectorMetadata)
+        assert isinstance(metadata, ECConnectorMetadata)
         assert encoder_cache is not None
         if metadata is None:
             logger.warning((
@@ -29,4 +28,4 @@ def start_load_caches(self, encoder_cache, **kwargs) -> None:
                          mm_data.mm_hash)
 
 
-vllm.distributed.ec_transfer.ec_connector.shared_storage_connector.ECSharedStorageConnector = AscendECSharedStorageConnector
+vllm.distributed.ec_transfer.ec_connector.example_connector.ECExampleConnector = AscendECExampleConnector