From a4f49971bc1ee87f16d9c59b01aeb46f93528e21 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 28 Jul 2021 16:44:24 +0200 Subject: [PATCH] Update Hub Path inputs --- hubconf.py | 4 +++- models/common.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hubconf.py b/hubconf.py index 7ef512655ae2..93ea84d69dd3 100644 --- a/hubconf.py +++ b/hubconf.py @@ -115,9 +115,11 @@ def yolov5x6(pretrained=True, channels=3, classes=80, autoshape=True, verbose=Tr import cv2 import numpy as np from PIL import Image + from pathlib import Path imgs = ['data/images/zidane.jpg', # filename - 'https://github.com/ultralytics/yolov5/releases/download/v1.0/zidane.jpg', # URI + Path('data/images/zidane.jpg'), # Path + 'https://ultralytics.com/images/zidane.jpg', # URI cv2.imread('data/images/bus.jpg')[:, :, ::-1], # OpenCV Image.open('data/images/bus.jpg'), # PIL np.zeros((320, 640, 3))] # numpy diff --git a/models/common.py b/models/common.py index 901648b693a3..fc085e22b16b 100644 --- a/models/common.py +++ b/models/common.py @@ -2,7 +2,7 @@ import logging from copy import copy -from pathlib import Path, PosixPath +from pathlib import Path import math import numpy as np @@ -248,7 +248,7 @@ def forward(self, imgs, size=640, augment=False, profile=False): shape0, shape1, files = [], [], [] # image and inference shapes, filenames for i, im in enumerate(imgs): f = f'image{i}' # filename - if isinstance(im, (str, PosixPath)): # filename or uri + if isinstance(im, (str, Path)): # filename or uri im, f = Image.open(requests.get(im, stream=True).raw if str(im).startswith('http') else im), im im = np.asarray(exif_transpose(im)) elif isinstance(im, Image.Image): # PIL Image