mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2025-04-10 19:18:18 +02:00
Missing changes from main in beta, bad merge
This commit is contained in:
parent
396e54bad0
commit
30c46c0858
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
@echo. & echo "Stable Diffusion UI - v2" & echo.
|
@echo. & echo "Stable Diffusion UI - v2" & echo.
|
||||||
|
|
||||||
@REM set PATH=C:\Windows\System32;%PATH%
|
set PATH=C:\Windows\System32;%PATH%
|
||||||
|
|
||||||
@cd ..
|
@cd ..
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
@echo conda_sd_env_created >> ..\scripts\install_status.txt
|
@echo conda_sd_env_created >> ..\scripts\install_status.txt
|
||||||
)
|
)
|
||||||
|
|
||||||
@REM set PATH=C:\Windows\System32;%PATH%
|
set PATH=C:\Windows\System32;%PATH%
|
||||||
|
|
||||||
@>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
|
@>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
|
||||||
@if "%ERRORLEVEL%" EQU "0" (
|
@if "%ERRORLEVEL%" EQU "0" (
|
||||||
@ -148,13 +148,13 @@
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@REM call WHERE uvicorn > .tmp
|
call WHERE uvicorn > .tmp
|
||||||
@REM @>nul grep -c "uvicorn" .tmp
|
@>nul grep -c "uvicorn" .tmp
|
||||||
@REM @if "%ERRORLEVEL%" NEQ "0" (
|
@if "%ERRORLEVEL%" NEQ "0" (
|
||||||
@REM @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
|
@echo. & echo "UI packages not found! Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
|
||||||
@REM pause
|
pause
|
||||||
@REM exit /b
|
exit /b
|
||||||
@REM )
|
)
|
||||||
|
|
||||||
@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
|
@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
|
||||||
@if "%ERRORLEVEL%" NEQ "0" (
|
@if "%ERRORLEVEL%" NEQ "0" (
|
||||||
@ -173,9 +173,8 @@
|
|||||||
for %%K in ("sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
|
for %%K in ("sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
|
||||||
echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the Waifu Model."
|
echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the Waifu Model."
|
||||||
) else (
|
) else (
|
||||||
@REM echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
|
echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
|
||||||
@REM del "sd-v1-4.ckpt"
|
del "sd-v1-4.ckpt"
|
||||||
echo. & echo "It looks like you're using a custom weights file. File size: %%~zK bytes" & echo.
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -4,4 +4,7 @@ source installer/bin/activate
|
|||||||
|
|
||||||
conda-unpack
|
conda-unpack
|
||||||
|
|
||||||
|
conda --version
|
||||||
|
git --version
|
||||||
|
|
||||||
scripts/on_env_start.sh
|
scripts/on_env_start.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user