Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f80e3e78 authored by Xusong Wang's avatar Xusong Wang
Browse files

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
Merged-In: I8925dfd18072ae5579657e8aa13128e7d9f58324
(cherry picked from commit 8804423c)
parent 0237edd1

neuralnetworks/1.2/vts/functional/ValidateModel.cpp

+3 −2
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ static bool mutateOperationOperandTypeSkip(size_t operand, OperandType type, con 
            case OperationType::GROUPED_CONV_2D:

            case OperationType::DEPTHWISE_CONV_2D:

            case OperationType::CONV_2D: {

                if (operand == 1 && (type == OperandType::TENSOR_QUANT8_ASYMM ||

                if (operand == operation.inputs[1] &&

                    (type == OperandType::TENSOR_QUANT8_ASYMM ||

                     type == OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL)) {

                    return true;

                }