From 24880480e354c3462cf322b2311944f085f19792 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 19 Feb 2021 11:01:03 -0800 Subject: [PATCH 1/3] Update common.py --- models/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/common.py b/models/common.py index 4f4f331da583..d4bb0c4f2999 100644 --- a/models/common.py +++ b/models/common.py @@ -199,8 +199,8 @@ def forward(self, imgs, size=640, augment=False, profile=False): shape0, shape1, files = [], [], [] # image and inference shapes, filenames for i, im in enumerate(imgs): if isinstance(im, str): # filename or uri - im = Image.open(requests.get(im, stream=True).raw if im.startswith('http') else im) # open - files.append(Path(im.filename).with_suffix('.jpg').name if isinstance(im, Image.Image) else f'image{i}.jpg') + im, f = Image.open(requests.get(im, stream=True).raw if im.startswith('http') else im), im # open + files.append(Path(f).with_suffix('.jpg').name if isinstance(im, Image.Image) else f'image{i}.jpg') im = np.array(im) # to numpy if im.shape[0] < 5: # image in CHW im = im.transpose((1, 2, 0)) # reverse dataloader .transpose(2, 0, 1) From 8ba8f8c59bdb49fd30af0339219e0939c63b81e6 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 19 Feb 2021 11:08:21 -0800 Subject: [PATCH 2/3] Update common.py --- models/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/common.py b/models/common.py index d4bb0c4f2999..9ce26832ce8a 100644 --- a/models/common.py +++ b/models/common.py @@ -200,8 +200,8 @@ def forward(self, imgs, size=640, augment=False, profile=False): for i, im in enumerate(imgs): if isinstance(im, str): # filename or uri im, f = Image.open(requests.get(im, stream=True).raw if im.startswith('http') else im), im # open - files.append(Path(f).with_suffix('.jpg').name if isinstance(im, Image.Image) else f'image{i}.jpg') - im = np.array(im) # to numpy + im.filename = f # for uri + files.append(Path(im.filename).with_suffix('.jpg').name if isinstance(im, Image.Image) else f'image{i}.jpg') if im.shape[0] < 5: # image in CHW im = im.transpose((1, 2, 0)) # reverse dataloader .transpose(2, 0, 1) im = im[:, :, :3] if im.ndim == 3 else np.tile(im[:, :, None], 3) # enforce 3ch input From 6212cc0bf715b9d9361fc31a560f6ae1f8509210 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 19 Feb 2021 11:14:17 -0800 Subject: [PATCH 3/3] Update common.py --- models/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/common.py b/models/common.py index 9ce26832ce8a..f24ea7885668 100644 --- a/models/common.py +++ b/models/common.py @@ -202,6 +202,7 @@ def forward(self, imgs, size=640, augment=False, profile=False): im, f = Image.open(requests.get(im, stream=True).raw if im.startswith('http') else im), im # open im.filename = f # for uri files.append(Path(im.filename).with_suffix('.jpg').name if isinstance(im, Image.Image) else f'image{i}.jpg') + im = np.array(im) # to numpy if im.shape[0] < 5: # image in CHW im = im.transpose((1, 2, 0)) # reverse dataloader .transpose(2, 0, 1) im = im[:, :, :3] if im.ndim == 3 else np.tile(im[:, :, None], 3) # enforce 3ch input @@ -253,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.astype(np.uint8)) if isinstance(img, np.ndarray) else img # from np + img = Image.fromarray(img) 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