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

Commit 2b65e79f authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by android-build-merger
Browse files

Merge "mutateOperationOperandTypeSkip for new DEPTHWISE_CONV_2D variant." am: 2f6a9949 

am: 5e67119b

Change-Id: Ice5ca983c1e31fc6fd78f8c8009e70a78243d856
parents ef168ceb 5e67119b

neuralnetworks/1.2/vts/functional/ValidateModel.cpp

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ static bool mutateOperationOperandTypeSkip(size_t operand, OperandType type, con 
        // - CAST's argument can be any of TENSOR_(FLOAT16|FLOAT32|INT32|QUANT8_ASYMM).

        // - RANDOM_MULTINOMIAL's argument can be either TENSOR_FLOAT16 or TENSOR_FLOAT32.

        // - CONV_2D filter type (arg 1) can be QUANT8_ASYMM or QUANT8_SYMM_PER_CHANNEL

        // - DEPTHWISE_CONV_2D filter type (arg 1) can be QUANT8_ASYMM or QUANT8_SYMM_PER_CHANNEL

        switch (operation.type) {

            case OperationType::LSH_PROJECTION: {

                if (operand == operation.inputs[1]) {
@@ -346,6 +347,7 @@ static bool mutateOperationOperandTypeSkip(size_t operand, OperandType type, con 
                    return true;

                }

            } break;

            case OperationType::DEPTHWISE_CONV_2D:

            case OperationType::CONV_2D: {

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

                                     type == OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL)) {