diff --git a/src/llamafactory/cli.py b/src/llamafactory/cli.py index 3aa51535..6fb4b236 100644 --- a/src/llamafactory/cli.py +++ b/src/llamafactory/cli.py @@ -25,12 +25,13 @@ USAGE = ( + "| Usage: |\n" + "| llamafactory-cli api -h: launch an OpenAI-style API server |\n" + "| llamafactory-cli chat -h: launch a chat interface in CLI |\n" - + "| llamafactory-cli eval -h: evaluate models |\n" + "| llamafactory-cli export -h: merge LoRA adapters and export model |\n" + "| llamafactory-cli train -h: train models |\n" + "| llamafactory-cli webchat -h: launch a chat interface in Web UI |\n" + "| llamafactory-cli webui: launch LlamaBoard |\n" + + "| llamafactory-cli env: show environment info |\n" + "| llamafactory-cli version: show version info |\n" + + "| Hint: You can use `lmf` as a shortcut for `llamafactory-cli`. |\n" + "-" * 70 ) @@ -48,9 +49,7 @@ def _run_chat(): def _run_eval(): - from .eval.evaluator import run_eval - - return run_eval() + raise NotImplementedError("Evaluation will be deprecated in the future.") def _export_model(): diff --git a/src/llamafactory/extras/env.py b/src/llamafactory/extras/env.py index 6b676a61..82d89b69 100644 --- a/src/llamafactory/extras/env.py +++ b/src/llamafactory/extras/env.py @@ -15,22 +15,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os -import platform - -import accelerate -import datasets -import peft -import torch -import transformers -import trl -from transformers.utils import is_torch_cuda_available, is_torch_npu_available - VERSION = "0.9.4.dev0" def print_env() -> None: + import os + import platform + + import accelerate + import datasets + import peft + import torch + import transformers + import trl + from transformers.utils import is_torch_cuda_available, is_torch_npu_available + info = { "`llamafactory` version": VERSION, "Platform": platform.platform(), diff --git a/src/llamafactory/launcher.py b/src/llamafactory/launcher.py index 169b042a..8d1435cf 100644 --- a/src/llamafactory/launcher.py +++ b/src/llamafactory/launcher.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from llamafactory.train.tuner import run_exp # use absolute import - def launch(): + from llamafactory.train.tuner import run_exp # use absolute import + run_exp() diff --git a/src/llamafactory/v1/__init__.py b/src/llamafactory/v1/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/core/__init__.py b/src/llamafactory/v1/core/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/core/base_trainer.py b/src/llamafactory/v1/core/base_trainer.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/core/chat_sampler.py b/src/llamafactory/v1/core/chat_sampler.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/core/data_loader.py b/src/llamafactory/v1/core/data_loader.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/core/model_engine.py b/src/llamafactory/v1/core/model_engine.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/launcher.py b/src/llamafactory/v1/launcher.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/__init__.py b/src/llamafactory/v1/plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/data_plugins/__init__.py b/src/llamafactory/v1/plugins/data_plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/data_plugins/converter.py b/src/llamafactory/v1/plugins/data_plugins/converter.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/model_plugins/__init__.py b/src/llamafactory/v1/plugins/model_plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/model_plugins/peft.py b/src/llamafactory/v1/plugins/model_plugins/peft.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/sampler_plugins/__init__.py b/src/llamafactory/v1/plugins/sampler_plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/sampler_plugins/vllm.py b/src/llamafactory/v1/plugins/sampler_plugins/vllm.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/trainer_plugins/__init__.py b/src/llamafactory/v1/plugins/trainer_plugins/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/plugins/trainer_plugins/accelerate.py b/src/llamafactory/v1/plugins/trainer_plugins/accelerate.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/trainers/__init__.py b/src/llamafactory/v1/trainers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/trainers/dpo_trainer.py b/src/llamafactory/v1/trainers/dpo_trainer.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/trainers/rm_trainer.py b/src/llamafactory/v1/trainers/rm_trainer.py new file mode 100644 index 00000000..e69de29b diff --git a/src/llamafactory/v1/trainers/sft_trainer.py b/src/llamafactory/v1/trainers/sft_trainer.py new file mode 100644 index 00000000..e69de29b