Don't use git clone's exit status; Remove package overrides in env yaml

This commit is contained in:
cmdr2 2022-10-04 19:48:34 +05:30
parent 724e101edc
commit f17a00092a
4 changed files with 10 additions and 5 deletions

View File

@ -1,5 +1,7 @@
@echo off @echo off
if exist "%SD_BASE_DIR%\env" exit /b
set suggested_dir=%~d0\stable-diffusion-ui set suggested_dir=%~d0\stable-diffusion-ui
echo "Please install Stable Diffusion UI at the root of your drive. This avoids problems with path length limits in Windows." & echo. echo "Please install Stable Diffusion UI at the root of your drive. This avoids problems with path length limits in Windows." & echo.

View File

@ -17,7 +17,9 @@ def run():
helpers.log("\nDownloading Stable Diffusion UI..\n") helpers.log("\nDownloading Stable Diffusion UI..\n")
helpers.log(f"Using the {branch_name} channel\n") helpers.log(f"Using the {branch_name} channel\n")
if helpers.run(f'git clone {app.PROJECT_REPO_URL} "{app.project_repo_dir_path}"'): helpers.run(f'git clone {app.PROJECT_REPO_URL} "{app.project_repo_dir_path}"')
if path.exists(project_repo_git_path):
helpers.log("Downloaded Stable Diffusion UI") helpers.log("Downloaded Stable Diffusion UI")
else: else:
helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion UI") helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion UI")

View File

@ -29,7 +29,9 @@ def fetch_repo():
helpers.log("\nDownloading Stable Diffusion..\n") helpers.log("\nDownloading Stable Diffusion..\n")
helpers.log(f"Using commit: {commit_id}\n") helpers.log(f"Using commit: {commit_id}\n")
if helpers.run(f'git clone {app.STABLE_DIFFUSION_REPO_URL} "{app.stable_diffusion_repo_dir_path}"'): if helpers.run(f'git clone {app.STABLE_DIFFUSION_REPO_URL} "{app.stable_diffusion_repo_dir_path}"')
if path.exists(stable_diffusion_repo_git_path):
helpers.log("Downloaded Stable Diffusion") helpers.log("Downloaded Stable Diffusion")
else: else:
helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion") helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion")

View File

@ -2,13 +2,14 @@ name: ldm
channels: channels:
- pytorch - pytorch
- defaults - defaults
- conda-forge
dependencies: dependencies:
- python=3.10.5 - python=3.10.5
- pip=20.3 - pip=20.3
- cudatoolkit=11.3 - cudatoolkit=11.3
- pytorch=1.11.0 - pytorch=1.11.0
- torchvision=0.12.0 - torchvision=0.12.0
- numpy=1.19.2 - numpy=1.23.2
- antlr4-python3-runtime=4.8 - antlr4-python3-runtime=4.8
- pip: - pip:
- albumentations==0.4.3 - albumentations==0.4.3
@ -24,8 +25,6 @@ dependencies:
- torch-fidelity==0.3.0 - torch-fidelity==0.3.0
- transformers==4.19.2 - transformers==4.19.2
- torchmetrics==0.6.0 - torchmetrics==0.6.0
- pywavelets==1.3.0
- pandas==1.4.4
- kornia==0.6 - kornia==0.6
- -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
- -e git+https://github.com/openai/CLIP.git@main#egg=clip - -e git+https://github.com/openai/CLIP.git@main#egg=clip