From fc049fc6ce1b10e8881a341078b3014cb5ae6c7d Mon Sep 17 00:00:00 2001 From: Jozef Daniecki Date: Mon, 7 Dec 2020 04:55:10 +0100 Subject: [PATCH] Fix serialization dynamic shapes (#3475) * Align EpsMode attribute to specification. * Change dynamic shape resolving in serialization. --- .../src/transformations/src/transformations/serialize.cpp | 6 ++---- ngraph/core/src/op/util/attr_types.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inference-engine/src/transformations/src/transformations/serialize.cpp b/inference-engine/src/transformations/src/transformations/serialize.cpp index 33c64233bd9..2630be432a5 100644 --- a/inference-engine/src/transformations/src/transformations/serialize.cpp +++ b/inference-engine/src/transformations/src/transformations/serialize.cpp @@ -303,15 +303,13 @@ bool is_exec_graph(const ngraph::Function& f) { } bool resolve_dynamic_shapes(const ngraph::Function& f) { - const auto & f_results = f.get_results(); - if (std::all_of(f_results.begin(), f_results.end(), + const auto & f_ops = f.get_ordered_ops(); + if (std::all_of(f_ops.begin(), f_ops.end(), [](std::shared_ptr results) { return !results->is_dynamic(); })) { return false; } auto f_clone = ngraph::clone_function(f); - - const auto & f_ops = f.get_ordered_ops(); const auto & f_clone_ops = f_clone->get_ordered_ops(); NGRAPH_CHECK(f_ops.size() == f_clone_ops.size(), "Unexpected get_ordered_ops method behaviour"); diff --git a/ngraph/core/src/op/util/attr_types.cpp b/ngraph/core/src/op/util/attr_types.cpp index d0713631158..ee102f4bfff 100644 --- a/ngraph/core/src/op/util/attr_types.cpp +++ b/ngraph/core/src/op/util/attr_types.cpp @@ -118,7 +118,7 @@ namespace ngraph NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = EnumNames( - "op::EpsMode", {{"ADD", op::EpsMode::ADD}, {"MAX", op::EpsMode::MAX}}); + "op::EpsMode", {{"add", op::EpsMode::ADD}, {"max", op::EpsMode::MAX}}); return enum_names; }