commit 8804423ca13ab48a9c18129e9d1871498a44b8ad
author Xusong Wang <xusongw@google.com> Wed Mar 13 16:24:34 2019 -0700
committer Xusong Wang <xusongw@google.com> Wed Mar 13 16:27:05 2019 -0700
tree 8cd17a9750bc25dc863815166624495fd345eb16
parent 16e12d10c630c96f1fcac41a4abb5f6516663b7b

Fix condition in mutateOperationOperandTypeSkip for conv ops.

The filter tensor is not always operand 1 if there are multiple
operations in the model.

Test: 1.2 VTS tests with sample driver
Change-Id: I8925dfd18072ae5579657e8aa13128e7d9f58324

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;