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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Glenn Jocher 2020-06-30 16:16:36 -07:00
parent ad4c22cbfe 2b7a11300e
commit 5c1c73ecda
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
detect.py
View File

@ -25,6 +25,7 @@ def detect(save_img=False):
# torch.save(torch.load(weights, map_location=device), weights) # update model if SourceChangeWarning # torch.save(torch.load(weights, map_location=device), weights) # update model if SourceChangeWarning
# model.fuse() # model.fuse()
model.to(device).eval() model.to(device).eval()
imgsz = check_img_size(imgsz, s=model.model[-1].stride.max()) # check img_size
if half: if half:
model.half() # to FP16 model.half() # to FP16
@ -152,7 +153,6 @@ if __name__ == '__main__':
parser.add_argument('--agnostic-nms', action='store_true', help='class-agnostic NMS') parser.add_argument('--agnostic-nms', action='store_true', help='class-agnostic NMS')
parser.add_argument('--augment', action='store_true', help='augmented inference') parser.add_argument('--augment', action='store_true', help='augmented inference')
opt = parser.parse_args() opt = parser.parse_args()
opt.img_size = check_img_size(opt.img_size)
print(opt) print(opt)
with torch.no_grad(): with torch.no_grad():

2
test.py
View File

@ -34,6 +34,7 @@ def test(data,
torch_utils.model_info(model) torch_utils.model_info(model)
model.fuse() model.fuse()
model.to(device) model.to(device)
imgsz = check_img_size(imgsz, s=model.model[-1].stride.max()) # check img_size
# Multi-GPU disabled, incompatible with .half() https://github.com/ultralytics/yolov5/issues/99 # Multi-GPU disabled, incompatible with .half() https://github.com/ultralytics/yolov5/issues/99
# if device.type != 'cpu' and torch.cuda.device_count() > 1: # if device.type != 'cpu' and torch.cuda.device_count() > 1:
@ -242,7 +243,6 @@ if __name__ == '__main__':
parser.add_argument('--merge', action='store_true', help='use Merge NMS') parser.add_argument('--merge', action='store_true', help='use Merge NMS')
parser.add_argument('--verbose', action='store_true', help='report mAP by class') parser.add_argument('--verbose', action='store_true', help='report mAP by class')
opt = parser.parse_args() opt = parser.parse_args()
opt.img_size = check_img_size(opt.img_size)
opt.save_json = opt.save_json or opt.data.endswith('coco.yaml') opt.save_json = opt.save_json or opt.data.endswith('coco.yaml')
opt.data = check_file(opt.data) # check file opt.data = check_file(opt.data) # check file
print(opt) print(opt)