Skip to content

Commit d9e5135

Browse files
author
John Harrington
committed
Updating config parser to not parse when not needed
1 parent d1869e0 commit d9e5135

File tree

2 files changed

+35
-39
lines changed

2 files changed

+35
-39
lines changed

demo/demo.py

+18-22
Original file line numberDiff line numberDiff line change
@@ -190,30 +190,26 @@ def box_to_center_scale(box, model_image_width, model_image_height):
190190
return center, scale
191191

192192

193-
def parse_args():
193+
# def parse_args():
194194

195-
parser = argparse.ArgumentParser(description='Train keypoints network')
196-
# general
197-
parser.add_argument('--cfg', type=str, default=f'{cur_dir}/inference-config.yaml')
198-
parser.add_argument('--video', type=str)
199-
parser.add_argument('--write',action='store_true')
200-
parser.add_argument('--showFps',action='store_true')
201-
parser.add_argument('--output_dir',type=str, default='/')
195+
# parser = argparse.ArgumentParser(description='Train keypoints network')
196+
# # general
197+
# parser.add_argument('--cfg', type=str, default=f'{cur_dir}/inference-config.yaml')
198+
# parser.add_argument('--video', type=str)
199+
# parser.add_argument('--write',action='store_true')
200+
# parser.add_argument('--showFps',action='store_true')
201+
# parser.add_argument('--output_dir',type=str, default='/')
202202

203-
parser.add_argument('opts',
204-
help='Modify config options using the command-line',
205-
default=None,
206-
nargs=argparse.REMAINDER)
203+
# parser.add_argument('opts',
204+
# help='Modify config options using the command-line',
205+
# default=None,
206+
# nargs=argparse.REMAINDER)
207207

208-
args = parser.parse_args()
209-
210-
# args expected by supporting codebase
211-
args.modelDir = ''
212-
args.logDir = ''
213-
args.dataDir = ''
214-
args.prevModelDir = ''
215-
return args
208+
# args = parser.parse_args()
216209

210+
class Bunch:
211+
def __init__(self, **kwds):
212+
self.__dict__.update(kwds)
217213

218214
def get_deepHRnet_keypoints(video, output_dir=None, output_video=False, save_kpts=False, custom_model=None):
219215

@@ -223,8 +219,8 @@ def get_deepHRnet_keypoints(video, output_dir=None, output_video=False, save_kpt
223219
torch.backends.cudnn.deterministic = cfg.CUDNN.DETERMINISTIC
224220
torch.backends.cudnn.enabled = cfg.CUDNN.ENABLED
225221

226-
args = parse_args()
227-
update_config(cfg, args)
222+
#args = parses_args(video, output_dir)
223+
update_config(cfg, Bunch(cfg=f'{cur_dir}/inference-config.yaml', opts=None))
228224

229225
box_model = torchvision.models.detection.fasterrcnn_resnet50_fpn(pretrained=True)
230226
box_model.to(CTX)

lib/config/default.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,29 @@
126126
def update_config(cfg, args):
127127
cfg.defrost()
128128
cfg.merge_from_file(args.cfg)
129-
cfg.merge_from_list(args.opts)
129+
# cfg.merge_from_list(args.opts)
130130

131-
if args.modelDir:
132-
cfg.OUTPUT_DIR = args.modelDir
131+
# if args.modelDir:
132+
# cfg.OUTPUT_DIR = args.modelDir
133133

134-
if args.logDir:
135-
cfg.LOG_DIR = args.logDir
134+
# if args.logDir:
135+
# cfg.LOG_DIR = args.logDir
136136

137-
if args.dataDir:
138-
cfg.DATA_DIR = args.dataDir
137+
# if args.dataDir:
138+
# cfg.DATA_DIR = args.dataDir
139139

140-
cfg.DATASET.ROOT = os.path.join(
141-
cfg.DATA_DIR, cfg.DATASET.ROOT
142-
)
140+
# cfg.DATASET.ROOT = os.path.join(
141+
# cfg.DATA_DIR, cfg.DATASET.ROOT
142+
# )
143143

144-
cfg.MODEL.PRETRAINED = os.path.join(
145-
cfg.DATA_DIR, cfg.MODEL.PRETRAINED
146-
)
144+
# cfg.MODEL.PRETRAINED = os.path.join(
145+
# cfg.DATA_DIR, cfg.MODEL.PRETRAINED
146+
# )
147147

148-
if cfg.TEST.MODEL_FILE:
149-
cfg.TEST.MODEL_FILE = os.path.join(
150-
cfg.DATA_DIR, cfg.TEST.MODEL_FILE
151-
)
148+
# if cfg.TEST.MODEL_FILE:
149+
# cfg.TEST.MODEL_FILE = os.path.join(
150+
# cfg.DATA_DIR, cfg.TEST.MODEL_FILE
151+
# )
152152

153153
cfg.freeze()
154154

0 commit comments

Comments
 (0)