Recrosoftware/sd-webui-reactor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: AMD/MacM1,2 not launch issue

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
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_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> <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>

2
README_RU.md
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_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> <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>

78
scripts/reactor_faceswap.py
View File

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

2
scripts/reactor_version.py
View File

@ -1,5 +1,5 @@
app_title = "ReActor" 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 from scripts.reactor_logger import logger, get_Run, set_Run