Support operator to compare TypeInfo (#4415)

Operator overloading to compare TypeInfo

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/runtimes/neurun/src/frontend/wrapper/execution.cc b/runtimes/neurun/src/frontend/wrapper/execution.cc
index 045da49..f27784c 100644 (file)
--- a/runtimes/neurun/src/frontend/wrapper/execution.cc
+++ b/runtimes/neurun/src/frontend/wrapper/execution.cc
@@ -21,8 +21,7 @@ bool ANeuralNetworksExecution::compareDataType(const ANeuralNetworksOperandType
   ::neurun::model::operand::TypeInfo typeInfo(
       ::neurun::util::typeFromOperandCode((OperandCode)(type->type)), type->scale, type->zeroPoint);
 
-  if ((operand_type.type() != typeInfo.type()) || (operand_type.scale() != typeInfo.scale()) ||
-      (operand_type.offset() != typeInfo.offset()))
+  if (operand_type != typeInfo)
   {
     // Data type mismatch
     return false;

diff --git a/runtimes/neurun/src/model/operand/TypeInfo.cc b/runtimes/neurun/src/model/operand/TypeInfo.cc
new file mode 100644 (file)
index 0000000..e468591
--- /dev/null
+++ b/runtimes/neurun/src/model/operand/TypeInfo.cc
@@ -0,0 +1,50 @@
+/*
+ * 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 "TypeInfo.h"
+
+namespace neurun
+{
+namespace model
+{
+namespace operand
+{
+
+bool operator==(const TypeInfo &lhs, const TypeInfo &rhs)
+{
+  if (lhs.type() != rhs.type())
+  {
+    return false;
+  }
+
+  if (lhs.offset() != rhs.offset())
+  {
+    return false;
+  }
+
+  if (lhs.scale() != rhs.scale())
+  {
+    return false;
+  }
+
+  return true;
+}
+
+bool operator!=(const TypeInfo &lhs, const TypeInfo &rhs) { return !(lhs == rhs); }
+
+} // namespace operand
+} // namespace model
+} // namespace neurun

diff --git a/runtimes/neurun/src/model/operand/TypeInfo.h b/runtimes/neurun/src/model/operand/TypeInfo.h
index 17aef40..93e8d1a 100644 (file)
--- a/runtimes/neurun/src/model/operand/TypeInfo.h
+++ b/runtimes/neurun/src/model/operand/TypeInfo.h
@@ -48,6 +48,10 @@ private:
   float _scale;
   int32_t _offset;
 };
+
+bool operator==(const TypeInfo &lhs, const TypeInfo &rhs);
+bool operator!=(const TypeInfo &lhs, const TypeInfo &rhs);
+
 } // namespace operand
 } // namespace model
 } // namespace neurun