zjc
/
yolov5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove `is_coco` argument from `test()` (#3553)

This commit is contained in:
Glenn Jocher 2021-06-09 15:09:51 +02:00 committed by GitHub
parent 958ab92dc1
commit 63157d214d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test.py
View File

@ -39,7 +39,6 @@ def test(data,
wandb_logger=None, wandb_logger=None,
compute_loss=None, compute_loss=None,
half_precision=True, half_precision=True,
is_coco=False,
opt=None): opt=None):
# Initialize/load model and set device # Initialize/load model and set device
training = model is not None training = model is not None
@ -71,10 +70,10 @@ def test(data,
# Configure # Configure
model.eval() model.eval()
if isinstance(data, str): if isinstance(data, str):
is_coco = data.endswith('coco.yaml')
with open(data) as f: with open(data) as f:
data = yaml.safe_load(f) data = yaml.safe_load(f)
check_dataset(data) # check check_dataset(data) # check
is_coco = data['val'].endswith('coco/val2017.txt') # COCO dataset
nc = 1 if single_cls else int(data['nc']) # number of classes nc = 1 if single_cls else int(data['nc']) # number of classes
iouv = torch.linspace(0.5, 0.95, 10).to(device) # iou vector for mAP@0.5:0.95 iouv = torch.linspace(0.5, 0.95, 10).to(device) # iou vector for mAP@0.5:0.95
niou = iouv.numel() niou = iouv.numel()

6
train.py
View File

@ -365,8 +365,7 @@ def train(hyp, opt, device, tb_writer=None):
verbose=nc < 50 and final_epoch, verbose=nc < 50 and final_epoch,
plots=plots and final_epoch, plots=plots and final_epoch,
wandb_logger=wandb_logger, wandb_logger=wandb_logger,
compute_loss=compute_loss, compute_loss=compute_loss)
is_coco=is_coco)
# Write # Write
with open(results_file, 'a') as f: with open(results_file, 'a') as f:
@ -434,8 +433,7 @@ def train(hyp, opt, device, tb_writer=None):
dataloader=testloader, dataloader=testloader,
save_dir=save_dir, save_dir=save_dir,
save_json=True, save_json=True,
plots=False, plots=False)
is_coco=is_coco)
# Strip optimizers # Strip optimizers
for f in last, best: for f in last, best: