Merge branch 'KoboldAI:main' into united

This commit is contained in:
henk717 2022-07-30 21:46:25 +02:00 committed by GitHub
commit 71ea8b215a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions

View File

@ -14,7 +14,7 @@ if exist miniconda3\ (
echo This is required if you are switching modes, or if you get dependency errors in the game. echo This is required if you are switching modes, or if you get dependency errors in the game.
echo 1. Yes echo 1. Yes
echo 2. No echo 2. No
SET /P D=Type the number of the desired option and then press ENTER: SET /P D=Type the number of the desired option and then press ENTER:
) ELSE ( ) ELSE (
SET D=Workaround SET D=Workaround
) )
@ -25,7 +25,7 @@ echo Which installation mode would you like?
echo 1. Temporary Drive Letter (Mounts the folder as drive B:, more stable and portable) echo 1. Temporary Drive Letter (Mounts the folder as drive B:, more stable and portable)
echo 2. Subfolder (Traditional method, can't run in folder paths that contain spaces) echo 2. Subfolder (Traditional method, can't run in folder paths that contain spaces)
echo. echo.
SET /P M=Type the number of the desired option and then press ENTER: SET /P M=Type the number of the desired option and then press ENTER:
IF %M%==1 GOTO drivemap IF %M%==1 GOTO drivemap
IF %M%==2 GOTO subfolder IF %M%==2 GOTO subfolder
ECHO Incorrect choice ECHO Incorrect choice
@ -35,7 +35,7 @@ GOTO MODE
:drivemap :drivemap
echo 3 > loader.settings echo 3 > loader.settings
subst B: /D >nul subst B: /D >nul
mkdir miniconda3 mkdir miniconda3
subst B: miniconda3 subst B: miniconda3
SET TEMP=B:\ SET TEMP=B:\
SET TMP=B:\ SET TMP=B:\
@ -44,8 +44,7 @@ copy loader.settings B:\loader.settings
copy disconnect-kobold-drive.bat B:\disconnect-kobold-drive.bat copy disconnect-kobold-drive.bat B:\disconnect-kobold-drive.bat
B: B:
umamba.exe create -r B:\python\ -n base umamba.exe create -r B:\python\ -n base
IF %B%==1 umamba.exe install --no-shortcuts -r B:\python\ -n base -f "%~dp0\environments\huggingface.yml" -y --always-copy umamba.exe install --no-shortcuts -r B:\python\ -n base -f "%~dp0\environments\huggingface.yml" -y --always-copy
IF %B%==2 umamba.exe install --no-shortcuts -r B:\python\ -n base -f "%~dp0\environments\finetuneanon.yml" -y --always-copy
umamba.exe -r B:\ clean -a -y umamba.exe -r B:\ clean -a -y
rd B:\Python\pkgs /S /Q rd B:\Python\pkgs /S /Q
subst B: /d subst B: /d
@ -57,8 +56,7 @@ echo 2 > loader.settings
SET TEMP=%~DP0MINICONDA3 SET TEMP=%~DP0MINICONDA3
SET TMP=%~DP0MINICONDA3 SET TMP=%~DP0MINICONDA3
umamba.exe create -r miniconda3\ -n base umamba.exe create -r miniconda3\ -n base
IF %B%==1 umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\huggingface.yml -y --always-copy umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\huggingface.yml -y --always-copy
IF %B%==2 umamba.exe install --no-shortcuts -r miniconda3 -n base -f environments\finetuneanon.yml -y --always-copy
umamba.exe clean -a -y umamba.exe clean -a -y
rd miniconda3\Python\pkgs /S /Q rd miniconda3\Python\pkgs /S /Q
pause pause