From 647dab690ff692abc225e6396c7447690a53be9f Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 26 Mar 2021 13:23:11 +0100 Subject: [PATCH] Update detections() self.t = tuple() (#2617) * Update detections() self.t = tuple() Fix multiple results.print() bug. * Update experimental.py * Update yolo.py (cherry picked from commit a57f23d18b8e76658dd4d4f1445ac4c05a52fae7) --- models/common.py | 7 +++---- models/experimental.py | 2 +- models/yolo.py | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/models/common.py b/models/common.py index 721171393e04..c6b9cda32e29 100644 --- a/models/common.py +++ b/models/common.py @@ -1,4 +1,4 @@ -# This file contains modules common to various models +# YOLOv5 common modules import math from pathlib import Path @@ -248,7 +248,7 @@ def __init__(self, imgs, pred, files, times=None, names=None, shape=None): self.xyxyn = [x / g for x, g in zip(self.xyxy, gn)] # xyxy normalized self.xywhn = [x / g for x, g in zip(self.xywh, gn)] # xywh normalized self.n = len(self.pred) - self.t = ((times[i + 1] - times[i]) * 1000 / self.n for i in range(3)) # timestamps (ms) + self.t = tuple((times[i + 1] - times[i]) * 1000 / self.n for i in range(3)) # timestamps (ms) self.s = shape # inference BCHW shape def display(self, pprint=False, show=False, save=False, render=False, save_dir=''): @@ -277,8 +277,7 @@ def display(self, pprint=False, show=False, save=False, render=False, save_dir=' def print(self): self.display(pprint=True) # print results - print(f'Speed: %.1fms pre-process, %.1fms inference, %.1fms NMS per image at shape {tuple(self.s)}' % - tuple(self.t)) + print(f'Speed: %.1fms pre-process, %.1fms inference, %.1fms NMS per image at shape {tuple(self.s)}' % self.t) def show(self): self.display(show=True) # show results diff --git a/models/experimental.py b/models/experimental.py index d79052314f9b..548353c93be0 100644 --- a/models/experimental.py +++ b/models/experimental.py @@ -1,4 +1,4 @@ -# This file contains experimental modules +# YOLOv5 experimental modules import numpy as np import torch diff --git a/models/yolo.py b/models/yolo.py index a047fef397ee..e5c676dae558 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -1,3 +1,5 @@ +# YOLOv5 YOLO-specific modules + import argparse import logging import sys