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.

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

Fix handling of boot_bias_parameter for recurrent_group in v2 API #2340

Merged
merged 1 commit into from
Jun 1, 2017
Merged
Changes from all commits
Commits
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
20 changes: 14 additions & 6 deletions python/paddle/v2/layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def dfs_travel(layer_name):
return layer_names


def __get_used_parameters__(layer_names):
def __get_used_parameters__(layer_names, sub_models):
parameter_names = set()
for name in layer_names:
l = cp.g_layer_map[name]
Expand All @@ -161,6 +161,12 @@ def __get_used_parameters__(layer_names):
parameter_names.add(inp.input_parameter_name)
if l.bias_parameter_name:
parameter_names.add(l.bias_parameter_name)

for sub_model in sub_models:
for mem in sub_model.memories:
if mem.HasField("boot_bias_parameter_name"):
parameter_names.add(mem.boot_bias_parameter_name)

return parameter_names


Expand Down Expand Up @@ -236,7 +242,6 @@ def parse_network(output_layers, extra_layers=None):
layer_names = __get_used_layers__(output_layers + extra_layers)
submodel_names = __get_used_submodels__(layer_names)
submodel_names.add('root')
parameter_names = __get_used_parameters__(layer_names)
evaluator_names = __get_used_evaluators__(layer_names)
input_layer_names = set()
output_layer_names = set()
Expand All @@ -251,10 +256,6 @@ def parse_network(output_layers, extra_layers=None):
model_config.input_layer_names.append(l.name)
input_layer_names.add(l.name)

for p in cp.g_config.model_config.parameters:
if p.name in parameter_names:
model_config.parameters.extend([p])

for layer in output_layers:
model_config.output_layer_names.append(layer.full_name)
output_layer_names.add(layer.full_name)
Expand All @@ -269,6 +270,13 @@ def parse_network(output_layers, extra_layers=None):
output_layer_names, evaluator_names)
model_config.sub_models.extend([s])

parameter_names = __get_used_parameters__(layer_names,
model_config.sub_models)

for p in cp.g_config.model_config.parameters:
if p.name in parameter_names:
model_config.parameters.extend([p])

return model_config


Expand Down