mirror of https://github.com/WongKinYiu/yolov7.git
Merge 40c8731b50
into 44f30af0da
commit
d558bf24de
|
@ -485,7 +485,7 @@ class LoadImagesAndLabels(Dataset):
|
||||||
self.im_files = list(cache.keys()) # update
|
self.im_files = list(cache.keys()) # update
|
||||||
self.label_files = img2label_paths(cache.keys()) # update
|
self.label_files = img2label_paths(cache.keys()) # update
|
||||||
n = len(shapes) # number of images
|
n = len(shapes) # number of images
|
||||||
bi = np.floor(np.arange(n) / batch_size).astype(np.int) # batch index
|
bi = np.floor(np.arange(n) / batch_size).astype(int) # batch index
|
||||||
nb = bi[-1] + 1 # number of batches
|
nb = bi[-1] + 1 # number of batches
|
||||||
self.batch = bi # batch index of image
|
self.batch = bi # batch index of image
|
||||||
self.n = n
|
self.n = n
|
||||||
|
@ -528,7 +528,7 @@ class LoadImagesAndLabels(Dataset):
|
||||||
elif mini > 1:
|
elif mini > 1:
|
||||||
shapes[i] = [1, 1 / mini]
|
shapes[i] = [1, 1 / mini]
|
||||||
|
|
||||||
self.batch_shapes = np.ceil(np.array(shapes) * img_size / stride + pad).astype(np.int) * stride
|
self.batch_shapes = np.ceil(np.array(shapes) * img_size / stride + pad).astype(int) * stride
|
||||||
|
|
||||||
# Cache images into RAM/disk for faster training (WARNING: large datasets may exceed system resources)
|
# Cache images into RAM/disk for faster training (WARNING: large datasets may exceed system resources)
|
||||||
self.ims = [None] * n
|
self.ims = [None] * n
|
||||||
|
|
|
@ -137,7 +137,7 @@ def plot_images_and_masks(images, targets, masks, paths=None, fname='images.jpg'
|
||||||
if mh != h or mw != w:
|
if mh != h or mw != w:
|
||||||
mask = image_masks[j].astype(np.uint8)
|
mask = image_masks[j].astype(np.uint8)
|
||||||
mask = cv2.resize(mask, (w, h))
|
mask = cv2.resize(mask, (w, h))
|
||||||
mask = mask.astype(np.bool)
|
mask = mask.astype(bool)
|
||||||
else:
|
else:
|
||||||
mask = image_masks[j].astype(np.bool)
|
mask = image_masks[j].astype(np.bool)
|
||||||
with contextlib.suppress(Exception):
|
with contextlib.suppress(Exception):
|
||||||
|
|
Loading…
Reference in New Issue