FIX: AMD/MacM1,2 not launch issue

Issues: #175 #176 #177
VersionUP (0.5.0 beta1)
Thanks @darktar for the help in detecting the error
This commit is contained in:
Gourieff 2023-11-06 04:32:37 +07:00
parent ee742ec43e
commit 4139d167ff
4 changed files with 38 additions and 46 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"/>
![Version](https://img.shields.io/badge/version-0.5.0_alpha5-lightgreen?style=for-the-badge&labelColor=darkgreen)
![Version](https://img.shields.io/badge/version-0.5.0_beta1-green?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>

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"/>
![Version](https://img.shields.io/badge/версия-0.5.0_alpha5-lightgreen?style=for-the-badge&labelColor=darkgreen)
![Version](https://img.shields.io/badge/версия-0.5.0_beta1-green?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>

View File

@ -3,8 +3,9 @@ import gradio as gr
from PIL import Image
try:
import torch.cuda as cuda
EP_is_visible = True if cuda.is_available() else False
except:
cuda = None
EP_is_visible = False
from typing import List
@ -139,29 +140,23 @@ class FaceSwapScript(scripts.Script):
)
with gr.Tab("Settings"):
models = get_models()
if cuda is not None:
if cuda.is_available():
with gr.Row():
device = gr.Radio(
label="Execution Provider",
choices=DEVICE_LIST,
value=DEVICE,
type="value",
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],
)
else:
device = "CPU"
else:
device = "CPU"
with gr.Row(visible=EP_is_visible):
device = gr.Radio(
label="Execution Provider",
choices=DEVICE_LIST,
value=DEVICE,
type="value",
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("", visible=EP_is_visible)
setattr(device, "do_not_save_to_config", True)
save_device_btn.click(
set_Device,
inputs=[device],
outputs=[save],
)
with gr.Row():
if len(models) == 0:
logger.warning(
@ -533,26 +528,23 @@ class FaceSwapScriptExtras(scripts_postprocessing.ScriptPostprocessing):
)
with gr.Tab("Settings"):
models = get_models()
if cuda.is_available():
with gr.Row():
device = gr.Radio(
label="Execution Provider",
choices=DEVICE_LIST,
value=DEVICE,
type="value",
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],
with gr.Row(visible=EP_is_visible):
device = gr.Radio(
label="Execution Provider",
choices=DEVICE_LIST,
value=DEVICE,
type="value",
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,
)
else:
device = "CPU"
save_device_btn = gr.Button("Save", scale=0)
save = gr.Markdown("", visible=EP_is_visible)
setattr(device, "do_not_save_to_config", True)
save_device_btn.click(
set_Device,
inputs=[device],
outputs=[save],
)
with gr.Row():
if len(models) == 0:
logger.warning(

View File

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