From 15e82d296720d4be344bf42a34d60ffd57b3eb28 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 2 Sep 2022 16:24:30 +0200 Subject: [PATCH] Update `TryExcept(msg='...')`` (#9261) --- utils/__init__.py | 4 ++-- utils/autoanchor.py | 2 +- utils/metrics.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/__init__.py b/utils/__init__.py index 8bdffd47b..46225c220 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -9,7 +9,7 @@ import threading class TryExcept(contextlib.ContextDecorator): # YOLOv5 TryExcept class. Usage: @TryExcept() decorator or 'with TryExcept():' context manager - def __init__(self, msg='default message here'): + def __init__(self, msg=''): self.msg = msg def __enter__(self): @@ -17,7 +17,7 @@ class TryExcept(contextlib.ContextDecorator): def __exit__(self, exc_type, value, traceback): if value: - print(f'{self.msg}: {value}') + print(f'{self.msg}{value}') return True diff --git a/utils/autoanchor.py b/utils/autoanchor.py index ac17c6caf..0b49ab331 100644 --- a/utils/autoanchor.py +++ b/utils/autoanchor.py @@ -26,7 +26,7 @@ def check_anchor_order(m): m.anchors[:] = m.anchors.flip(0) -@TryExcept(f'{PREFIX}ERROR:') +@TryExcept(f'{PREFIX}ERROR: ') def check_anchors(dataset, model, thr=4.0, imgsz=640): # Check anchor fit to data, recompute if necessary m = model.module.model[-1] if hasattr(model, 'module') else model.model[-1] # Detect() diff --git a/utils/metrics.py b/utils/metrics.py index de1bf05b3..ee7d33982 100644 --- a/utils/metrics.py +++ b/utils/metrics.py @@ -186,7 +186,7 @@ class ConfusionMatrix: # fn = self.matrix.sum(0) - tp # false negatives (missed detections) return tp[:-1], fp[:-1] # remove background class - @TryExcept('WARNING: ConfusionMatrix plot failure') + @TryExcept('WARNING: ConfusionMatrix plot failure: ') def plot(self, normalize=True, save_dir='', names=()): import seaborn as sn