fix

Author: hiworldwzj

lightllm/models/__init__.py

@@ -1,28 +1,37 @@
-import os
-import importlib
-import inspect
-from pathlib import Path
-
-
-def auto_import_models():
-    """
-    Automatically imports all classes from model.py files in model directories
-    """
-    base_dir = os.path.dirname(os.path.abspath(__file__))
-    models_dir = Path(base_dir)
-    for model_dir in models_dir.iterdir():
-        if not model_dir.is_dir():
-            continue
-        model_file = model_dir / "model.py"
-        if not model_file.exists():
-            continue
-        module_path = f"lightllm.models.{model_dir.name}.model"
-
-        try:
-            importlib.import_module(module_path)
-        except:
-            pass
-
-
-auto_import_models()
-from .registry import get_model
+from lightllm.models.cohere.model import CohereTpPartModel
+from lightllm.models.mixtral.model import MixtralTpPartModel
+from lightllm.models.bloom.model import BloomTpPartModel
+from lightllm.models.llama.model import LlamaTpPartModel
+from lightllm.models.starcoder.model import StarcoderTpPartModel
+from lightllm.models.starcoder2.model import Starcoder2TpPartModel
+from lightllm.models.qwen.model import QWenTpPartModel
+from lightllm.models.qwen2.model import Qwen2TpPartModel
+from lightllm.models.qwen3.model import Qwen3TpPartModel
+from lightllm.models.qwen3_moe.model import Qwen3MOEModel
+from lightllm.models.chatglm2.model import ChatGlm2TpPartModel
+from lightllm.models.internlm.model import InternlmTpPartModel
+from lightllm.models.stablelm.model import StablelmTpPartModel
+from lightllm.models.internlm2.model import Internlm2TpPartModel
+from lightllm.models.internlm2_reward.model import Internlm2RewardTpPartModel
+from lightllm.models.mistral.model import MistralTpPartModel
+from lightllm.models.minicpm.model import MiniCPMTpPartModel
+from lightllm.models.llava.model import LlavaTpPartModel
+from lightllm.models.qwen_vl.model import QWenVLTpPartModel
+from lightllm.models.gemma_2b.model import Gemma_2bTpPartModel
+from lightllm.models.phi3.model import Phi3TpPartModel
+from lightllm.models.deepseek2.model import Deepseek2TpPartModel
+from lightllm.models.internvl.model import (
+    InternVLLlamaTpPartModel,
+    InternVLPhi3TpPartModel,
+    InternVLQwen2TpPartModel,
+    InternVLDeepSeek2TpPartModel,
+)
+from lightllm.models.internvl.model import InternVLInternlm2TpPartModel
+from lightllm.models.qwen2_vl.model import Qwen2VLTpPartModel
+from lightllm.models.qwen2_reward.model import Qwen2RewardTpPartModel
+from lightllm.models.gemma3.model import Gemma3TpPartModel
+from lightllm.models.tarsier2.model import (
+    Tarsier2Qwen2TpPartModel,
+    Tarsier2Qwen2VLTpPartModel,
+    Tarsier2LlamaTpPartModel,
+)

lightllm/models/registry.py

@@ -45,8 +45,6 @@ def get_model(self, model_cfg: dict, model_kvargs: dict) -> tuple:
         """Get model"""
         model_type = model_cfg.get("model_type", "")
         configs = self._registry.get(model_type, [])
-        model = None
-        is_multimodal = False
         matches = []
         for cfg in configs:
             if cfg.condition is None or cfg.condition(model_cfg):