From 554650c18dc8025495e8fe402a60ce355fafec6d Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 27 Oct 2022 22:51:45 +0530 Subject: [PATCH] Fix a bug where the device wouldn't get set if no cuda-compatible hardware was found --- scripts/on_sd_start.bat | 4 ++-- scripts/on_sd_start.sh | 4 ++-- ui/sd_internal/runtime.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index a60810dc..3edd02bd 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -1,7 +1,7 @@ @echo off -@copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y -@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y +@REM @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y +@REM @copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y if exist "%cd%\profile" ( set USERPROFILE=%cd%\profile diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index ccdf186b..2e56de0b 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -1,7 +1,7 @@ #!/bin/bash -cp sd-ui-files/scripts/on_env_start.sh scripts/ -cp sd-ui-files/scripts/bootstrap.sh scripts/ +#cp sd-ui-files/scripts/on_env_start.sh scripts/ +#cp sd-ui-files/scripts/bootstrap.sh scripts/ # activate the installer env CONDA_BASEPATH=$(conda info --base) diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py index 8687e8ec..5f4191e2 100644 --- a/ui/sd_internal/runtime.py +++ b/ui/sd_internal/runtime.py @@ -113,6 +113,7 @@ def device_init(device_selection=None): return if not torch.cuda.is_available(): print('WARNING: torch.cuda is not available. Using the CPU, but this will be very slow!') + thread_data.device = 'cpu' return device_count = torch.cuda.device_count() if device_count <= 1 and device_selection == 'auto':