From 364c8eddb81b6343f55ce34d6d036b98ea34616a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=82=A8=EA=B6=81=EC=84=9D/On-Device=20Lab=28SR=29/Enginee?= =?utf8?q?r/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 23 Aug 2019 16:56:13 +0900 Subject: [PATCH] [locomotiv] Introduce Tanh Operation (#6846) * [locomotiv] Introduce Tanh Operation This commit will introduce `Tanh` operation in `locomotiv` Signed-off-by: Seok NamKoong * substitute tanh_ew to std::tanh --- compiler/locomotiv/src/Node.lst | 1 + compiler/locomotiv/src/Node/Tanh.cpp | 77 +++++++++++++++++++++++++++++++ compiler/locomotiv/src/Node/Tanh.test.cpp | 64 +++++++++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 compiler/locomotiv/src/Node/Tanh.cpp create mode 100644 compiler/locomotiv/src/Node/Tanh.test.cpp diff --git a/compiler/locomotiv/src/Node.lst b/compiler/locomotiv/src/Node.lst index 86aae88..02e640c 100644 --- a/compiler/locomotiv/src/Node.lst +++ b/compiler/locomotiv/src/Node.lst @@ -27,5 +27,6 @@ NODE(Push) NODE(ReLU) NODE(ReLU6) NODE(Reshape) +NODE(Tanh) NODE(TensorConcat) NODE(TensorSoftmax) diff --git a/compiler/locomotiv/src/Node/Tanh.cpp b/compiler/locomotiv/src/Node/Tanh.cpp new file mode 100644 index 0000000..9acaf92 --- /dev/null +++ b/compiler/locomotiv/src/Node/Tanh.cpp @@ -0,0 +1,77 @@ +/* + * 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 "NodeExecution.h" + +#include "NodeDataImpl.h" +#include "NodeDomain.h" +#include "Validation.h" + +#include +#include +#include +#include +#include + +using nncc::core::ADT::tensor::Index; +using nncc::core::ADT::tensor::IndexEnumerator; +using nncc::core::ADT::tensor::LexicalLayout; +using nncc::core::ADT::tensor::make_buffer; + +#include +#include +#include + +namespace locomotiv +{ + +void NodeExecution::execute(loco::Tanh *tanh) +{ + auto input_data = annot_data(tanh->input()); + + validate(input_data, "Input not ready"); + validate(annot_domain(tanh->input()) != loco::Domain::Unknown, "Input domain of Tanh is Unknown"); + + std::unique_ptr tanh_data = nullptr; + + switch (input_data->dtype()) + { + case loco::DataType::FLOAT32: + { + auto input_bufptr = input_data->as_f32_bufptr(); + auto tanh_buf = make_buffer(*input_data->shape()); + auto *shape = input_data->shape(); + + for (IndexEnumerator e{*shape}; e.valid(); e.advance()) + { + const auto &index = e.current(); + tanh_buf.at(index) = std::tanh(input_bufptr->at(index)); + } + + tanh_data = make_data(tanh_buf); + break; + } + default: + throw std::runtime_error("NYI for this DataType"); + } + + assert(tanh_data != nullptr); + erase_annot_data(tanh); + annot_data(tanh, std::move(tanh_data)); + annot_domain(tanh, annot_domain(tanh->input())); +} + +} // namespace locomotiv diff --git a/compiler/locomotiv/src/Node/Tanh.test.cpp b/compiler/locomotiv/src/Node/Tanh.test.cpp new file mode 100644 index 0000000..78c3a13 --- /dev/null +++ b/compiler/locomotiv/src/Node/Tanh.test.cpp @@ -0,0 +1,64 @@ +/* + * 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 "NodeExecution.h" + +#include "locomotiv/NodeData.h" +#include "NodeDataImpl.h" +#include "NodeDomain.h" + +#include +#include +#include + +#include + +using nncc::core::ADT::tensor::Index; +using nncc::core::ADT::tensor::Shape; +using nncc::core::ADT::tensor::LexicalLayout; +using nncc::core::ADT::tensor::make_buffer; + +TEST(NodeExecution_Tanh, f32) +{ + // Make pull-Tanh graph + auto g = loco::make_graph(); + auto pull = g->nodes()->create(); + pull->dtype(loco::DataType::FLOAT32); + pull->shape({3}); + auto tanh = g->nodes()->create(); + tanh->input(pull); + + // Make and assign data to pull node + auto pull_buf = make_buffer(Shape{3}); + pull_buf.at(Index{0}) = 0.0f; + pull_buf.at(Index{1}) = 1.0f; + pull_buf.at(Index{2}) = -1.0f; + auto pull_data = locomotiv::make_data(pull_buf); + locomotiv::annot_data(pull, std::move(pull_data)); + locomotiv::annot_domain(pull, loco::Domain::Tensor); + + locomotiv::NodeExecution::get().run(tanh); + + auto tanh_data = locomotiv::annot_data(tanh); + ASSERT_NE(tanh_data, nullptr); + ASSERT_EQ(tanh_data->dtype(), loco::DataType::FLOAT32); + ASSERT_EQ(*(tanh_data->shape()), Shape{3}); + ASSERT_FLOAT_EQ(tanh_data->as_f32_bufptr()->at(Index{0}), 0.0f); + ASSERT_FLOAT_EQ(tanh_data->as_f32_bufptr()->at(Index{1}), 0.761594f); + ASSERT_FLOAT_EQ(tanh_data->as_f32_bufptr()->at(Index{2}), -0.761594f); + + ASSERT_EQ(locomotiv::annot_domain(tanh), loco::Domain::Tensor); +} -- 2.7.4