commit 47841b4de83be7fed15c827e2d7eefd8f3e28b42
author Xusong Wang <xusongw@google.com> Wed Mar 20 15:02:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 20 15:02:37 2019 -0700
tree 2456f38fe176b5fd25f6d26b98139c20f90dd266
parent 384fcd1eb226f8d5762127be8ccf6d5d5b2a99d5
parent f80e3e7826d49fb32b6d90907ef50acc5c252826

Fix condition in mutateOperationOperandTypeSkip for conv ops.
am: f80e3e7826

Change-Id: Ic6bf0ce3c425f709e6c2edd33f7432af7e59d5be

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;