fix circular import and remove extra imports from config

llmfoundry/models/mpt/configuration_mpt.py

@@ -15,21 +15,12 @@
     is_flash_v2_installed,
 )
 
-# NOTE: All utils are imported directly even if unused so that
-# HuggingFace can detect all the needed files to copy into its modules folder.
-# Otherwise, certain modules are missing.
-# isort: off
-from llmfoundry.models.layers.norm import LPLayerNorm  # type: ignore (see note)
-from llmfoundry.models.layers.layer_builders import build_norm, build_fc, build_ffn  # type: ignore (see note)
-from llmfoundry.models.layers.dmoe import dMoE  # type: ignore (see note)
-from llmfoundry.layers_registry import norms  # type: ignore (see note)
-from llmfoundry.utils.registry_utils import construct_from_registry  # type: ignore (see note)
 from llmfoundry.models.utils.config_defaults import (
     attn_config_defaults,
     ffn_config_defaults,
     init_config_defaults,
     fc_type_defaults,
-)  # type: ignore (see note)
+)
 
 
 class MPTConfig(PretrainedConfig):

llmfoundry/utils/huggingface_hub_utils.py

@@ -288,8 +288,9 @@ def edit_files_for_hf_compatibility(
         existing_relative_imports = get_all_relative_imports(
             os.path.join(folder, entrypoint),
         )
-        # Add in self so we don't create a circular import
-        existing_relative_imports.add(os.path.splitext(entrypoint)[0])
+        # Add in all entrypoints so we don't create a circular import
+        for sub_entrypoint in entrypoint_files:
+            existing_relative_imports.add(os.path.splitext(sub_entrypoint)[0])
         missing_relative_imports = all_relative_imports - existing_relative_imports
         add_relative_imports(
             os.path.join(folder, entrypoint),