FIX: CUDA detection when no CUDA

+VersionUP (0.5.0 alpha5)
This commit is contained in:
Gourieff 2023-11-05 16:43:41 +07:00
parent d57dc191d6
commit 0fee58d4bf
5 changed files with 29 additions and 23 deletions

View File

@ -2,7 +2,7 @@
<img src="https://github.com/Gourieff/Assets/raw/main/sd-webui-reactor/ReActor_logo_red.png?raw=true" alt="logo" width="180px"/> <img src="https://github.com/Gourieff/Assets/raw/main/sd-webui-reactor/ReActor_logo_red.png?raw=true" alt="logo" width="180px"/>
![Version](https://img.shields.io/badge/version-0.5.0_alpha4-lightgreen?style=for-the-badge&labelColor=darkgreen) ![Version](https://img.shields.io/badge/version-0.5.0_alpha5-lightgreen?style=for-the-badge&labelColor=darkgreen)
<a href='https://ko-fi.com/gourieff' target='_blank'><img height='33' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a> <a href='https://ko-fi.com/gourieff' target='_blank'><img height='33' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>

View File

@ -2,7 +2,7 @@
<img src="https://github.com/Gourieff/Assets/raw/main/sd-webui-reactor/ReActor_logo_red.png?raw=true" alt="logo" width="180px"/> <img src="https://github.com/Gourieff/Assets/raw/main/sd-webui-reactor/ReActor_logo_red.png?raw=true" alt="logo" width="180px"/>
![Version](https://img.shields.io/badge/версия-0.5.0_alpha4-lightgreen?style=for-the-badge&labelColor=darkgreen) ![Version](https://img.shields.io/badge/версия-0.5.0_alpha5-lightgreen?style=for-the-badge&labelColor=darkgreen)
<a href='https://ko-fi.com/gourieff' target='_blank'><img height='33' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a> <a href='https://ko-fi.com/gourieff' target='_blank'><img height='33' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>

View File

@ -97,9 +97,9 @@ except:
with open(req_file) as file: with open(req_file) as file:
install_count = 0 install_count = 0
ort = "onnxruntime-gpu"
import torch
try: try:
ort = "onnxruntime-gpu"
import torch
if torch.cuda.is_available(): if torch.cuda.is_available():
if first_run: if first_run:
last_device = "CUDA" last_device = "CUDA"

View File

@ -1,7 +1,10 @@
import os, glob import os, glob
import gradio as gr import gradio as gr
from PIL import Image from PIL import Image
import torch.cuda as cuda try:
import torch.cuda as cuda
except:
cuda = None
from typing import List from typing import List
@ -136,24 +139,27 @@ class FaceSwapScript(scripts.Script):
) )
with gr.Tab("Settings"): with gr.Tab("Settings"):
models = get_models() models = get_models()
if cuda.is_available(): if cuda is not None:
with gr.Row(): if cuda.is_available():
device = gr.Radio( with gr.Row():
label="Execution Provider", device = gr.Radio(
choices=DEVICE_LIST, label="Execution Provider",
value=DEVICE, choices=DEVICE_LIST,
type="value", value=DEVICE,
info="If you already run 'Generate' - RESTART is required to apply. Click 'Save', (A1111) Extensions Tab -> 'Apply and restart UI' or (SD.Next) close the Server and start it again", type="value",
scale=2, info="If you already run 'Generate' - RESTART is required to apply. Click 'Save', (A1111) Extensions Tab -> 'Apply and restart UI' or (SD.Next) close the Server and start it again",
scale=2,
)
save_device_btn = gr.Button("Save", scale=0)
save = gr.Markdown("")
setattr(device, "do_not_save_to_config", True)
save_device_btn.click(
set_Device,
inputs=[device],
outputs=[save],
) )
save_device_btn = gr.Button("Save", scale=0) else:
save = gr.Markdown("") device = "CPU"
setattr(device, "do_not_save_to_config", True)
save_device_btn.click(
set_Device,
inputs=[device],
outputs=[save],
)
else: else:
device = "CPU" device = "CPU"
with gr.Row(): with gr.Row():

View File

@ -1,5 +1,5 @@
app_title = "ReActor" app_title = "ReActor"
version_flag = "v0.5.0-a4" version_flag = "v0.5.0-a5"
from scripts.reactor_logger import logger, get_Run, set_Run from scripts.reactor_logger import logger, get_Run, set_Run