apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Glenn Jocher 2020-07-02 16:42:49 -07:00
commit c7f8dfcb87
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models.py
View File

@ -106,6 +106,9 @@ def create_modules(module_defs, img_size, cfg):
# Initialize preceding Conv2d() bias (https://arxiv.org/pdf/1708.02002.pdf section 3.3) # Initialize preceding Conv2d() bias (https://arxiv.org/pdf/1708.02002.pdf section 3.3)
try: try:
j = layers[yolo_index] if 'from' in mdef else -1 j = layers[yolo_index] if 'from' in mdef else -1
# If previous layer is a dropout layer, get the one before
if module_list[j].__class__.__name__ == 'Dropout':
j -= 1
bias_ = module_list[j][0].bias # shape(255,) bias_ = module_list[j][0].bias # shape(255,)
bias = bias_[:modules.no * modules.na].view(modules.na, -1) # shape(3,85) bias = bias_[:modules.no * modules.na].view(modules.na, -1) # shape(3,85)
bias[:, 4] += -4.5 # obj bias[:, 4] += -4.5 # obj
@ -114,6 +117,9 @@ def create_modules(module_defs, img_size, cfg):
except: except:
print('WARNING: smart bias initialization failure.') print('WARNING: smart bias initialization failure.')
elif mdef['type'] == 'dropout':
perc = float(mdef['probability'])
modules = nn.Dropout(p=perc)
else: else:
print('Warning: Unrecognized Layer Type: ' + mdef['type']) print('Warning: Unrecognized Layer Type: ' + mdef['type'])

3
utils/parse_config.py
View File

@ -31,6 +31,7 @@ def parse_model_cfg(path):
mdefs[-1][key] = [int(x) for x in val.split(',')] mdefs[-1][key] = [int(x) for x in val.split(',')]
else: else:
val = val.strip() val = val.strip()
# TODO: .isnumeric() actually fails to get the float case
if val.isnumeric(): # return int or float if val.isnumeric(): # return int or float
mdefs[-1][key] = int(val) if (int(val) - float(val)) == 0 else float(val) mdefs[-1][key] = int(val) if (int(val) - float(val)) == 0 else float(val)
else: else:
@ -40,7 +41,7 @@ def parse_model_cfg(path):
supported = ['type', 'batch_normalize', 'filters', 'size', 'stride', 'pad', 'activation', 'layers', 'groups', supported = ['type', 'batch_normalize', 'filters', 'size', 'stride', 'pad', 'activation', 'layers', 'groups',
'from', 'mask', 'anchors', 'classes', 'num', 'jitter', 'ignore_thresh', 'truth_thresh', 'random', 'from', 'mask', 'anchors', 'classes', 'num', 'jitter', 'ignore_thresh', 'truth_thresh', 'random',
'stride_x', 'stride_y', 'weights_type', 'weights_normalization', 'scale_x_y', 'beta_nms', 'nms_kind', 'stride_x', 'stride_y', 'weights_type', 'weights_normalization', 'scale_x_y', 'beta_nms', 'nms_kind',
'iou_loss', 'iou_normalizer', 'cls_normalizer', 'iou_thresh'] 'iou_loss', 'iou_normalizer', 'cls_normalizer', 'iou_thresh', 'probability']
f = [] # fields f = [] # fields
for x in mdefs[1:]: for x in mdefs[1:]: