mAP recorded during training

This commit is contained in:
Glenn Jocher 2018-11-14 15:14:41 +00:00
parent 9dbc3ec1c4
commit 45c5567723
4 changed files with 107 additions and 96 deletions

22
test.py
View File

@ -11,7 +11,7 @@ parser.add_argument('-data_config_path', type=str, default='cfg/coco.data', help
parser.add_argument('-weights_path', type=str, default='weights/yolov3.pt', help='path to weights file')
parser.add_argument('-class_path', type=str, default='data/coco.names', help='path to class label file')
parser.add_argument('-iou_thres', type=float, default=0.5, help='iou threshold required to qualify as detected')
parser.add_argument('-conf_thres', type=float, default=0.5, help='object confidence threshold')
parser.add_argument('-conf_thres', type=float, default=0.3, help='object confidence threshold')
parser.add_argument('-nms_thres', type=float, default=0.45, help='iou threshold for non-maximum suppression')
parser.add_argument('-n_cpu', type=int, default=0, help='number of cpu threads to use during batch generation')
parser.add_argument('-img_size', type=int, default=416, help='size of each image dimension')
@ -21,9 +21,11 @@ print(opt)
cuda = torch.cuda.is_available()
device = torch.device('cuda:0' if cuda else 'cpu')
def main(opt):
# Configure run
data_config = parse_data_config(opt.data_config_path)
num_classes = int(data_config['classes'])
nC = int(data_config['classes']) # number of classes (80 for COCO)
if platform == 'darwin': # MacOS (local)
test_path = data_config['valid']
else: # linux (cloud, i.e. gcp)
@ -49,9 +51,7 @@ dataloader = load_images_and_labels(test_path, batch_size=opt.batch_size, img_si
print('Compute mAP...')
nC = 80 # number of classes
correct = 0
targets = None
mAP = 0
outputs, mAPs, TP, confidence, pred_class, target_class = [], [], [], [], [], []
AP_accum, AP_accum_count = np.zeros(nC), np.zeros(nC)
for batch_i, (imgs, targets) in enumerate(dataloader):
@ -81,7 +81,6 @@ for batch_i, (imgs, targets) in enumerate(dataloader):
# If no annotations add number of detections as incorrect
if annotations.size(0) == 0:
target_cls = []
# correct.extend([0 for _ in range(len(detections))])
mAPs.append(0)
continue
@ -108,7 +107,8 @@ for batch_i, (imgs, targets) in enumerate(dataloader):
correct.append(0)
# Compute Average Precision (AP) per class
AP, AP_class = ap_per_class(tp=correct, conf=detections[:, 4], pred_cls=detections[:, 6], target_cls=target_cls)
AP, AP_class = ap_per_class(tp=correct, conf=detections[:, 4], pred_cls=detections[:, 6],
target_cls=target_cls)
# Accumulate AP per class
AP_accum_count += np.bincount(AP_class, minlength=nC)
@ -121,7 +121,8 @@ for batch_i, (imgs, targets) in enumerate(dataloader):
mAPs.append(mAP)
# Print image mAP and running mean mAP
print('+ Sample [%d/%d] AP: %.4f (%.4f)' % (len(mAPs), len(dataloader) * opt.batch_size, mAP, np.mean(mAPs)))
print(
'+ Sample [%d/%d] AP: %.4f (%.4f)' % (len(mAPs), len(dataloader) * opt.batch_size, mAP, np.mean(mAPs)))
# Print mAP per class
classes = load_classes(opt.class_path) # Extracts class labels from file
@ -130,3 +131,8 @@ for i, c in enumerate(classes):
# Print mAP
print('Mean Average Precision: %.4f' % np.mean(mAPs))
return mAP
if __name__ == '__main__':
mAP = main(opt)

View File

@ -1,5 +1,6 @@
import argparse
import time
import test
from models import *
from utils.datasets import *
@ -103,10 +104,10 @@ def main(opt):
# scheduler.step()
# Update scheduler (manual) at 0, 54, 61 epochs to 1e-3, 1e-4, 1e-5
if epoch < 50:
lr = 1e-4
else:
if epoch > 50:
lr = 1e-5
else:
lr = 1e-4
for g in optimizer.param_groups:
g['lr'] = lr
@ -160,10 +161,6 @@ def main(opt):
t1 = time.time()
print(s)
# Write epoch results
with open('results.txt', 'a') as file:
file.write(s + '\n')
# Update best loss
loss_per_target = rloss['loss'] / rloss['nT']
if loss_per_target < best_loss:
@ -184,6 +181,14 @@ def main(opt):
if (epoch > 0) & (epoch % 5 == 0):
os.system('cp weights/latest.pt weights/backup' + str(epoch) + '.pt')
# Calculate mAP
test.opt.weights_path = 'weights/latest.pt'
mAP = test.main(test.opt)
# Write epoch results
with open('results.txt', 'a') as file:
file.write(s + '%11.3g' % mAP + '\n')
# Save final model
dt = time.time() - t0
print('Finished %g epochs in %.2fs (%.2fs/epoch)' % (epoch, dt, dt / (epoch + 1)))

View File

@ -11,7 +11,7 @@ gsutil cp gs://ultralytics/yolov3.pt yolov3/weights
python3 detect.py
# Test
python3 test.py -img_size 416 -weights_path weights/latest.pt -conf_thres 0.1
python3 test.py -img_size 416 -weights_path weights/latest.pt -conf_thres 0.5
# Download and Test
sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3 && cd yolov3

View File

@ -435,7 +435,7 @@ def plot_results():
import numpy as np
import matplotlib.pyplot as plt
plt.figure(figsize=(16, 8))
s = ['X', 'Y', 'Width', 'Height', 'Objectness', 'Classification', 'Total Loss', 'Precision', 'Recall']
s = ['X', 'Y', 'Width', 'Height', 'Objectness', 'Classification', 'Total Loss', 'Precision', 'Recall', 'mAP']
for f in ('results.txt',):
results = np.loadtxt(f, usecols=[2, 3, 4, 5, 6, 7, 8, 9, 10]).T
for i in range(9):