From 9f6e0c1c8f6af6854987a5caa94bb4eb00b3817f Mon Sep 17 00:00:00 2001 From: bmaltais Date: Thu, 30 Mar 2023 07:23:37 -0400 Subject: [PATCH 1/2] Fix issue with LyCORIS version --- README.md | 2 ++ requirements.txt | 3 ++- tools/validate_requirements.py | 14 +++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15030b7..c6e89c7 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,8 @@ This will store your a backup file with your current locally installed pip packa ## Change History +* 2023/03/30 (v21.3.8) + - Fix issue with LyCORIS version not being found: https://github.com/bmaltais/kohya_ss/issues/481 * 2023/03/29 (v21.3.7) - Allow for 0.1 increment in Network and Conv alpha values: https://github.com/bmaltais/kohya_ss/pull/471 Thanks to @srndpty - Updated Lycoris module version diff --git a/requirements.txt b/requirements.txt index f8a1e88..5881d6e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,6 +25,7 @@ timm==0.6.12 huggingface-hub==0.13.0 tensorflow==2.10.1 # For locon support -lycoris_lora==0.1.4 +lycoris-lora @ git+https://github.com/KohakuBlueleaf/LyCORIS.git@c3d925421209a22a60d863ffa3de0b3e7e89f047 +# lycoris_lora==0.1.4 # for kohya_ss library . \ No newline at end of file diff --git a/tools/validate_requirements.py b/tools/validate_requirements.py index 948c21f..86f09d5 100644 --- a/tools/validate_requirements.py +++ b/tools/validate_requirements.py @@ -25,7 +25,19 @@ for requirement in requirements: try: pkg_resources.require(requirement) except pkg_resources.DistributionNotFound: - missing_requirements.append(requirement) + # Check if the requirement contains a VCS URL + if "@" in requirement: + # If it does, split the requirement into two parts: the package name and the VCS URL + package_name, vcs_url = requirement.split("@", 1) + # Use pip to install the package from the VCS URL + os.system(f"pip install -e {vcs_url}") + # Try to require the package again + try: + pkg_resources.require(package_name) + except pkg_resources.DistributionNotFound: + missing_requirements.append(requirement) + else: + missing_requirements.append(requirement) except pkg_resources.VersionConflict as e: wrong_version_requirements.append((requirement, str(e.req), e.dist.version)) From e6da2d135b13b178122b808b91e25e3a1f3320b1 Mon Sep 17 00:00:00 2001 From: missionfloyd Date: Fri, 31 Mar 2023 16:45:04 -0600 Subject: [PATCH 2/2] Add setup/upgrade batch files --- README.md | 35 +++++++---------------------------- setup.bat | 13 +++++++++++++ upgrade.bat | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 setup.bat create mode 100644 upgrade.bat diff --git a/README.md b/README.md index c6e89c7..3614d94 100644 --- a/README.md +++ b/README.md @@ -64,36 +64,19 @@ cd kohya_ss bash ubuntu_setup.sh ``` -then configure accelerate with the same answers as in the Windows instructions when prompted. +then configure accelerate with the same answers as in the MacOS instructions when prompted. ### Windows +In the terminal, run -Give unrestricted script access to powershell so venv can work: - -- Run PowerShell as an administrator -- Run `Set-ExecutionPolicy Unrestricted` and answer 'A' -- Close PowerShell - -Open a regular user Powershell terminal and run the following commands: - -```powershell +``` git clone https://github.com/bmaltais/kohya_ss.git cd kohya_ss - -python -m venv venv -.\venv\Scripts\activate - -pip install torch==1.12.1+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116 -pip install --use-pep517 --upgrade -r requirements.txt -pip install -U -I --no-deps https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl - -cp .\bitsandbytes_windows\*.dll .\venv\Lib\site-packages\bitsandbytes\ -cp .\bitsandbytes_windows\cextension.py .\venv\Lib\site-packages\bitsandbytes\cextension.py -cp .\bitsandbytes_windows\main.py .\venv\Lib\site-packages\bitsandbytes\cuda_setup\main.py - -accelerate config +setup.bat ``` +then configure accelerate with the same answers as in the MacOS instructions when prompted. + ### Optional: CUDNN 8.6 This step is optional but can improve the learning speed for NVIDIA 30X0/40X0 owners. It allows for larger training batch size and faster training speed. @@ -125,11 +108,7 @@ Once the commands have completed successfully you should be ready to use the new When a new release comes out, you can upgrade your repo with the following commands in the root directory: ```powershell -git pull - -.\venv\Scripts\activate - -pip install --use-pep517 --upgrade -r requirements.txt +upgrade.bat ``` Once the commands have completed successfully you should be ready to use the new version. diff --git a/setup.bat b/setup.bat new file mode 100644 index 0000000..2c84356 --- /dev/null +++ b/setup.bat @@ -0,0 +1,13 @@ +@echo off +python -m venv venv +call .\venv\Scripts\activate.bat + +pip install torch==1.12.1+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116 +pip install --use-pep517 --upgrade -r requirements.txt +pip install -U -I --no-deps https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl + +copy /y .\bitsandbytes_windows\*.dll .\venv\Lib\site-packages\bitsandbytes\ +copy /y .\bitsandbytes_windows\cextension.py .\venv\Lib\site-packages\bitsandbytes\cextension.py +copy /y .\bitsandbytes_windows\main.py .\venv\Lib\site-packages\bitsandbytes\cuda_setup\main.py + +accelerate config \ No newline at end of file diff --git a/upgrade.bat b/upgrade.bat new file mode 100644 index 0000000..787df73 --- /dev/null +++ b/upgrade.bat @@ -0,0 +1,16 @@ +@echo off +:: Check if there are any changes that need to be committed +git status --short +if %errorlevel%==1 ( + echo There are changes that need to be committed. Please stash or undo your changes before running this script. + exit +) + +:: Pull the latest changes from the remote repository +git pull + +:: Activate the virtual environment +call .\venv\Scripts\activate.baT + +:: Upgrade the required packages +pip install --upgrade -r requirements.txt \ No newline at end of file