diff --git a/vllm/model_executor/layers/fused_moe/experts/gpt_oss_triton_kernels_moe.py b/vllm/model_executor/layers/fused_moe/experts/gpt_oss_triton_kernels_moe.py index a7f31afc5e..31ef144e23 100644 --- a/vllm/model_executor/layers/fused_moe/experts/gpt_oss_triton_kernels_moe.py +++ b/vllm/model_executor/layers/fused_moe/experts/gpt_oss_triton_kernels_moe.py @@ -755,6 +755,7 @@ class UnfusedOAITritonExperts(LoRAExpertsMixin, BaseOAITritonExperts): MoEActivation.GELU, MoEActivation.SWIGLUOAI, MoEActivation.SWIGLUSTEP, + MoEActivation.SWIGLUOAI_UNINTERLEAVE, ] @staticmethod @@ -811,6 +812,19 @@ class UnfusedOAITritonExperts(LoRAExpertsMixin, BaseOAITritonExperts): input, quant_config.gemm1_clamp_limit, ) + elif activation == MoEActivation.SWIGLUOAI_UNINTERLEAVE: + assert quant_config.gemm1_clamp_limit is not None + alpha = ( + quant_config.gemm1_alpha + if quant_config.gemm1_alpha is not None + else 1.0 + ) + beta = ( + quant_config.gemm1_beta if quant_config.gemm1_beta is not None else 0.0 + ) + torch.ops._C.silu_and_mul_with_clamp( + output, input, quant_config.gemm1_clamp_limit, alpha, beta + ) else: super().activation(activation, output, input) diff --git a/vllm/model_executor/layers/fused_moe/oracle/mxfp4.py b/vllm/model_executor/layers/fused_moe/oracle/mxfp4.py index 87c44d92fd..ab76cea132 100644 --- a/vllm/model_executor/layers/fused_moe/oracle/mxfp4.py +++ b/vllm/model_executor/layers/fused_moe/oracle/mxfp4.py @@ -503,7 +503,18 @@ def select_mxfp4_moe_backend( activation_format, ) - if current_platform.is_cuda() or current_platform.is_rocm(): + if current_platform.is_rocm(): + backend = Mxfp4MoeBackend.TRITON_UNFUSED + logger.info_once(_make_log_backend(backend)) + return _return_or_raise( + Mxfp4MoeBackend.TRITON_UNFUSED, + config, + kMxfp4Static, + None, + activation_format, + ) + + if current_platform.is_cuda(): raise NotImplementedError( "No MXFP4 MoE backend supports the deployment configuration. " f"weight_key=kMxfp4Static, activation_key={activation_key}. " diff --git a/vllm/model_executor/layers/quantization/quark/quark_moe.py b/vllm/model_executor/layers/quantization/quark/quark_moe.py index 9ee901a991..703fc81501 100644 --- a/vllm/model_executor/layers/quantization/quark/quark_moe.py +++ b/vllm/model_executor/layers/quantization/quark/quark_moe.py @@ -1303,6 +1303,9 @@ class QuarkOCP_MX_MoEMethod(QuarkMoEMethod): w2_bias=getattr(layer, "w2_bias", None), a1_scale=getattr(layer, "w13_input_scale", None), a2_scale=getattr(layer, "w2_input_scale", None), + gemm1_alpha=getattr(layer, "swiglu_alpha", None), + gemm1_beta=getattr(layer, "swiglu_beta", None), + swiglu_limit=getattr(layer, "swiglu_limit", None), ) # Emulation and other schemes @@ -1339,6 +1342,9 @@ class QuarkOCP_MX_MoEMethod(QuarkMoEMethod): a1_scale=None, a2_scale=None, block_shape=None, + gemm1_alpha=getattr(layer, "swiglu_alpha", None), + gemm1_beta=getattr(layer, "swiglu_beta", None), + gemm1_clamp_limit=getattr(layer, "swiglu_limit", None), ) @property diff --git a/vllm/models/minimax_m3/amd/model.py b/vllm/models/minimax_m3/amd/model.py index 4bd9244472..54d1beb7d4 100644 --- a/vllm/models/minimax_m3/amd/model.py +++ b/vllm/models/minimax_m3/amd/model.py @@ -924,6 +924,11 @@ class MiniMaxM3Model(nn.Module, EagleModelMixin): class MiniMaxM3SparseForCausalLM(nn.Module, SupportsEagle3): """MiniMax M3 (sparse/dense backbone) for causal language modeling.""" + packed_modules_mapping = { + "qkv_proj": ["q_proj", "k_proj", "v_proj"], + "gate_up_proj": ["gate_proj", "up_proj"], + } + def __init__(self, *, vllm_config: VllmConfig, prefix: str = ""): super().__init__() config = vllm_config.model_config.hf_text_config @@ -987,14 +992,19 @@ class MiniMaxM3SparseForConditionalGeneration( # ranks (see ``_process_image_input`` / ``_process_video_input``). supports_encoder_tp_data = True + packed_modules_mapping = { + "qkv_proj": ["q_proj", "k_proj", "v_proj"], + "gate_up_proj": ["gate_proj", "up_proj"], + } + hf_to_vllm_mapper = WeightsMapper( orig_to_new_prefix={ "multi_modal_projector.": "vision_tower.multi_modal_projector.", "patch_merge_mlp.": "vision_tower.patch_merge_mlp.", }, orig_to_new_substr={ - ".mlp.fc1.": ".fc1.", - ".mlp.fc2.": ".fc2.", + ".mlp.fc1": ".fc1", + ".mlp.fc2": ".fc2", }, )