From 1b5be6566a3d5d4d638b7d4cf91baa38710f4acc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=B2=9C=EA=B5=90/On-Device=20Lab=28SR=29/Enginee?= =?utf8?q?r/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 9 Aug 2019 09:56:46 +0900 Subject: [PATCH] [moco-tf] Import Shape operation (#6402) This commit implements import stage for Shape operation Signed-off-by: Cheongyo Bahk --- compiler/moco-tf/src/Op/Shape.cpp | 118 +++++++++++++++++++++++++++++++++ compiler/moco-tf/src/Op/Shape.test.cpp | 94 ++++++++++++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 compiler/moco-tf/src/Op/Shape.cpp create mode 100644 compiler/moco-tf/src/Op/Shape.test.cpp diff --git a/compiler/moco-tf/src/Op/Shape.cpp b/compiler/moco-tf/src/Op/Shape.cpp new file mode 100644 index 0000000..9e2f00b --- /dev/null +++ b/compiler/moco-tf/src/Op/Shape.cpp @@ -0,0 +1,118 @@ +/* + * 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/TFShape.h" + +#include "GraphBuilder.h" +#include "GraphBuilderContext.h" + +#include +#include +#include + +#include + +namespace +{ +using namespace moco::tf; + +/** + * @brief GraphUpdate for Shape node + */ +class ShapeGraphUpdate final : public GraphUpdate +{ +public: + ShapeGraphUpdate(TFShape *node, const TensorName &&input_name) + : _node(node), _input_name(input_name) + { + // DO NOTHING + } + + void input(const SymbolTable *) const override; + +private: + TFShape *_node; + const TensorName _input_name; +}; + +void ShapeGraphUpdate::input(const SymbolTable *table) const +{ + loco::Node *input_node = table->node(_input_name); + _node->input(input_node); +} + +} // namespace + +namespace moco +{ +namespace tf +{ + +/** + * @brief GraphBuilder for Shape node + */ +class ShapeGraphBuilder final : public GraphBuilder +{ +public: + bool validate(const tensorflow::NodeDef &) const override; + void build(const tensorflow::NodeDef &, GraphBuilderContext *) const override; +}; + +bool ShapeGraphBuilder::validate(const tensorflow::NodeDef &node) const +{ + assert(node.input_size() == 1); + + return plier::tf::has_attrs(node, {"T"}); +} + +void ShapeGraphBuilder::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(); + + // create TF dialect Shape node + auto tf_shape = graph->nodes()->create(); + + if (plier::tf::has_attrs(node, {"out_type"})) + { + auto dtype = plier::tf::as_loco_datatype(plier::tf::get_datatype_attr(node, "out_type")); + // TODO Support other dtype like S64 + assert(dtype == loco::DataType::S32); + + tf_shape->dtype(dtype); + } + else + { + // Set to S32, TF-documented default value for 'out_type' + tf_shape->dtype(loco::DataType::S32); + } + + TensorName output_name(node.name(), 0); + tensor_names->enroll(output_name, tf_shape); + + auto update = stdex::make_unique(tf_shape, TensorName(node.input(0))); + updates->enroll(std::move(update)); +} + +} // namespace tf +} // namespace moco + +#include "GraphBuilderRegistry.h" + +REGISTER_OP_BUILDER(Shape, ShapeGraphBuilder) diff --git a/compiler/moco-tf/src/Op/Shape.test.cpp b/compiler/moco-tf/src/Op/Shape.test.cpp new file mode 100644 index 0000000..6abefb0 --- /dev/null +++ b/compiler/moco-tf/src/Op/Shape.test.cpp @@ -0,0 +1,94 @@ +/* + * 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/TFShape.h" + +#include +#include + +#include + +#include + +namespace +{ + +// clang-format off +const char *shape_000_pbtxtdata = STRING_CONTENT( +node { + name: "Placeholder" + op: "Placeholder" + attr { + key: "dtype" + value { type: DT_FLOAT } + } + attr { + key: "shape" + value { + shape { + dim { size: 1 } + dim { size: 2 } + dim { size: 2 } + dim { size: 3 } + } + } + } +} +node { + name: "Shape" + op: "Shape" + input: "Placeholder" + attr { + key: "T" + value { type: DT_FLOAT } + } + attr { + key: "out_type" + value { type: DT_INT32 } + } +} +); +// clang-format on + +} // namespace + +TEST(TensorFlowImport, shape_000) +{ + moco::tf::Importer importer; + moco::tf::ModelSignature signature; + + signature.add_input(moco::tf::TensorName("Placeholder", 0)); + signature.add_output(moco::tf::TensorName("Shape", 0)); + + tensorflow::GraphDef graph_def; + EXPECT_TRUE(plier::tf::parse_graphdef(shape_000_pbtxtdata, graph_def)); + std::unique_ptr graph = importer.import(signature, graph_def); + + // what to test: + // - there should exist TFShape + // - input node should not be null + // - dtype attribute is set same as out_type attribute of pbtxt + + moco::tf::TFShape *shape_node = + moco::tf::test::find_first_node_bytype(graph.get()); + + ASSERT_NE(shape_node, nullptr); + ASSERT_NE(shape_node->input(), nullptr); + ASSERT_EQ(shape_node->dtype(), loco::DataType::S32); +} -- 2.7.4