Skip to content

Commit bfb109c

Browse files
committed
Fix scaling bug in yolov8
1 parent d35d6d0 commit bfb109c

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

‎src/modules/ObjectDetectionCoral/options.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def __init__(self):
169169
# ----------------------------------------------------------------------
170170
# Setup values
171171

172-
self._show_env_variables = False
172+
self._show_env_variables = True
173173

174174
self.module_path = ModuleOptions.module_path
175175
self.models_dir = os.path.normpath(ModuleOptions.getEnvVariable("MODELS_DIR", f"{self.module_path}/assets"))

‎src/modules/ObjectDetectionCoral/tpu_runner.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ def __del__(self):
195195
avg_q = 0.0
196196
t_str += " {:5.1f}".format(avg_time)
197197
q_str += " {:5.1f}".format(avg_q)
198-
c_str += " {:5d}".format(c)
199-
logging.info(f"{self.tpu_name} timing, queue len, & count:{t_str};{q_str};{c_str}")
198+
c_str += " {:7d}".format(c)
199+
logging.info(f"{self.tpu_name} time, queue len, & count:{t_str};{q_str};{c_str}")
200200

201201
self.interpreter = None
202202
self.input_details = None
@@ -496,9 +496,9 @@ def _get_tpu_devices(self):
496496
['usb:%d' % i for i in range(max(0, len(edge_tpus) - num_pci_devices))]
497497

498498
if self.tpu_limit > 0:
499-
return tpu_l[4:self.tpu_limit]
499+
return tpu_l[:self.tpu_limit]
500500
else:
501-
return tpu_l[4:]
501+
return tpu_l
502502

503503

504504
def _get_model_filenames(self, options: Options, tpu_list: list) -> list:
@@ -1173,6 +1173,9 @@ def to_numpy(im, shape, typestr):
11731173
"Mapping {} image to {}x{} tiles".format(image.size, tiles_x, tiles_y))
11741174
self.printed_shape_map[key] = True
11751175

1176+
input_zero = self.input_details['quantization'][1]
1177+
input_scale = 1.0 / (256.0 * self.input_details['quantization'][0])
1178+
11761179
# Do chunking
11771180
tiles = []
11781181
for x_off in range(0, resamp_x - options.tile_overlap, m_width - options.tile_overlap):
@@ -1187,11 +1190,11 @@ def to_numpy(im, shape, typestr):
11871190

11881191
# Normalize from 8-bit image to whatever the input is
11891192
if self.input_details['dtype'] == np.int8:
1190-
tiles.append(((cropped_arr - 128).astype(np.int8), resamp_info))
1193+
cropped_arr = cropped_arr * input_scale + input_zero
1194+
tiles.append((cropped_arr.astype(np.int8), resamp_info))
11911195
else:
11921196
tiles.append((cropped_arr, resamp_info))
11931197

1194-
#Image.fromarray((tiles[-1][0] + 128).astype(np.uint8)).save("test.png")
11951198
return tiles
11961199

11971200

0 commit comments

Comments
 (0)