Skip to content

Enhancement of mori ep unit test #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Enhancement of mori ep unit test #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65f78a9
enhancement of mori EP test
dongmin-ra Oct 23, 2025
26fc9a1
fixed mori ep benchmark errors
dongmin-ra Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions tests/python/ops/bench_dispatch_combine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@

class EpDispatchCombineBenchmark(EpDispatchCombineTestCase):
def __init__(self, config):
super().__init__(config)
super().__init__(config, use_max_token_num=True)

def gen_test_data(self):
return super().gen_test_data(use_max_token_num=True)
return super().gen_test_data()

def run_once(self, op, test_data, check_result):
(
all_rank_num_token,
all_rank_indices,
all_rank_input,
all_rank_weights,
all_rank_scales,
input,
indices,
weights,
scales,
) = test_data

start_event = torch.cuda.Event(enable_timing=True)
Expand All @@ -54,11 +53,11 @@ def run_once(self, op, test_data, check_result):
dispatch_indices,
dispatch_recv_num_token,
) = op.dispatch(
all_rank_input[self.config.rank],
all_rank_weights[self.config.rank],
input,
weights,
# None,
all_rank_scales[self.config.rank],
all_rank_indices[self.config.rank],
scales,
indices,
block_num=80,
warp_per_block=16,
)
Expand All @@ -68,20 +67,25 @@ def run_once(self, op, test_data, check_result):

if check_result:
self.check_dispatch_result(
op,
test_data,
dispatch_output,
dispatch_weights,
dispatch_scales,
dispatch_indices,
dispatch_recv_num_token,
op.get_dispatch_src_token_pos(),
)

total_recv_num_token = dispatch_recv_num_token[0].item()

combine_input = op.get_registered_combine_input_buffer(self.config.data_type)
combine_input[:total_recv_num_token, :].copy_(
dispatch_output[:total_recv_num_token, :]
self.moe_sum(
dispatch_recv_num_token,
dispatch_output,
dispatch_weights,
dispatch_indices,
dispatch_scales,
output=combine_input[:total_recv_num_token],
)

self.sync()
Expand All @@ -99,11 +103,11 @@ def run_once(self, op, test_data, check_result):
comb_duration = start_event.elapsed_time(end_event)

if check_result:
self.check_combine_result(op, test_data, combine_output)
self.check_combine_result(test_data, combine_output)
op.reset()
self.sync()

element_size = all_rank_input[self.config.rank].element_size()
element_size = input.element_size()
total_bytes = total_recv_num_token * self.config.hidden_dim * element_size
disp_bandwidth = total_bytes / (1000**3) / (disp_duration / (10**3))
comb_bandwidth = total_bytes / (1000**3) / (comb_duration / (10**3))
Expand Down Expand Up @@ -204,11 +208,11 @@ def _bench_dispatch_combine(
block_num=80,
use_external_inp_buf=False,
)
benchmark = EpDispatchCombineBenchmark(config)

with TorchDistContext(rank=rank, world_size=world_size, master_port=port):
mori.shmem.shmem_torch_process_group_init("default")
op = mori.ops.EpDispatchCombineOp(config)
benchmark = EpDispatchCombineBenchmark(config)
benchmark.run(op)
# benchmark.output()
# mori.shmem.shmem_finalize()
Expand Down
42 changes: 23 additions & 19 deletions tests/python/ops/bench_dispatch_combine_tune.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@

class EpDispatchCombineBenchmark(EpDispatchCombineTestCase):
def __init__(self, config):
super().__init__(config)
super().__init__(config, use_max_token_num=True)

def gen_test_data(self):
return super().gen_test_data(use_max_token_num=True)
return super().gen_test_data()

def run_once(self, op, test_data, check_result):
(
all_rank_num_token,
all_rank_indices,
all_rank_input,
all_rank_weights,
all_rank_scales,
input,
indices,
weights,
scales,
) = test_data

start_event = torch.cuda.Event(enable_timing=True)
Expand All @@ -54,10 +53,10 @@ def run_once(self, op, test_data, check_result):
dispatch_indices,
dispatch_recv_num_token,
) = op.dispatch(
all_rank_input[self.config.rank],
all_rank_weights[self.config.rank],
all_rank_scales[self.config.rank],
all_rank_indices[self.config.rank],
input,
weights,
scales,
indices,
block_num=80,
warp_per_block=16,
)
Expand All @@ -67,25 +66,30 @@ def run_once(self, op, test_data, check_result):

if check_result:
self.check_dispatch_result(
op,
test_data,
dispatch_output,
dispatch_weights,
dispatch_scales,
dispatch_indices,
dispatch_recv_num_token,
op.get_dispatch_src_token_pos(),
)

total_recv_num_token = dispatch_recv_num_token[0].item()

combine_input = op.get_registered_input_buffer(self.config.data_type)
combine_input[:total_recv_num_token, :].copy_(
dispatch_output[:total_recv_num_token, :]
combine_input = op.get_registered_combine_input_buffer(self.config.data_type)
self.moe_sum(
dispatch_recv_num_token,
dispatch_output,
dispatch_weights,
dispatch_indices,
dispatch_scales,
output=combine_input[:total_recv_num_token],
)

self.sync()
start_event.record()
combine_output = op.combine(
combine_output, _ = op.combine(
combine_input,
dispatch_weights,
dispatch_indices,
Expand All @@ -97,11 +101,11 @@ def run_once(self, op, test_data, check_result):
comb_duration = start_event.elapsed_time(end_event)

if check_result:
self.check_combine_result(op, test_data, combine_output)
self.check_combine_result(test_data, combine_output)
op.reset()
self.sync()

element_size = all_rank_input[self.config.rank].element_size()
element_size = input.element_size()
total_bytes = total_recv_num_token * self.config.hidden_dim * element_size
# disp_bandwidth = total_bytes / (1024**3) / (disp_duration / (10**3))
# comb_bandwidth = total_bytes / (1024**3) / (comb_duration / (10**3))
Expand Down Expand Up @@ -221,11 +225,11 @@ def _bench_dispatch_combine(
block_num=80,
use_external_inp_buf=False,
)
benchmark = EpDispatchCombineBenchmark(config)

with TorchDistContext(rank=rank, world_size=world_size, master_port=port):
mori.shmem.shmem_torch_process_group_init("default")
op = mori.ops.EpDispatchCombineOp(config)
benchmark = EpDispatchCombineBenchmark(config)
benchmark.run(op)
# benchmark.output()
# mori.shmem.shmem_finalize()
Expand Down
Loading