remove conflicts

Former-commit-id: f8b637eb76cba7ec229e2978068805ad1cca8adb
2024-04-25 00:34:22 +08:00
parent 12c51655ce 36be12a3b7
commit 6c1db2d012
32 changed files with 965 additions and 471 deletions
--- a/src/llmtuner/model/init.py
+++ b/src/llmtuner/model/init.py
@@ -1,7 +1,8 @@
-from .loader import load_model, load_tokenizer, load_processor, load_mm_model
-from .utils import find_all_linear_modules, load_valuehead_params
+from .loader import load_config, load_model, load_tokenizer, load_mm_model
+from .utils.misc import find_all_linear_modules, load_valuehead_params

 __all__ = [
+    "load_config",
    "load_model",
    "load_mm_model",
    "load_tokenizer",