Merge "Add equality operator to canonical operand and operation types" am: 521fea4b98

Original change: https://android-review.googlesource.com/c/platform/frameworks/ml/+/1451978

Change-Id: I13971cb7efedd12c62eb286160dbcd624356cc33

2 files changed, 32 insertions, 0 deletions

diff --git a/nn/common/TypeUtils.cpp b/nn/common/TypeUtils.cpp
index d997f65a2..ffe2912c3 100644
--- a/nn/common/TypeUtils.cpp
+++ b/nn/common/TypeUtils.cpp
@@ -846,4 +846,32 @@ bool operator!=(const Operand::SymmPerChannelQuantParams& a,
     return !(a == b);
 }
 
+static bool operator==(const DataLocation& a, const DataLocation& b) {
+    constexpr auto toTuple = [](const DataLocation& location) {
+        return std::tie(location.pointer, location.poolIndex, location.offset, location.length);
+    };
+    return toTuple(a) == toTuple(b);
+}
+
+bool operator==(const Operand& a, const Operand& b) {
+    constexpr auto toTuple = [](const Operand& operand) {
+        return std::tie(operand.type, operand.dimensions, operand.scale, operand.zeroPoint,
+                        operand.lifetime, operand.location, operand.extraParams);
+    };
+    return toTuple(a) == toTuple(b);
+}
+bool operator!=(const Operand& a, const Operand& b) {
+    return !(a == b);
+}
+
+bool operator==(const Operation& a, const Operation& b) {
+    constexpr auto toTuple = [](const Operation& operation) {
+        return std::tie(operation.type, operation.inputs, operation.outputs);
+    };
+    return toTuple(a) == toTuple(b);
+}
+bool operator!=(const Operation& a, const Operation& b) {
+    return !(a == b);
+}
+
 }  // namespace android::nn
diff --git a/nn/common/include/nnapi/TypeUtils.h b/nn/common/include/nnapi/TypeUtils.h
index 58021a780..30f1346f4 100644
--- a/nn/common/include/nnapi/TypeUtils.h
+++ b/nn/common/include/nnapi/TypeUtils.h
@@ -106,6 +106,10 @@ bool operator==(const Operand::SymmPerChannelQuantParams& a,
                 const Operand::SymmPerChannelQuantParams& b);
 bool operator!=(const Operand::SymmPerChannelQuantParams& a,
                 const Operand::SymmPerChannelQuantParams& b);
+bool operator==(const Operand& a, const Operand& b);
+bool operator!=(const Operand& a, const Operand& b);
+bool operator==(const Operation& a, const Operation& b);
+bool operator!=(const Operation& a, const Operation& b);
 
 }  // namespace android::nn