Skip to content

Commit 3465ad6

Browse files
author
lt
committed
relocate the code from the worker_runner to the server side.
1 parent b0e68f7 commit 3465ad6

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

vllm_ascend/eplb/eplb_updator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,12 @@ def unpack_update_batch(self, packed_update_info):
234234
]
235235
return recovered
236236

237-
def get_expert_load(self) -> torch.Tensor:
237+
def get_expert_load(self) -> tuple:
238238
expert_maps = self.shared_dict["expert_maps"]
239239
moe_load = self.shared_dict["moe_load"] # Tensor [L, W, global_experts_num]
240240
num_local_experts = expert_maps.max() + 1
241-
load_info, _ = ExpertMapUtils.global2local_load(moe_load, expert_maps, num_local_experts)
242-
return load_info
241+
return moe_load, expert_maps, num_local_experts
242+
243243

244244
def update_expert_load_statistical_period(self, num_expert_load_gather: int, num_iterations: int):
245245
logger.info(f" start update {self.num_expert_load_gather=}, {self.num_iterations}...")

vllm_ascend/eplb/tool/eplb_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ def global2local_load(self,
9090
placement: torch.Tensor,
9191
E_local: int
9292
) -> tuple[torch.Tensor, torch.Tensor]:
93-
9493
L, G, _ = placement.shape
9594
device = placement.device
9695

vllm_ascend/worker/model_runner_v1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@ def profile_run(self) -> None:
15881588
self.encoder_cache.clear()
15891589
gc.collect()
15901590

1591-
def do_get_expert_load(self) -> torch.Tensor:
1591+
def do_get_expert_load(self) -> tuple:
15921592
return self.eplb_updator.get_expert_load()
15931593

15941594
def do_update_expert_load_statistical_period(self, num_expert_load_gather: int, num_iterations: int):

vllm_ascend/worker/worker_v1.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,8 @@ def compile_or_warm_up_model(self) -> None:
209209
# the model initialization and profiling.
210210
set_random_seed(self.model_config.seed)
211211

212-
def get_expert_load(self) -> torch.Tensor:
213-
moe_load = self.model_runner.do_get_expert_load()
214-
return moe_load
215-
212+
def get_expert_load(self) -> tuple:
213+
return self.model_runner.do_get_expert_load()
216214
def update_expert_load_statistical_period(self, num_expert_load_gather: int, num_iterations: int):
217215
self.model_runner.do_update_expert_load_statistical_period(num_expert_load_gather, num_iterations)
218216

0 commit comments

Comments
 (0)