Skip to content

Fix loading of single-input/output models (closes #461) #463

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

Merged
Dobiasd merged 3 commits into from
Apr 29, 2026
Merged

Fix loading of single-input/output models (closes #461) #463

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9390c3a
Fix loading of single-input/output models (closes #461)
Dobiasd Apr 29, 2026
1219f3d
Add regression test for flat input_layers/output_layers format
Dobiasd Apr 29, 2026
8d2b569
Remove synthetic flat-format regression test
Dobiasd Apr 29, 2026
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
16 changes: 12 additions & 4 deletions include/fdeep/import_model.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,16 @@ namespace internal {
return node_connection(layer_id, node_idx, tensor_idx);
}

inline std::vector<node_connection> create_node_connections_model_layer(const nlohmann::json& data)
{
assertion(data.is_array(), "input_layers/output_layers must be an array");
// Keras serializes a single connection as a flat triple ["layer", node_idx, tensor_idx],
// and multiple connections as a list of such triples.
if (!data.empty() && !data.front().is_array())
return { create_node_connection_model_layer(data) };
return create_vector<node_connection>(create_node_connection_model_layer, data);
}

inline node_connection create_node_connection(const nlohmann::json& args)
{
assertion(json_obj_has_member(args["config"], "keras_history"),
Expand Down Expand Up @@ -369,11 +379,9 @@ namespace internal {

assertion(data["config"]["input_layers"].is_array(), "no input layers");

const auto inputs = create_vector<node_connection>(
create_node_connection_model_layer, data["config"]["input_layers"]);
const auto inputs = create_node_connections_model_layer(data["config"]["input_layers"]);

const auto outputs = create_vector<node_connection>(
create_node_connection_model_layer, data["config"]["output_layers"]);
const auto outputs = create_node_connections_model_layer(data["config"]["output_layers"]);

return std::make_shared<model_layer>(name, layers, inputs, outputs);
}
Expand Down