diff --git a/installer/bootstrap/check-install-dir.bat b/installer/bootstrap/check-install-dir.bat index b2509b00..5cfc7c3b 100644 --- a/installer/bootstrap/check-install-dir.bat +++ b/installer/bootstrap/check-install-dir.bat @@ -1,5 +1,7 @@ @echo off +if exist "%SD_BASE_DIR%\env" exit /b + 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. diff --git a/installer/installer/tasks/fetch_project_repo.py b/installer/installer/tasks/fetch_project_repo.py index 46e27560..11f1f549 100644 --- a/installer/installer/tasks/fetch_project_repo.py +++ b/installer/installer/tasks/fetch_project_repo.py @@ -17,7 +17,9 @@ def run(): helpers.log("\nDownloading Stable Diffusion UI..\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") else: helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion UI") diff --git a/installer/installer/tasks/fetch_stable_diffusion_repo.py b/installer/installer/tasks/fetch_stable_diffusion_repo.py index be9e2eab..cd2deeec 100644 --- a/installer/installer/tasks/fetch_stable_diffusion_repo.py +++ b/installer/installer/tasks/fetch_stable_diffusion_repo.py @@ -29,7 +29,9 @@ def fetch_repo(): helpers.log("\nDownloading Stable Diffusion..\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") else: helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion") diff --git a/installer/yaml/sd-environment-win-linux-nvidia.yaml b/installer/yaml/sd-environment-win-linux-nvidia.yaml index d9775f42..d92c0d9a 100644 --- a/installer/yaml/sd-environment-win-linux-nvidia.yaml +++ b/installer/yaml/sd-environment-win-linux-nvidia.yaml @@ -2,13 +2,14 @@ name: ldm channels: - pytorch - defaults + - conda-forge dependencies: - python=3.10.5 - pip=20.3 - cudatoolkit=11.3 - pytorch=1.11.0 - torchvision=0.12.0 - - numpy=1.19.2 + - numpy=1.23.2 - antlr4-python3-runtime=4.8 - pip: - albumentations==0.4.3 @@ -24,8 +25,6 @@ dependencies: - torch-fidelity==0.3.0 - transformers==4.19.2 - torchmetrics==0.6.0 - - pywavelets==1.3.0 - - pandas==1.4.4 - kornia==0.6 - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers - -e git+https://github.com/openai/CLIP.git@main#egg=clip