From: 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 Date: Mon, 19 Aug 2019 00:47:21 +0000 (+0900) Subject: [moco-tf] GraphBuilder for SquaredDifference (#6631) X-Git-Tag: accepted/tizen/unified/20190903.052428~348 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faed76751ffa55f72a66a1e8a1fa45184f0ec21a;p=platform%2Fcore%2Fml%2Fnnfw.git [moco-tf] GraphBuilder for SquaredDifference (#6631) * [moco-tf] GraphBuilder for SquaredDifference This will introduce GraphBuilder for SquaredDifference to import SquaredDifference node Signed-off-by: SaeHie Park * fix comment --- diff --git a/compiler/moco-tf/src/Op/SquaredDifference.cpp b/compiler/moco-tf/src/Op/SquaredDifference.cpp new file mode 100644 index 0000000..bbccad7 --- /dev/null +++ b/compiler/moco-tf/src/Op/SquaredDifference.cpp @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "IR/TFSquaredDifference.h" + +#include "GraphBuilder.h" +#include "GraphBuilderContext.h" + +#include +#include + +#include + +namespace +{ + +using namespace moco::tf; + +/** + * @brief GraphUpdate for TF SquaredDifference node + */ +class TFSquaredDifferenceGraphUpdate final : public GraphUpdate +{ +public: + TFSquaredDifferenceGraphUpdate(TFSquaredDifference *node, std::vector names) + : _node(node), _names(names) + { + } + + void input(const SymbolTable *) const override; + +private: + TFSquaredDifference *_node; + std::vector _names; +}; + +void TFSquaredDifferenceGraphUpdate::input(const SymbolTable *table) const +{ + int num_inputs = _names.size(); + assert(num_inputs == 2); + + _node->x(table->node(_names[0])); + _node->y(table->node(_names[1])); +} + +} // namespace + +namespace moco +{ +namespace tf +{ + +/** + * @brief GraphBuilder for SquaredDifference node + */ +class SquaredDifferenceGraphBuilder final : public GraphBuilder +{ +public: + bool validate(const tensorflow::NodeDef &) const override; + void build(const tensorflow::NodeDef &, GraphBuilderContext *) const override; +}; + +bool SquaredDifferenceGraphBuilder::validate(const tensorflow::NodeDef &node) const +{ + assert(node.input_size() == 2); + + return true; +} + +void SquaredDifferenceGraphBuilder::build(const tensorflow::NodeDef &node, + GraphBuilderContext *context) const +{ + assert(context != nullptr); + + loco::Graph *graph = context->graph(); + SymbolTable *tensor_names = context->tensor_names(); + UpdateQueue *updates = context->updates(); + + // creating TF dialect SquaredDifference node + auto tf_sqdiff = graph->nodes()->create(); + + // register string-name to node + TensorName output_name(node.name(), 0); + tensor_names->enroll(output_name, tf_sqdiff); + + std::vector add_input_names; + add_input_names.push_back(TensorName(node.input(0))); // x + add_input_names.push_back(TensorName(node.input(1))); // y + + // Queue node input update + auto tf_sqrt_update = + stdex::make_unique(tf_sqdiff, add_input_names); + updates->enroll(std::move(tf_sqrt_update)); +} + +} // namespace tf +} // namespace moco + +#include "GraphBuilderRegistry.h" + +REGISTER_OP_BUILDER(SquaredDifference, SquaredDifferenceGraphBuilder) diff --git a/compiler/moco-tf/src/Op/SquaredDifference.test.cpp b/compiler/moco-tf/src/Op/SquaredDifference.test.cpp new file mode 100644 index 0000000..1efe2ef --- /dev/null +++ b/compiler/moco-tf/src/Op/SquaredDifference.test.cpp @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "TestHelper.h" + +#include "Importer.h" + +#include "IR/TFSquaredDifference.h" + +#include +#include + +#include + +#include + +#include +#include + +using namespace moco::tf::test; + +namespace +{ +// clang-format off +const char *sqdiff_basic_pbtxt = STRING_CONTENT( +node { + name: "input_01" + op: "Placeholder" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "shape" + value { + shape { + dim { + size: 1 + } + dim { + size: 3 + } + dim { + size: 3 + } + dim { + size: 1 + } + } + } + } +} +node { + name: "input_02" + op: "Placeholder" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "shape" + value { + shape { + dim { + size: 1 + } + dim { + size: 3 + } + dim { + size: 3 + } + dim { + size: 1 + } + } + } + } +} +node { + name: "squared_difference" + op: "SquaredDifference" + input: "input_01" + input: "input_02" + attr { + key: "T" + value { + type: DT_FLOAT + } + } +} +); +// clang-format on + +} // namespace + +TEST(TensorFlowImport, tf_squdiff_basic) +{ + // load graph + moco::tf::Importer importer; + moco::tf::ModelSignature signature; + signature.add_output(moco::tf::TensorName("squared_difference", 0)); + + tensorflow::GraphDef graph_def; + EXPECT_TRUE(plier::tf::parse_graphdef(sqdiff_basic_pbtxt, graph_def)); + std::unique_ptr graph = importer.import(signature, graph_def); + + // what to test: + // - TFSquaredDifference node should exist + // - input x() should not be null + // - input y() should not be null + + auto sqdiff_node = + moco::tf::test::find_first_node_bytype(graph.get()); + + ASSERT_NE(sqdiff_node, nullptr); + ASSERT_NE(sqdiff_node->x(), nullptr); + ASSERT_NE(sqdiff_node->y(), nullptr); +}