Browse Source

Update detections() self.t = tuple() (#2617)

* Update detections() self.t = tuple()

Fix multiple results.print() bug.

* Update experimental.py

* Update yolo.py
5.0
Glenn Jocher GitHub 3 years ago
parent
commit
a57f23d18b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
  1. +3
    -4
      models/common.py
  2. +1
    -1
      models/experimental.py
  3. +2
    -0
      models/yolo.py

+ 3
- 4
models/common.py View File

@@ -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 @@ class Detections:
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 @@ class Detections:

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

+ 1
- 1
models/experimental.py View File

@@ -1,4 +1,4 @@
# This file contains experimental modules
# YOLOv5 experimental modules

import numpy as np
import torch

+ 2
- 0
models/yolo.py View File

@@ -1,3 +1,5 @@
# YOLOv5 YOLO-specific modules

import argparse
import logging
import sys

Loading…
Cancel
Save