[MoE] Move PF Methods to Folder (#35927)

vllm/model_executor/layers/fused_moe/all2all_utils.py

@@ -15,12 +15,6 @@ from vllm.model_executor.layers.fused_moe.config import (
     FusedMoEParallelConfig,
     FusedMoEQuantConfig,
 )
-from vllm.model_executor.layers.fused_moe.flashinfer_nvlink_one_sided_prepare_finalize import (  # noqa: E501
-    FlashInferNVLinkOneSidedPrepareAndFinalize,
-)
-from vllm.model_executor.layers.fused_moe.flashinfer_nvlink_two_sided_prepare_finalize import (  # noqa: E501
-    FlashInferNVLinkTwoSidedPrepareAndFinalize,
-)
 from vllm.model_executor.layers.fused_moe.modular_kernel import (
     FusedMoEPrepareAndFinalize,
 )
@@ -28,6 +22,12 @@ from vllm.model_executor.layers.fused_moe.prepare_finalize import (
     make_moe_prepare_and_finalize_naive_dp_ep,
     make_moe_prepare_and_finalize_no_dp_ep,
 )
+from vllm.model_executor.layers.fused_moe.prepare_finalize.flashinfer_nvlink_one_sided import (  # noqa: E501
+    FlashInferNVLinkOneSidedPrepareAndFinalize,
+)
+from vllm.model_executor.layers.fused_moe.prepare_finalize.flashinfer_nvlink_two_sided import (  # noqa: E501
+    FlashInferNVLinkTwoSidedPrepareAndFinalize,
+)
 from vllm.platforms import current_platform
 from vllm.utils.import_utils import has_deep_ep, has_mori, has_nixl_ep
 
@@ -35,8 +35,8 @@ logger = init_logger(__name__)
 
 if current_platform.is_cuda_alike():
     if has_deep_ep():
-        from .deepep_ht_prepare_finalize import DeepEPHTPrepareAndFinalize
-        from .deepep_ll_prepare_finalize import (
+        from .prepare_finalize.deepep_ht import DeepEPHTPrepareAndFinalize
+        from .prepare_finalize.deepep_ll import (
             DEEPEP_QUANT_BLOCK_SHAPE,
             DeepEPLLPrepareAndFinalize,
         )

vllm/model_executor/layers/fused_moe/prepare_finalize/__init__.py

@@ -19,4 +19,7 @@ __all__ = [
     "MoEPrepareAndFinalizeNoDPEPMonolithic",
     "MoEPrepareAndFinalizeNoDPEPModular",
     "make_moe_prepare_and_finalize_no_dp_ep",
+    # deepep_ht, deepep_ll, and flashinfer_a2a are not
+    # imported here as they have optional dependencies (deep_ep, flashinfer).
+    # Import them directly from their modules as needed.
 ]