Skip to content

bugfix: fix the enum/int type mismatch mentioned in #2507 #2508

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

Merged
yzh119 merged 3 commits into from
Feb 14, 2026
Merged

bugfix: fix the enum/int type mismatch mentioned in #2507 #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c38bf6
upd
yzh119 Feb 6, 2026
d6ed3f8
Tests provide activation_type as int, matching the function signature
dbari Feb 6, 2026
c4fab8f
Make signature of trtllm_fp8_per_tensor_scale_moe_op consistent with …
dbari Feb 6, 2026
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
8 changes: 4 additions & 4 deletions flashinfer/fused_moe/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ def __init__(
use_deepseek_fp8: bool,
hidden_size: int,
intermediate_size: int,
activation_type: int = ActivationType.Swiglu,
activation_type: int = ActivationType.Swiglu.value,
use_shuffled_weight: bool = False,
weight_layout: int = WeightLayout.MajorK,
use_packed_weights: bool = False,
Expand Down Expand Up @@ -1422,7 +1422,7 @@ def trtllm_fp8_per_tensor_scale_moe_op(
routing_method_type: int = 0,
enable_pdl: Optional[bool] = None,
tune_max_num_tokens: int = 8192,
activation_type: ActivationType = ActivationType.Swiglu,
activation_type: int = ActivationType.Swiglu.value,
) -> torch.Tensor:
if enable_pdl is None:
enable_pdl = device_support_pdl(hidden_states.device)
Expand Down Expand Up @@ -1482,7 +1482,7 @@ def trtllm_fp8_per_tensor_scale_moe_op(
use_routing_scales_on_input=use_routing_scales_on_input,
routing_method_type=routing_method_type,
enable_pdl=enable_pdl,
activation_type=activation_type.value,
activation_type=activation_type,
)
# Call the C++ function
result = moe_op.trtllm_fp8_per_tensor_scale_moe(
Expand All @@ -1507,7 +1507,7 @@ def trtllm_fp8_per_tensor_scale_moe_op(
routing_method_type,
enable_pdl,
[-1, -1] if tactic == -1 else tactic,
activation_type.value,
activation_type,
)

return result
Expand Down
16 changes: 8 additions & 8 deletions tests/moe/test_trtllm_gen_fused_moe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2667,8 +2667,8 @@ def run_moe_test(
@pytest.mark.parametrize(
"activation_type",
[
pytest.param(ActivationType.Swiglu, id="Swiglu"),
pytest.param(ActivationType.Geglu, id="Geglu"),
pytest.param(ActivationType.Swiglu.value, id="Swiglu"),
pytest.param(ActivationType.Geglu.value, id="Geglu"),
],
)
def test_renormalize_routing(
Expand Down Expand Up @@ -2855,9 +2855,9 @@ def test_renormalize_routing(
@pytest.mark.parametrize(
"activation_type",
[
pytest.param(ActivationType.Swiglu, id="Swiglu"),
pytest.param(ActivationType.Geglu, id="Geglu"),
pytest.param(ActivationType.Relu2, id="Relu2"),
pytest.param(ActivationType.Swiglu.value, id="Swiglu"),
pytest.param(ActivationType.Geglu.value, id="Geglu"),
pytest.param(ActivationType.Relu2.value, id="Relu2"),
],
)
def test_deepseekv3_routing(
Expand Down Expand Up @@ -2931,8 +2931,8 @@ def test_deepseekv3_routing(
@pytest.mark.parametrize(
"activation_type",
[
pytest.param(ActivationType.Swiglu, id="Swiglu"),
pytest.param(ActivationType.Geglu, id="Geglu"),
pytest.param(ActivationType.Swiglu.value, id="Swiglu"),
pytest.param(ActivationType.Geglu.value, id="Geglu"),
],
)
def test_topk_routing(
Expand Down Expand Up @@ -3005,7 +3005,7 @@ def test_topk_routing(
@pytest.mark.parametrize(
"activation_type",
[
pytest.param(ActivationType.Swiglu, id="Swiglu"),
pytest.param(ActivationType.Swiglu.value, id="Swiglu"),
],
)
def test_llama4_routing(
Expand Down
Loading