Skip to content

Commit

Permalink
Update Hub Path inputs (#4200)
Browse files Browse the repository at this point in the history
  • Loading branch information
glenn-jocher authored Jul 28, 2021
1 parent 1f31b7c commit 2683b18
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion hubconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions models/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2683b18

Please sign in to comment.