From e6da2d135b13b178122b808b91e25e3a1f3320b1 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:45:04 -0600
Subject: [PATCH] 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