remove guard for moe

Signed-off-by: Masahiro Tanaka <mtanaka@anyscale.com>

Author: tohtana

deepspeed/ops/transformer/__init__.py

@@ -3,39 +3,7 @@
 
 # DeepSpeed Team
 
-from importlib import import_module
-from typing import TYPE_CHECKING
-
 from .transformer import DeepSpeedTransformerLayer, DeepSpeedTransformerConfig
 from .inference.config import DeepSpeedInferenceConfig
 from ...model_implementations.transformers.ds_transformer import DeepSpeedTransformerInference
-
-if TYPE_CHECKING:
-    from .inference.moe_inference import DeepSpeedMoEInference, DeepSpeedMoEInferenceConfig
-
-_MOE_LAZY_IMPORTS = {
-    "DeepSpeedMoEInferenceConfig": ".inference.moe_inference",
-    "DeepSpeedMoEInference": ".inference.moe_inference",
-}
-
-__all__ = [
-    "DeepSpeedTransformerLayer",
-    "DeepSpeedTransformerConfig",
-    "DeepSpeedInferenceConfig",
-    "DeepSpeedTransformerInference",
-    *_MOE_LAZY_IMPORTS,
-]
-
-
-def __getattr__(name):
-    module_path = _MOE_LAZY_IMPORTS.get(name)
-    if module_path is None:
-        raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-    module = import_module(module_path, __name__)
-    value = getattr(module, name)
-    globals()[name] = value
-    return value
-
-
-def __dir__():
-    return sorted(set(globals()) | set(__all__))
+from .inference.moe_inference import DeepSpeedMoEInferenceConfig, DeepSpeedMoEInference

deepspeed/ops/transformer/inference/__init__.py

@@ -3,36 +3,6 @@
 
 # DeepSpeed Team
 
-from importlib import import_module
-from typing import TYPE_CHECKING
-
 from .config import DeepSpeedInferenceConfig
 from ....model_implementations.transformers.ds_transformer import DeepSpeedTransformerInference
-
-if TYPE_CHECKING:
-    from .moe_inference import DeepSpeedMoEInference, DeepSpeedMoEInferenceConfig
-
-_MOE_LAZY_IMPORTS = {
-    "DeepSpeedMoEInferenceConfig": ".moe_inference",
-    "DeepSpeedMoEInference": ".moe_inference",
-}
-
-__all__ = [
-    "DeepSpeedInferenceConfig",
-    "DeepSpeedTransformerInference",
-    *_MOE_LAZY_IMPORTS,
-]
-
-
-def __getattr__(name):
-    module_path = _MOE_LAZY_IMPORTS.get(name)
-    if module_path is None:
-        raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-    module = import_module(module_path, __name__)
-    value = getattr(module, name)
-    globals()[name] = value
-    return value
-
-
-def __dir__():
-    return sorted(set(globals()) | set(__all__))
+from .moe_inference import DeepSpeedMoEInferenceConfig, DeepSpeedMoEInference