Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AutoShape explicit arguments fix #9443

Merged
merged 2 commits into from
Sep 16, 2022
Merged

AutoShape explicit arguments fix #9443

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee32ac
AutoShape explicit arguments fix
glenn-jocher Sep 16, 2022
b201e64
Update common.py
glenn-jocher Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions models/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ def forward(self, ims, size=640, augment=False, profile=False):
autocast = self.amp and (p.device.type != 'cpu') # Automatic Mixed Precision (AMP) inference
if isinstance(ims, torch.Tensor): # torch
with amp.autocast(autocast):
return self.model(ims.to(p.device).type_as(p), augment, profile) # inference
return self.model(ims.to(p.device).type_as(p), augment=augment) # inference

# Pre-process
n, ims = (len(ims), list(ims)) if isinstance(ims, (list, tuple)) else (1, [ims]) # number, list of images
Expand Down Expand Up @@ -662,7 +662,7 @@ def forward(self, ims, size=640, augment=False, profile=False):
with amp.autocast(autocast):
# Inference
with dt[1]:
y = self.model(x, augment, profile) # forward
y = self.model(x, augment=augment) # forward

# Post-process
with dt[2]:
Expand Down Expand Up @@ -696,7 +696,7 @@ def __init__(self, ims, pred, files, times=(0, 0, 0), names=None, shape=None):
self.xywhn = [x / g for x, g in zip(self.xywh, gn)] # xywh normalized
self.n = len(self.pred) # number of images (batch size)
self.t = tuple(x.t / self.n * 1E3 for x in times) # timestamps (ms)
self.s = shape # inference BCHW shape
self.s = tuple(shape) # inference BCHW shape

def display(self, pprint=False, show=False, save=False, crop=False, render=False, labels=True, save_dir=Path('')):
crops = []
Expand Down Expand Up @@ -726,7 +726,7 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False

im = Image.fromarray(im.astype(np.uint8)) if isinstance(im, np.ndarray) else im # from np
if pprint:
print(s.rstrip(', '))
LOGGER.info(s.rstrip(', '))
if show:
im.show(self.files[i]) # show
if save:
Expand All @@ -743,7 +743,7 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False

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)}' % self.t)
LOGGER.info(f'Speed: %.1fms pre-process, %.1fms inference, %.1fms NMS per image at shape {self.s}' % self.t)

def show(self, labels=True):
self.display(show=True, labels=labels) # show results
Expand Down