Commit
·
2a0aff6
1
Parent(s):
eb97b2e
dataset padding mode
Browse files- test.py +7 -1
- utils/datasets.py +2 -2
test.py
CHANGED
@@ -56,8 +56,14 @@ def test(data,
|
|
56 |
|
57 |
# Dataloader
|
58 |
if dataloader is None:
|
|
|
59 |
path = data['test'] if opt.task == 'test' else data['val'] # path to val/test images
|
60 |
-
dataset = LoadImagesAndLabels(path,
|
|
|
|
|
|
|
|
|
|
|
61 |
batch_size = min(batch_size, len(dataset))
|
62 |
dataloader = DataLoader(dataset,
|
63 |
batch_size=batch_size,
|
|
|
56 |
|
57 |
# Dataloader
|
58 |
if dataloader is None:
|
59 |
+
fast |= conf_thres > 0.001 # enable fast mode
|
60 |
path = data['test'] if opt.task == 'test' else data['val'] # path to val/test images
|
61 |
+
dataset = LoadImagesAndLabels(path,
|
62 |
+
imgsz,
|
63 |
+
batch_size,
|
64 |
+
rect=True, # rectangular inference
|
65 |
+
single_cls=opt.single_cls, # single class mode
|
66 |
+
pad=0.0 if fast else 0.5) # padding
|
67 |
batch_size = min(batch_size, len(dataset))
|
68 |
dataloader = DataLoader(dataset,
|
69 |
batch_size=batch_size,
|
utils/datasets.py
CHANGED
@@ -257,7 +257,7 @@ class LoadStreams: # multiple IP or RTSP cameras
|
|
257 |
|
258 |
class LoadImagesAndLabels(Dataset): # for training/testing
|
259 |
def __init__(self, path, img_size=416, batch_size=16, augment=False, hyp=None, rect=False, image_weights=False,
|
260 |
-
cache_images=False, single_cls=False):
|
261 |
try:
|
262 |
path = str(Path(path)) # os-agnostic
|
263 |
parent = str(Path(path).parent) + os.sep
|
@@ -322,7 +322,7 @@ class LoadImagesAndLabels(Dataset): # for training/testing
|
|
322 |
elif mini > 1:
|
323 |
shapes[i] = [1, 1 / mini]
|
324 |
|
325 |
-
self.batch_shapes = np.
|
326 |
|
327 |
# Cache labels
|
328 |
self.imgs = [None] * n
|
|
|
257 |
|
258 |
class LoadImagesAndLabels(Dataset): # for training/testing
|
259 |
def __init__(self, path, img_size=416, batch_size=16, augment=False, hyp=None, rect=False, image_weights=False,
|
260 |
+
cache_images=False, single_cls=False, pad=0.0):
|
261 |
try:
|
262 |
path = str(Path(path)) # os-agnostic
|
263 |
parent = str(Path(path).parent) + os.sep
|
|
|
322 |
elif mini > 1:
|
323 |
shapes[i] = [1, 1 / mini]
|
324 |
|
325 |
+
self.batch_shapes = np.ceil(np.array(shapes) * img_size / 32. + pad).astype(np.int) * 32
|
326 |
|
327 |
# Cache labels
|
328 |
self.imgs = [None] * n
|