From 6d823eb371757df53eb6570f14be109b44b8924e Mon Sep 17 00:00:00 2001 From: Soma Nakamura Date: Thu, 10 Jul 2025 22:43:31 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=93=E3=82=93=E3=81=AB=E3=81=A1=E3=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 -- .python-version | 1 - README.md | 17 ++++++++--------- docs/README.md | 5 ++--- pyproject.toml | 26 -------------------------- requirements.txt | 1 - scripts/train_gemma3_1b_8gpu.sh | 14 ++++---------- scripts/train_multi_gpu.py | 10 +++------- uv.lock | 7 ------- 9 files changed, 17 insertions(+), 66 deletions(-) delete mode 100644 .python-version delete mode 100644 pyproject.toml delete mode 100644 uv.lock diff --git a/.gitignore b/.gitignore index d8c85a5..fc079b6 100644 --- a/.gitignore +++ b/.gitignore @@ -31,5 +31,3 @@ hostfile .DS_Store *~ -# Keep lock files -!uv.lock \ No newline at end of file diff --git a/.python-version b/.python-version deleted file mode 100644 index 902b2c9..0000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.11 \ No newline at end of file diff --git a/README.md b/README.md index 9ea360c..58e2f74 100644 --- a/README.md +++ b/README.md @@ -5,16 +5,15 @@ Progressive training for LLMs with 8-GPU support for 松尾研LLMコンペ2025. ## Quick Start ```bash -# Install uv -curl -LsSf https://astral.sh/uv/install.sh | sh - # Setup project git clone cd progressive-llm-training -uv sync + +# Install dependencies +pip install -r requirements.txt # Start training -uv run scripts/train_progressive.py --config config/training_config_gemma3_1b.yaml +python scripts/train_progressive.py --config config/training_config_gemma3_1b.yaml ./scripts/train_gemma3_1b_8gpu.sh --strategy deepspeed ``` @@ -27,10 +26,10 @@ uv run scripts/train_progressive.py --config config/training_config_gemma3_1b.ya ## Commands ```bash -uv sync # Install dependencies -uv run scripts/train_progressive.py --config config/training_config_gemma3_1b.yaml # Single GPU -./scripts/train_gemma3_1b_8gpu.sh --strategy deepspeed # 8 GPUs -uv run pytest # Run tests +pip install -r requirements.txt # Install dependencies +python scripts/train_progressive.py --config config/training_config_gemma3_1b.yaml # Single GPU +./scripts/train_gemma3_1b_8gpu.sh --strategy deepspeed # 8 GPUs +pytest # Run tests ``` ## Key Files diff --git a/docs/README.md b/docs/README.md index 6581458..a358582 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,15 +3,14 @@ ## Setup ```bash -curl -LsSf https://astral.sh/uv/install.sh | sh -uv sync +pip install -r requirements.txt ``` ## Training ### Single GPU ```bash -uv run scripts/train_progressive.py --config config/training_config_gemma3_1b.yaml +python scripts/train_progressive.py --config config/training_config_gemma3_1b.yaml ``` ### 8 GPUs diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 573bccd..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,26 +0,0 @@ -[project] -name = "progressive-llm-training" -version = "0.1.0" -description = "Progressive LLM Training for 松尾研LLMコンペ2025" -requires-python = ">=3.9" - -dependencies = [ - "torch>=2.0.0", - "transformers>=4.40.0", - "accelerate>=0.27.0", - "peft>=0.11.0", - "trl>=0.9.0", - "datasets>=2.18.0", - "bitsandbytes>=0.43.0", - "wandb>=0.16.0", - "pyyaml>=6.0", - "jsonlines>=4.0.0", - "deepspeed>=0.12.0", -] - -[project.optional-dependencies] -dev = ["pytest", "black", "isort"] - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f521a17..ca2950d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -# Use uv instead: uv sync torch>=2.0.0 transformers>=4.40.0 accelerate>=0.27.0 diff --git a/scripts/train_gemma3_1b_8gpu.sh b/scripts/train_gemma3_1b_8gpu.sh index 0c4ca81..fbda9d7 100755 --- a/scripts/train_gemma3_1b_8gpu.sh +++ b/scripts/train_gemma3_1b_8gpu.sh @@ -7,17 +7,11 @@ GREEN='\033[0;32m' YELLOW='\033[1;33m' NC='\033[0m' # No Color -echo -e "${GREEN}Progressive LLM Training - Gemma3 1B 8GPU Launcher (uv)${NC}" -echo "=======================================================" +echo -e "${GREEN}Progressive LLM Training - Gemma3 1B 8GPU Launcher${NC}" +echo "==================================================" -# Check if uv is available -if command -v uv &> /dev/null; then - echo -e "${GREEN}Using uv for Python environment management${NC}" - UV_PREFIX="uv run" -else - echo -e "${YELLOW}uv not found, using standard python${NC}" - UV_PREFIX="python" -fi +# Use standard python +UV_PREFIX="python" # Default values STRATEGY="deepspeed" diff --git a/scripts/train_multi_gpu.py b/scripts/train_multi_gpu.py index 5cc278f..2e40abc 100755 --- a/scripts/train_multi_gpu.py +++ b/scripts/train_multi_gpu.py @@ -8,7 +8,6 @@ import os import sys import argparse import subprocess -import shutil import torch from pathlib import Path @@ -51,8 +50,7 @@ def launch_ddp_training(config_path, num_gpus): setup_environment_for_strategy("ddp") # Use torchrun for DDP - # Check if uv is available - python_cmd = ["uv", "run", "scripts/train_progressive.py"] if shutil.which("uv") else ["python", "scripts/train_progressive.py"] + python_cmd = ["python", "scripts/train_progressive.py"] cmd = [ "torchrun", @@ -106,8 +104,7 @@ use_cpu: false with open(config_file, "w") as f: f.write(accelerate_config) - # Check if uv is available - python_cmd = ["uv", "run", "scripts/train_progressive.py"] if shutil.which("uv") else ["python", "scripts/train_progressive.py"] + python_cmd = ["python", "scripts/train_progressive.py"] cmd = [ "accelerate", "launch", @@ -136,8 +133,7 @@ def launch_deepspeed_training(config_path, num_gpus): with open(hostfile, "w") as f: f.write(f"localhost slots={num_gpus}\n") - # Check if uv is available - python_cmd = ["uv", "run", "scripts/train_progressive.py"] if shutil.which("uv") else ["python", "scripts/train_progressive.py"] + python_cmd = ["python", "scripts/train_progressive.py"] cmd = [ "deepspeed", diff --git a/uv.lock b/uv.lock deleted file mode 100644 index f5d5904..0000000 --- a/uv.lock +++ /dev/null @@ -1,7 +0,0 @@ -# This file is automatically @generated by uv. -# It is not intended for manual editing. -version = 1 -requires-python = ">=3.9" - -# Note: This is a placeholder lock file. -# Run `uv lock` to generate the actual lock file with resolved dependencies. \ No newline at end of file