Skip to content

Commit d7bcf8a

Browse files
Add thread settings
1 parent 9c62fd3 commit d7bcf8a

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

BabbleApp/algo_settings_widget.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
1515
self.gui_use_gpu = f"USEGPU{widget_id}"
1616
self.gui_speed_coefficient = f"-SPEEDCOEFFICIENT{widget_id}-"
1717
self.gui_min_cutoff = f"-MINCUTOFF{widget_id}-"
18+
self.gui_inference_threads = f"-THREADS{widget_id}-"
1819
self.main_config = main_config
1920
self.config = main_config.settings
2021
self.osc_queue = osc_queue
@@ -37,6 +38,13 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
3738
background_color='#424042',
3839
tooltip="Toggle GPU execution.",
3940
),
41+
sg.Text("Inference Threads:", background_color='#424042'),
42+
sg.InputText(
43+
self.config.gui_inference_threads,
44+
key=self.gui_inference_threads,
45+
size=(4),
46+
tooltip = "How many threads to use for processing the model.",
47+
),
4048
],
4149
[sg.Text("Model output multiplier:", background_color='#424042'),
4250
sg.InputText(
@@ -115,6 +123,10 @@ def render(self, window, event, values):
115123
if self.config.gui_use_gpu != values[self.gui_use_gpu]:
116124
self.config.gui_use_gpu = values[self.gui_use_gpu]
117125
changed = True
126+
127+
if self.config.gui_inference_threads != int(values[self.gui_inference_threads]):
128+
self.config.gui_inference_threads = int(values[self.gui_inference_threads])
129+
changed = True
118130

119131
if self.config.gui_min_cutoff != values[self.gui_min_cutoff]:
120132
self.config.gui_min_cutoff = values[self.gui_min_cutoff]

BabbleApp/babble_processor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def __init__(
8585
self.min_max_array = np.empty((2, 45))
8686

8787
self.opts = ort.SessionOptions()
88-
self.opts.intra_op_num_threads = 1
89-
self.opts.inter_op_num_threads = 1
88+
self.opts.intra_op_num_threads = settings.gui_inference_threads
89+
self.opts.inter_op_num_threads = settings.gui_inference_threads
9090
self.opts.graph_optimization_level = ort.GraphOptimizationLevel.ORT_ENABLE_ALL
9191
if not self.use_gpu:
9292
self.sess = ort.InferenceSession(self.model, self.opts, providers=['CPUExecutionProvider'])

BabbleApp/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class BabbleSettingsConfig(BaseModel):
3434
gui_multiply: int = 1
3535
gui_model_file: str = 'Models/EFV2300K45E100P2.onnx'
3636
gui_use_gpu: bool = False
37+
gui_inference_threads: int = 1
3738
calib_array: str = None
3839
gui_cam_resolution_x: int = 0
3940
gui_cam_resolution_y: int = 0

BabbleApp/general_settings_widget.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
9898
),
9999
],
100100
[
101-
sg.Text("Camera Settings:", background_color='#242224'),
101+
sg.Text("UVC Camera Settings:", background_color='#242224'),
102102
],
103103
[
104104
sg.Text("X Resolution:", background_color='#424042'),
@@ -214,16 +214,16 @@ def render(self, window, event, values):
214214
self.config.gui_osc_location = values[self.gui_osc_location]
215215
changed = True
216216

217-
if self.config.gui_cam_resolution_x != values[self.gui_cam_resolution_x]:
218-
self.config.gui_cam_resolution_x = values[self.gui_cam_resolution_x]
217+
if self.config.gui_cam_resolution_x != int(values[self.gui_cam_resolution_x]):
218+
self.config.gui_cam_resolution_x = int(values[self.gui_cam_resolution_x])
219219
changed = True
220220

221-
if self.config.gui_cam_resolution_y != values[self.gui_cam_resolution_y]:
222-
self.config.gui_cam_resolution_y = values[self.gui_cam_resolution_y]
221+
if self.config.gui_cam_resolution_y != int(values[self.gui_cam_resolution_y]):
222+
self.config.gui_cam_resolution_y = int(values[self.gui_cam_resolution_y])
223223
changed = True
224224

225-
if self.config.gui_cam_framerate != values[self.gui_cam_framerate]:
226-
self.config.gui_cam_framerate = values[self.gui_cam_framerate]
225+
if self.config.gui_cam_framerate != int(values[self.gui_cam_framerate]):
226+
self.config.gui_cam_framerate = int(values[self.gui_cam_framerate])
227227
changed = True
228228

229229
if changed:

babble_settings.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

cam_viewer.py

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

0 commit comments

Comments
 (0)