Upload 2 files
Browse files- ui/globals.py +1 -0
- ui/main.py +11 -4
ui/globals.py
CHANGED
|
@@ -4,6 +4,7 @@ SELECTION_FACES_DATA = None
|
|
| 4 |
ui_SELECTED_INPUT_FACE_INDEX = 0
|
| 5 |
|
| 6 |
ui_selected_enhancer = None
|
|
|
|
| 7 |
ui_blend_ratio = None
|
| 8 |
ui_input_thumbs = []
|
| 9 |
ui_target_thumbs = []
|
|
|
|
| 4 |
ui_SELECTED_INPUT_FACE_INDEX = 0
|
| 5 |
|
| 6 |
ui_selected_enhancer = None
|
| 7 |
+
ui_upscale = None
|
| 8 |
ui_blend_ratio = None
|
| 9 |
ui_input_thumbs = []
|
| 10 |
ui_target_thumbs = []
|
ui/main.py
CHANGED
|
@@ -27,15 +27,21 @@ def prepare_environment():
|
|
| 27 |
os.environ["GRADIO_TEMP_DIR"] = os.environ["TEMP"]
|
| 28 |
os.environ['GRADIO_ANALYTICS_ENABLED'] = '0'
|
| 29 |
|
| 30 |
-
|
| 31 |
def run():
|
| 32 |
from roop.core import decode_execution_providers, set_display_ui
|
| 33 |
|
| 34 |
prepare_environment()
|
| 35 |
|
| 36 |
set_display_ui(show_msg)
|
|
|
|
|
|
|
|
|
|
| 37 |
roop.globals.execution_providers = decode_execution_providers([roop.globals.CFG.provider])
|
| 38 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
|
| 40 |
run_server = True
|
| 41 |
uii.ui_restart_server = False
|
|
@@ -57,7 +63,7 @@ def run():
|
|
| 57 |
if server_port <= 0:
|
| 58 |
server_port = None
|
| 59 |
ssl_verify = False if server_name == '0.0.0.0' else True
|
| 60 |
-
with gr.Blocks(title=f'{roop.metadata.name} {roop.metadata.version}', theme=roop.globals.CFG.selected_theme, css=mycss) as ui:
|
| 61 |
with gr.Row(variant='compact'):
|
| 62 |
gr.Markdown(f"### [{roop.metadata.name} {roop.metadata.version}](https://github.com/C0untFloyd/roop-unleashed)")
|
| 63 |
gr.HTML(util.create_version_html(), elem_id="versions")
|
|
@@ -66,10 +72,11 @@ def run():
|
|
| 66 |
facemgr_tab()
|
| 67 |
extras_tab()
|
| 68 |
settings_tab()
|
|
|
|
| 69 |
|
| 70 |
uii.ui_restart_server = False
|
| 71 |
try:
|
| 72 |
-
ui.queue().launch(inbrowser=
|
| 73 |
except Exception as e:
|
| 74 |
print(f'Exception {e} when launching Gradio Server!')
|
| 75 |
uii.ui_restart_server = True
|
|
|
|
| 27 |
os.environ["GRADIO_TEMP_DIR"] = os.environ["TEMP"]
|
| 28 |
os.environ['GRADIO_ANALYTICS_ENABLED'] = '0'
|
| 29 |
|
|
|
|
| 30 |
def run():
|
| 31 |
from roop.core import decode_execution_providers, set_display_ui
|
| 32 |
|
| 33 |
prepare_environment()
|
| 34 |
|
| 35 |
set_display_ui(show_msg)
|
| 36 |
+
if roop.globals.CFG.provider == "cuda" and util.has_cuda_device() == False:
|
| 37 |
+
roop.globals.CFG.provider = "cpu"
|
| 38 |
+
|
| 39 |
roop.globals.execution_providers = decode_execution_providers([roop.globals.CFG.provider])
|
| 40 |
+
gputype = util.get_device()
|
| 41 |
+
if gputype == 'cuda':
|
| 42 |
+
util.print_cuda_info()
|
| 43 |
+
|
| 44 |
+
print(f'Using provider {roop.globals.execution_providers} - Device:{gputype}')
|
| 45 |
|
| 46 |
run_server = True
|
| 47 |
uii.ui_restart_server = False
|
|
|
|
| 63 |
if server_port <= 0:
|
| 64 |
server_port = None
|
| 65 |
ssl_verify = False if server_name == '0.0.0.0' else True
|
| 66 |
+
with gr.Blocks(title=f'{roop.metadata.name} {roop.metadata.version}', theme=roop.globals.CFG.selected_theme, css=mycss, delete_cache=(60, 86400)) as ui:
|
| 67 |
with gr.Row(variant='compact'):
|
| 68 |
gr.Markdown(f"### [{roop.metadata.name} {roop.metadata.version}](https://github.com/C0untFloyd/roop-unleashed)")
|
| 69 |
gr.HTML(util.create_version_html(), elem_id="versions")
|
|
|
|
| 72 |
facemgr_tab()
|
| 73 |
extras_tab()
|
| 74 |
settings_tab()
|
| 75 |
+
launch_browser = roop.globals.CFG.launch_browser
|
| 76 |
|
| 77 |
uii.ui_restart_server = False
|
| 78 |
try:
|
| 79 |
+
ui.queue().launch(inbrowser=launch_browser, server_name=server_name, server_port=server_port, share=roop.globals.CFG.server_share, ssl_verify=ssl_verify, prevent_thread_lock=True, show_error=True)
|
| 80 |
except Exception as e:
|
| 81 |
print(f'Exception {e} when launching Gradio Server!')
|
| 82 |
uii.ui_restart_server = True
|