Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #180 #181

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #180 #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions core/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ def load_freeze_layer(model='yolov4', tiny=False):
freeze_layouts = ['conv2d_93', 'conv2d_101', 'conv2d_109']
return freeze_layouts

def load_weights(model, weights_file, model_name='yolov4', is_tiny=False):

def load_weights(model, weights_file, model_name='yolov4', is_tiny=False, include_top=True):
output_filters = 255
if is_tiny:
if model_name == 'yolov3':
layer_size = 13
Expand Down Expand Up @@ -53,11 +55,12 @@ def load_weights(model, weights_file, model_name='yolov4', is_tiny=False):
bn_weights = bn_weights.reshape((4, filters))[[1, 0, 2, 3]]
bn_layer = model.get_layer(bn_layer_name)
j += 1
conv_shape = (filters, in_dim, k_size, k_size)
else:
conv_bias = np.fromfile(wf, dtype=np.float32, count=filters)
conv_bias = np.fromfile(wf, dtype=np.float32, count=output_filters)
conv_shape = (output_filters, in_dim, k_size, k_size)

# darknet shape (out_dim, in_dim, height, width)
conv_shape = (filters, in_dim, k_size, k_size)
conv_weights = np.fromfile(wf, dtype=np.float32, count=np.product(conv_shape))
# tf shape (height, width, in_dim, out_dim)
conv_weights = conv_weights.reshape(conv_shape).transpose([2, 3, 1, 0])
Expand All @@ -66,7 +69,8 @@ def load_weights(model, weights_file, model_name='yolov4', is_tiny=False):
conv_layer.set_weights([conv_weights])
bn_layer.set_weights(bn_weights)
else:
conv_layer.set_weights([conv_weights, conv_bias])
if include_top:
conv_layer.set_weights([conv_weights, conv_bias])

# assert len(wf.read()) == 0, 'failed to read all data'
wf.close()
Expand Down