From: Gusev Dmitry/AI Tools Lab /SRR/Engineer/Samsung Electronics Date: Mon, 2 Dec 2019 13:14:37 +0000 (+0300) Subject: [mir] Add comparison operations (#9308) X-Git-Tag: submit/tizen/20191205.083104~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7078e08c388eabf3eab2ccfc20c71f6bea8e8e4;p=platform%2Fcore%2Fml%2Fnnfw.git [mir] Add comparison operations (#9308) Operations Greater, Less, Equal (elementwise) were added to MIR. Signed-off-by: Dmitry Gusev --- diff --git a/compiler/mir/include/mir/OpDefs.h b/compiler/mir/include/mir/OpDefs.h index 49dcbf6..4b0c1e2 100644 --- a/compiler/mir/include/mir/OpDefs.h +++ b/compiler/mir/include/mir/OpDefs.h @@ -28,11 +28,14 @@ #include "mir/ops/DequantizeOp.h" #include "mir/ops/DivOp.h" #include "mir/ops/EluOp.h" +#include "mir/ops/EqualOp.h" #include "mir/ops/FullyConnectedOp.h" #include "mir/ops/GatherOp.h" +#include "mir/ops/GreaterOp.h" #include "mir/ops/HardSwishOp.h" #include "mir/ops/InputOp.h" #include "mir/ops/LeakyReluOp.h" +#include "mir/ops/LessOp.h" #include "mir/ops/MaxOp.h" #include "mir/ops/MaxPool2DOp.h" #include "mir/ops/MulOp.h" diff --git a/compiler/mir/include/mir/Operations.inc b/compiler/mir/include/mir/Operations.inc index add349c..55201ff 100644 --- a/compiler/mir/include/mir/Operations.inc +++ b/compiler/mir/include/mir/Operations.inc @@ -29,11 +29,14 @@ HANDLE_OP(depthwiseConv, DepthwiseConv2DOp) HANDLE_OP(dequantize, DequantizeOp) HANDLE_OP(div, DivOp) HANDLE_OP(ELU, EluOp) +HANDLE_OP(equal, EqualOp) HANDLE_OP(fullyConnected, FullyConnectedOp) HANDLE_OP(gather, GatherOp) +HANDLE_OP(greater, GreaterOp) HANDLE_OP(hardswish, HardSwishOp) HANDLE_OP(input, InputOp) HANDLE_OP(leakyReLU, LeakyReluOp) +HANDLE_OP(less, LessOp) HANDLE_OP(max, MaxOp) HANDLE_OP(maxPool2D, MaxPool2DOp) HANDLE_OP(mul, MulOp) diff --git a/compiler/mir/include/mir/ops/EqualOp.h b/compiler/mir/include/mir/ops/EqualOp.h new file mode 100644 index 0000000..4ad0391 --- /dev/null +++ b/compiler/mir/include/mir/ops/EqualOp.h @@ -0,0 +1,44 @@ +/* + * 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. + */ + +#ifndef _MIR_OPS_EQUAL_OP_H_ +#define _MIR_OPS_EQUAL_OP_H_ + +#include "mir/ops/BinaryElementwiseOp.h" + +namespace mir +{ +namespace ops +{ + +class EqualOp : public BinaryElementwiseOp +{ +public: + EqualOp(Output *arg1, Output *arg2) : BinaryElementwiseOp(Type::equal, arg1, arg2) + { + setOutputType(0, TensorType(DataType::UINT8, getOutputShape(0))); + } + + Operation *copyWithInputs(const std::vector &inputs) override + { + return new EqualOp(inputs[0], inputs[1]); + } +}; + +} // namespace ops +} // namespace mir + +#endif //_MIR_OPS_EQUAL_OP_H_ diff --git a/compiler/mir/include/mir/ops/GreaterOp.h b/compiler/mir/include/mir/ops/GreaterOp.h new file mode 100644 index 0000000..c99746a --- /dev/null +++ b/compiler/mir/include/mir/ops/GreaterOp.h @@ -0,0 +1,44 @@ +/* + * 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. + */ + +#ifndef _MIR_OPS_GREATER_OP_H_ +#define _MIR_OPS_GREATER_OP_H_ + +#include "mir/ops/BinaryElementwiseOp.h" + +namespace mir +{ +namespace ops +{ + +class GreaterOp : public BinaryElementwiseOp +{ +public: + GreaterOp(Output *arg1, Output *arg2) : BinaryElementwiseOp(Type::greater, arg1, arg2) + { + setOutputType(0, TensorType(DataType::UINT8, getOutputShape(0))); + } + + Operation *copyWithInputs(const std::vector &inputs) override + { + return new GreaterOp(inputs[0], inputs[1]); + } +}; + +} // namespace ops +} // namespace mir + +#endif //_MIR_OPS_GREATER_OP_H_ diff --git a/compiler/mir/include/mir/ops/LessOp.h b/compiler/mir/include/mir/ops/LessOp.h new file mode 100644 index 0000000..9b5a98e --- /dev/null +++ b/compiler/mir/include/mir/ops/LessOp.h @@ -0,0 +1,44 @@ +/* + * 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. + */ + +#ifndef _MIR_OPS_LESS_OP_H_ +#define _MIR_OPS_LESS_OP_H_ + +#include "mir/ops/BinaryElementwiseOp.h" + +namespace mir +{ +namespace ops +{ + +class LessOp : public BinaryElementwiseOp +{ +public: + LessOp(Output *arg1, Output *arg2) : BinaryElementwiseOp(Type::less, arg1, arg2) + { + setOutputType(0, TensorType(DataType::UINT8, getOutputShape(0))); + } + + Operation *copyWithInputs(const std::vector &inputs) override + { + return new LessOp(inputs[0], inputs[1]); + } +}; + +} // namespace ops +} // namespace mir + +#endif //_MIR_OPS_LESS_OP_H_