Skip to content

Commit 9e791d9

Browse files
Bug Fixes and Removed OpenVino
1 parent 594b059 commit 9e791d9

22 files changed

+102
-50737
lines changed
-8.37 MB
Binary file not shown.
-4.23 MB
Binary file not shown.

BabbleApp/Models/ENEXTXE52/openvino/model.xml

Lines changed: 0 additions & 17355 deletions
This file was deleted.
-8.37 MB
Binary file not shown.
-4.23 MB
Binary file not shown.

BabbleApp/Models/ENEXTXE75/openvino/model.xml

Lines changed: 0 additions & 17355 deletions
This file was deleted.
-31.4 MB
Binary file not shown.
-15.6 MB
Binary file not shown.

BabbleApp/Models/MOS3E26MCJPEG/openvino/model.xml

Lines changed: 0 additions & 14775 deletions
This file was deleted.

BabbleApp/algo_settings_widget.py

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
1717
self.gui_speed_coefficient = f"-SPEEDCOEFFICIENT{widget_id}-"
1818
self.gui_min_cutoff = f"-MINCUTOFF{widget_id}-"
1919
self.gui_inference_threads = f"-THREADS{widget_id}-"
20-
self.gui_backend = f"-BACKEND{widget_id}"
20+
self.gui_runtime = f"-RUNTIME{widget_id}"
2121
self.gui_gpu_index = f"GPUINDEX{widget_id}"
2222
self.main_config = main_config
2323
self.config = main_config.settings
2424
self.osc_queue = osc_queue
25-
self.backend_list = "OpenVino", "ONNX"
25+
self.runtime_list = ("Default (ONNX)", "ONNX")
2626

2727
# Define the window's contents
2828
self.general_settings_layout = [
@@ -42,15 +42,15 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
4242
tooltip = "How many threads to use for processing the model.",
4343
),
4444
],
45-
[sg.Text("Backend:", background_color='#424042'), # Replace with Dropdown once I have internet to view docs.
45+
[sg.Text("Runtime:", background_color='#424042'), # Replace with Dropdown once I have internet to view docs.
4646
sg.OptionMenu(
47-
self.backend_list,
48-
self.config.gui_backend,
49-
key=self.gui_backend,
47+
self.runtime_list,
48+
self.config.gui_runtime,
49+
key=self.gui_runtime,
5050
),
5151
#sg.InputText(
52-
# self.config.gui_backend,
53-
# key=self.gui_backend,
52+
# self.config.gui_runtime,
53+
# key=self.gui_runtime,
5454
# size=(4),
5555
# tooltip = "Method to run the model.",
5656

@@ -149,26 +149,27 @@ def render(self, window, event, values):
149149
if self.config.gui_use_gpu != values[self.gui_use_gpu]:
150150
self.config.gui_use_gpu = values[self.gui_use_gpu]
151151
changed = True
152+
if values[self.gui_gpu_index] != '':
153+
if self.config.gui_gpu_index != int(values[self.gui_gpu_index]):
154+
self.config.gui_gpu_index = int(values[self.gui_gpu_index])
155+
changed = True
152156

153-
if self.config.gui_gpu_index != int(values[self.gui_gpu_index]):
154-
self.config.gui_gpu_index = int(values[self.gui_gpu_index])
155-
changed = True
156-
157-
if self.config.gui_backend != str(values[self.gui_backend]):
158-
self.config.gui_backend = str(values[self.gui_backend])
157+
if self.config.gui_runtime != str(values[self.gui_runtime]):
158+
self.config.gui_runtime = str(values[self.gui_runtime])
159159
changed = True
160160

161-
if self.config.gui_inference_threads != int(values[self.gui_inference_threads]):
162-
self.config.gui_inference_threads = int(values[self.gui_inference_threads])
163-
changed = True
164-
165-
if self.config.gui_min_cutoff != values[self.gui_min_cutoff]:
166-
self.config.gui_min_cutoff = values[self.gui_min_cutoff]
167-
changed = True
168-
169-
if self.config.gui_speed_coefficient != values[self.gui_speed_coefficient]:
170-
self.config.gui_speed_coefficient = values[self.gui_speed_coefficient]
171-
changed = True
161+
if values[self.gui_inference_threads] != '':
162+
if self.config.gui_inference_threads != int(values[self.gui_inference_threads]):
163+
self.config.gui_inference_threads = int(values[self.gui_inference_threads])
164+
changed = True
165+
if values[self.gui_min_cutoff] != '':
166+
if self.config.gui_min_cutoff != values[self.gui_min_cutoff]:
167+
self.config.gui_min_cutoff = values[self.gui_min_cutoff]
168+
changed = True
169+
if values[self.gui_speed_coefficient] != '':
170+
if self.config.gui_speed_coefficient != values[self.gui_speed_coefficient]:
171+
self.config.gui_speed_coefficient = values[self.gui_speed_coefficient]
172+
changed = True
172173

173174
if changed:
174175
self.main_config.save()

0 commit comments

Comments
 (0)