commit cd83160e6cdd539b7fd1c54562a97be1c4b70a05
author Xusong Wang <xusongw@google.com> Fri Mar 15 03:59:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 15 03:59:24 2019 +0000
tree 395e6f9e24d6c3d5f134cf8a03b7eeecc6265802
parent 2781b3675e7122dc6bbe67680ba62245b3632a41
parent 8804423ca13ab48a9c18129e9d1871498a44b8ad

Merge "Fix condition in mutateOperationOperandTypeSkip for conv ops."

neuralnetworks/1.2/vts/functional/ValidateModel.cpp

diff --git a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
index 3b8e3dd..c2330b5 100644
--- a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
+++ b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
@@ -388,8 +388,9 @@
             case OperationType::GROUPED_CONV_2D:
             case OperationType::DEPTHWISE_CONV_2D:
             case OperationType::CONV_2D: {
-                if (operand == 1 && (type == OperandType::TENSOR_QUANT8_ASYMM ||
-                                     type == OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL)) {
+                if (operand == operation.inputs[1] &&
+                    (type == OperandType::TENSOR_QUANT8_ASYMM ||
+                     type == OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL)) {
                     return true;
                 }
             } break;