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

rename eval

This commit is contained in:
Jirka 2020-07-16 12:05:00 +02:00
parent df270ea9d7
commit 9a880a4554
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
eval.py
View File

@ -5,21 +5,21 @@ from models.experimental import *
from utils.datasets import * from utils.datasets import *
def test(data, def evaluate(data,
weights=None, weights=None,
batch_size=16, batch_size=16,
imgsz=640, imgsz=640,
conf_thres=0.001, conf_thres=0.001,
iou_thres=0.6, # for NMS iou_thres=0.6, # for NMS
save_json=False, save_json=False,
single_cls=False, single_cls=False,
augment=False, augment=False,
verbose=False, verbose=False,
model=None, model=None,
dataloader=None, dataloader=None,
save_dir='', save_dir='',
merge=False, merge=False,
save_txt=False): save_txt=False):
# Initialize/load model and set device # Initialize/load model and set device
training = model is not None training = model is not None
if training: # called by train.py if training: # called by train.py
@ -254,16 +254,16 @@ if __name__ == '__main__':
print(opt) print(opt)
if opt.task in ['val', 'test']: # run normally if opt.task in ['val', 'test']: # run normally
test(opt.data, evaluate(opt.data,
opt.weights, opt.weights,
opt.batch_size, opt.batch_size,
opt.img_size, opt.img_size,
opt.conf_thres, opt.conf_thres,
opt.iou_thres, opt.iou_thres,
opt.save_json, opt.save_json,
opt.single_cls, opt.single_cls,
opt.augment, opt.augment,
opt.verbose) opt.verbose)
elif opt.task == 'study': # run over a range of settings and save/plot elif opt.task == 'study': # run over a range of settings and save/plot
for weights in ['yolov5s.pt', 'yolov5m.pt', 'yolov5l.pt', 'yolov5x.pt', 'yolov3-spp.pt']: for weights in ['yolov5s.pt', 'yolov5m.pt', 'yolov5l.pt', 'yolov5x.pt', 'yolov3-spp.pt']:
@ -272,7 +272,7 @@ if __name__ == '__main__':
y = [] # y axis y = [] # y axis
for i in x: # img-size for i in x: # img-size
print('\nRunning %s point %s...' % (f, i)) print('\nRunning %s point %s...' % (f, i))
r, _, t = test(opt.data, weights, opt.batch_size, i, opt.conf_thres, opt.iou_thres, opt.save_json) r, _, t = evaluate(opt.data, weights, opt.batch_size, i, opt.conf_thres, opt.iou_thres, opt.save_json)
y.append(r + t) # results and times y.append(r + t) # results and times
np.savetxt(f, y, fmt='%10.4g') # save np.savetxt(f, y, fmt='%10.4g') # save
os.system('zip -r study.zip study_*.txt') os.system('zip -r study.zip study_*.txt')

16
train.py
View File

@ -291,14 +291,14 @@ def train(hyp):
ema.update_attr(model, include=['md', 'nc', 'hyp', 'gr', 'names', 'stride']) ema.update_attr(model, include=['md', 'nc', 'hyp', 'gr', 'names', 'stride'])
final_epoch = epoch + 1 == epochs final_epoch = epoch + 1 == epochs
if not opt.notest or final_epoch: # Calculate mAP if not opt.notest or final_epoch: # Calculate mAP
results, maps, times = eval.test(opt.data, results, maps, times = eval.evaluate(opt.data,
batch_size=batch_size, batch_size=batch_size,
imgsz=imgsz_test, imgsz=imgsz_test,
save_json=final_epoch and opt.data.endswith(os.sep + 'coco.yaml'), save_json=final_epoch and opt.data.endswith(os.sep + 'coco.yaml'),
model=ema.ema, model=ema.ema,
single_cls=opt.single_cls, single_cls=opt.single_cls,
dataloader=testloader, dataloader=testloader,
save_dir=log_dir) save_dir=log_dir)
# Write # Write
with open(results_file, 'a') as f: with open(results_file, 'a') as f: