Skip to content

Commit

Permalink
Improved hubconf.py CI tests (ultralytics#2251)
Browse files Browse the repository at this point in the history
  • Loading branch information
glenn-jocher committed Feb 19, 2021
1 parent e684e5e commit 5edab66
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions hubconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,14 @@ def custom(path_or_model='path/to/model.pt', autoshape=True):
# model = custom(path_or_model='path/to/model.pt') # custom example

# Verify inference
import numpy as np
from PIL import Image

imgs = [Image.open(x) for x in Path('data/images').glob('*.jpg')]
results = model(imgs)
imgs = [Image.open('data/images/bus.jpg'), # PIL
'data/images/zidane.jpg', # filename
'https://github.com/ultralytics/yolov5/raw/master/data/images/bus.jpg', # URI
np.zeros((640, 480, 3))] # numpy

results = model(imgs) # batched inference
results.print()
results.save()
2 changes: 1 addition & 1 deletion models/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def display(self, pprint=False, show=False, save=False, render=False, save_dir='
n = (pred[:, -1] == c).sum() # detections per class
str += f"{n} {self.names[int(c)]}{'s' * (n > 1)}, " # add to string
if show or save or render:
img = Image.fromarray(img) if isinstance(img, np.ndarray) else img # from np
img = Image.fromarray(img.astype(np.uint8)) if isinstance(img, np.ndarray) else img # from np
for *box, conf, cls in pred: # xyxy, confidence, class
# str += '%s %.2f, ' % (names[int(cls)], conf) # label
ImageDraw.Draw(img).rectangle(box, width=4, outline=colors[int(cls) % 10]) # plot
Expand Down

0 comments on commit 5edab66

Please sign in to comment.