rename test
parent
670d4ff287
commit
ef6f5b33a8
6
eval.py
6
eval.py
|
@ -5,7 +5,7 @@ from models.experimental import *
|
|||
from utils.datasets import *
|
||||
|
||||
|
||||
def evaluate(data,
|
||||
def test(data,
|
||||
weights=None,
|
||||
batch_size=16,
|
||||
imgsz=640,
|
||||
|
@ -254,7 +254,7 @@ if __name__ == '__main__':
|
|||
print(opt)
|
||||
|
||||
if opt.task in ['val', 'test']: # run normally
|
||||
evaluate(opt.data,
|
||||
test(opt.data,
|
||||
opt.weights,
|
||||
opt.batch_size,
|
||||
opt.img_size,
|
||||
|
@ -272,7 +272,7 @@ if __name__ == '__main__':
|
|||
y = [] # y axis
|
||||
for i in x: # img-size
|
||||
print('\nRunning %s point %s...' % (f, i))
|
||||
r, _, t = evaluate(opt.data, weights, opt.batch_size, i, opt.conf_thres, opt.iou_thres, opt.save_json)
|
||||
r, _, t = test(opt.data, weights, opt.batch_size, i, opt.conf_thres, opt.iou_thres, opt.save_json)
|
||||
y.append(r + t) # results and times
|
||||
np.savetxt(f, y, fmt='%10.4g') # save
|
||||
os.system('zip -r study.zip study_*.txt')
|
||||
|
|
2
train.py
2
train.py
|
@ -291,7 +291,7 @@ def train(hyp):
|
|||
ema.update_attr(model, include=['md', 'nc', 'hyp', 'gr', 'names', 'stride'])
|
||||
final_epoch = epoch + 1 == epochs
|
||||
if not opt.notest or final_epoch: # Calculate mAP
|
||||
results, maps, times = eval.evaluate(opt.data,
|
||||
results, maps, times = eval.test(opt.data,
|
||||
batch_size=batch_size,
|
||||
imgsz=imgsz_test,
|
||||
save_json=final_epoch and opt.data.endswith(os.sep + 'coco.yaml'),
|
||||
|
|
Loading…
Reference in New Issue