Remove `is_coco` argument from `test()` (#3553)
Browse files
test.py
CHANGED
@@ -39,7 +39,6 @@ def test(data,
|
|
39 |
wandb_logger=None,
|
40 |
compute_loss=None,
|
41 |
half_precision=True,
|
42 |
-
is_coco=False,
|
43 |
opt=None):
|
44 |
# Initialize/load model and set device
|
45 |
training = model is not None
|
@@ -71,10 +70,10 @@ def test(data,
|
|
71 |
# Configure
|
72 |
model.eval()
|
73 |
if isinstance(data, str):
|
74 |
-
is_coco = data.endswith('coco.yaml')
|
75 |
with open(data) as f:
|
76 |
data = yaml.safe_load(f)
|
77 |
check_dataset(data) # check
|
|
|
78 |
nc = 1 if single_cls else int(data['nc']) # number of classes
|
79 |
iouv = torch.linspace(0.5, 0.95, 10).to(device) # iou vector for [email protected]:0.95
|
80 |
niou = iouv.numel()
|
|
|
39 |
wandb_logger=None,
|
40 |
compute_loss=None,
|
41 |
half_precision=True,
|
|
|
42 |
opt=None):
|
43 |
# Initialize/load model and set device
|
44 |
training = model is not None
|
|
|
70 |
# Configure
|
71 |
model.eval()
|
72 |
if isinstance(data, str):
|
|
|
73 |
with open(data) as f:
|
74 |
data = yaml.safe_load(f)
|
75 |
check_dataset(data) # check
|
76 |
+
is_coco = data['val'].endswith('coco/val2017.txt') # COCO dataset
|
77 |
nc = 1 if single_cls else int(data['nc']) # number of classes
|
78 |
iouv = torch.linspace(0.5, 0.95, 10).to(device) # iou vector for [email protected]:0.95
|
79 |
niou = iouv.numel()
|
train.py
CHANGED
@@ -365,8 +365,7 @@ def train(hyp, opt, device, tb_writer=None):
|
|
365 |
verbose=nc < 50 and final_epoch,
|
366 |
plots=plots and final_epoch,
|
367 |
wandb_logger=wandb_logger,
|
368 |
-
compute_loss=compute_loss
|
369 |
-
is_coco=is_coco)
|
370 |
|
371 |
# Write
|
372 |
with open(results_file, 'a') as f:
|
@@ -434,8 +433,7 @@ def train(hyp, opt, device, tb_writer=None):
|
|
434 |
dataloader=testloader,
|
435 |
save_dir=save_dir,
|
436 |
save_json=True,
|
437 |
-
plots=False
|
438 |
-
is_coco=is_coco)
|
439 |
|
440 |
# Strip optimizers
|
441 |
for f in last, best:
|
|
|
365 |
verbose=nc < 50 and final_epoch,
|
366 |
plots=plots and final_epoch,
|
367 |
wandb_logger=wandb_logger,
|
368 |
+
compute_loss=compute_loss)
|
|
|
369 |
|
370 |
# Write
|
371 |
with open(results_file, 'a') as f:
|
|
|
433 |
dataloader=testloader,
|
434 |
save_dir=save_dir,
|
435 |
save_json=True,
|
436 |
+
plots=False)
|
|
|
437 |
|
438 |
# Strip optimizers
|
439 |
for f in last, best:
|