Skip to content

Commit 4c46d55

Browse files
committed
[dev] fix summarize_performance in the remote pipeline
1 parent 6b546a0 commit 4c46d55

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

compressai_vision/run/eval_remote_inference.py

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def main(conf: DictConfig):
170170
evaluator_name = _get_evaluator_name(**modules)
171171
evaluator_filepath = _get_evaluator_filepath(**modules)
172172
seq_info_path = _get_seqinfo_path(**modules)
173-
performance, eval_criteria = _summerize_performance(
173+
performance, eval_criteria = _summarize_performance(
174174
evaluator_name, performance, conf.evaluator.eval_criteria
175175
)
176176

@@ -230,7 +230,8 @@ def _calc_bpp(coded_res_df):
230230
return avg_bpp
231231

232232

233-
def _summerize_performance(evaluator_name, performance, eval_criteria):
233+
def _summarize_performance(evaluator_name, performance, eval_criteria):
234+
# Factorization needed TODO (Hyomin)
234235
if evaluator_name == "OpenImagesChallengeEval":
235236
def_criteria = "[email protected]"
236237
if not eval_criteria:
@@ -243,8 +244,7 @@ def _summerize_performance(evaluator_name, performance, eval_criteria):
243244
eval_criteria = def_criteria
244245
value = [v for k, v in performance.items() if k.endswith(eval_criteria)]
245246
return value, eval_criteria
246-
247-
if evaluator_name == "COCOEVal":
247+
elif evaluator_name == "COCOEVal":
248248
def_criteria = "AP"
249249
if not eval_criteria:
250250
eval_criteria = def_criteria
@@ -256,8 +256,7 @@ def _summerize_performance(evaluator_name, performance, eval_criteria):
256256
eval_criteria = def_criteria
257257
value = [v for k, v in performance["bbox"].items() if k == eval_criteria]
258258
return value, eval_criteria
259-
260-
if evaluator_name == "MOT_TVD_Eval" or evaluator_name == "MOT_HiEve_Eval":
259+
elif evaluator_name == "MOT_TVD_Eval" or evaluator_name == "MOT_HiEve_Eval":
261260
def_criteria = "mota"
262261
if not eval_criteria:
263262
eval_criteria = def_criteria
@@ -269,6 +268,21 @@ def _summerize_performance(evaluator_name, performance, eval_criteria):
269268
eval_criteria = def_criteria
270269
value = [v for k, v in performance.items() if k == eval_criteria]
271270
return value, eval_criteria
271+
elif evaluator_name == "YOLOXCOCOEval":
272+
def_criteria = "AP"
273+
if not eval_criteria:
274+
eval_criteria = def_criteria
275+
value = [v for k, v in performance.items() if k == eval_criteria]
276+
if not value:
277+
print(
278+
f"\n{eval_criteria} is not supported for {evaluator_name}, using default evaluation criteria {def_criteria}"
279+
)
280+
eval_criteria = def_criteria
281+
value = [v for k, v in performance.items() if k == eval_criteria]
282+
return value, eval_criteria
283+
else:
284+
raise NotImplementedError
285+
272286
return performance, eval_criteria
273287

274288

compressai_vision/run/eval_split_inference.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def main(conf: DictConfig):
247247

248248
elap_times = updates
249249

250-
performance, eval_criteria = _summerize_performance(
250+
performance, eval_criteria = _summarize_performance(
251251
evaluator_name, performance, conf.evaluator.eval_criteria
252252
)
253253

@@ -326,7 +326,8 @@ def _calc_bpp(coded_res_df):
326326
return avg_bpp
327327

328328

329-
def _summerize_performance(evaluator_name, performance, eval_criteria):
329+
def _summarize_performance(evaluator_name, performance, eval_criteria):
330+
# Factorization needed TODO (Hyomin)
330331
if evaluator_name == "OpenImagesChallengeEval":
331332
def_criteria = "[email protected]"
332333
if not eval_criteria:

0 commit comments

Comments
 (0)