charles/monoloco
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update default arguments for pifpaf models

Browse Source
This commit is contained in:
lorenzo 2019-07-04 15:01:05 +02:00
parent 2180a61ef5
commit 2ef9e833c2
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.py
View File

@ -52,8 +52,7 @@ def cli():
# 1)Pifpaf arguments # 1)Pifpaf arguments
nets.cli(predict_parser) nets.cli(predict_parser)
decoder.cli(predict_parser, force_complete_pose=True, instance_threshold=0.1) decoder.cli(predict_parser, force_complete_pose=True, instance_threshold=0.1)
predict_parser.add_argument('--model_pifpaf', help='pifpaf model to load', predict_parser.add_argument('--checkpoint', help='pifpaf model to load')
default="data/models/resnet152-190412.pkl")
predict_parser.add_argument('--scale', default=1.0, type=float, help='change the scale of the image to preprocess') predict_parser.add_argument('--scale', default=1.0, type=float, help='change the scale of the image to preprocess')
# 2) Monoloco argument # 2) Monoloco argument

8
src/predict/pifpaf.py
View File

@ -46,7 +46,13 @@ def factory_from_args(args):
# Merge the model_pifpaf argument # Merge the model_pifpaf argument
if not args.checkpoint: if not args.checkpoint:
args.checkpoint = args.model_pifpaf args.checkpoint = 'resnet152' # Default model Resnet 152
elif args.checkpoint == 'resnet50':
args.checkpoint = 'data/models/resnet50block5-pif-paf-edge401-190424-122009-f26a1f53.pkl'
elif args.checkpoint == 'resnet101':
args.checkpoint = 'data/models/resnet101block5-pif-paf-edge401-190412-151013-513a2d2d.pkl'
elif args.checkpoint == 'resnet152':
args.checkpoint = 'data/models/resnet152block5-pif-paf-edge401-190412-121848-8d771fcc.pkl'
# glob # glob
if not args.webcam: if not args.webcam:
if args.glob: if args.glob:

10
src/visuals/webcam.py
View File

@ -38,6 +38,7 @@ def webcam(args):
visualizer_monoloco = None visualizer_monoloco = None
while True: while True:
start = time.time()
ret, frame = cam.read() ret, frame = cam.read()
image = cv2.resize(frame, None, fx=args.scale, fy=args.scale) image = cv2.resize(frame, None, fx=args.scale, fy=args.scale)
height, width, _ = image.shape height, width, _ = image.shape
@ -68,6 +69,8 @@ def webcam(args):
outputs, varss = monoloco.forward(keypoints, kk) outputs, varss = monoloco.forward(keypoints, kk)
dic_out = monoloco.post_process(outputs, varss, boxes, keypoints, kk, dict_gt) dic_out = monoloco.post_process(outputs, varss, boxes, keypoints, kk, dict_gt)
visualizer_monoloco.send((pil_image, dic_out)) visualizer_monoloco.send((pil_image, dic_out))
end = time.time()
print("run-time: {:.2f} ms".format((end-start)*1000))
cam.release() cam.release()
@ -95,8 +98,7 @@ class VisualizerMonoloco:
while True: while True:
image, dict_ann = yield image, dict_ann = yield
draw_start = time.time() while axes and (axes[-1] and axes[-1].patches): # for front -1==0, for bird/combined -1 == 1
while axes and ((axes[0] and axes[0].patches) or (axes[-1] and axes[-1].patches)):
if axes[0]: if axes[0]:
del axes[0].patches[0] del axes[0].patches[0]
del axes[0].texts[0] del axes[0].texts[0]
@ -105,9 +107,9 @@ class VisualizerMonoloco:
del axes[1].patches[0] # the one became the 0 del axes[1].patches[0] # the one became the 0
if len(axes[1].lines) > 2: if len(axes[1].lines) > 2:
del axes[1].lines[2] del axes[1].lines[2]
del axes[1].texts[0] if len(axes[1].texts) > 0: # in case of no text
del axes[1].texts[0]
printer.draw(figures, axes, dict_ann, image) printer.draw(figures, axes, dict_ann, image)
print('draw', time.time() - draw_start)
mypause(0.01) mypause(0.01)