commit 207844312aa238bb3fcdfae89a2c5002ec498d8e
author Xusong Wang <xusongw@google.com> Wed Mar 20 15:11:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 20 15:11:55 2019 -0700
tree c291dfe90e969ecb84f2c9c411fae7e1004d10b4
parent 43e4a63ec3ddc98c862ef801b7c1de811d47f52d
parent 47841b4de83be7fed15c827e2d7eefd8f3e28b42

Fix condition in mutateOperationOperandTypeSkip for conv ops. am: f80e3e7826
am: 47841b4de8

Change-Id: I6c567bc7d4513480bb4581af9c5e48d7065de42c

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 7f4d385..065546d 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;