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

Commit ecdd667f authored by Lev Proleev's avatar Lev Proleev Committed by android-build-merger
Browse files

Merge changes from topics "dequantize_signed", "nnapi-1.3-IPreparedModel-2" 

am: c4ccbc1a

Change-Id: I9b6d7562089a0bd2e432f4eb883c5b451f164c9e
parents 8ebc7737 c4ccbc1a

neuralnetworks/1.3/vts/functional/ValidateModel.cpp

+3 −2
Original line number Diff line number Diff line
@@ -323,8 +323,8 @@ 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.

        // - DEQUANTIZE input can be any of

        // TENSOR_(QUANT8_ASYMM|QUANT8_SYMM|QUANT8_SYMM_PER_CHANNEL), output can

        // be of either TENSOR_FLOAT16 or TENSOR_FLOAT32.

        // TENSOR_(QUANT8_ASYMM|QUANT8_ASYMM_SIGNED|QUANT8_SYMM|QUANT8_SYMM_PER_CHANNEL),

        // output can be of either TENSOR_FLOAT16 or TENSOR_FLOAT32.

        // - QUANTIZE input 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
@@ -365,6 +365,7 @@ static bool mutateOperationOperandTypeSkip(size_t operand, OperandType type, con 
            case OperationType::DEQUANTIZE: {

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

                    (type == OperandType::TENSOR_QUANT8_ASYMM ||

                     type == OperandType::TENSOR_QUANT8_ASYMM_SIGNED ||

                     type == OperandType::TENSOR_QUANT8_SYMM ||

                     type == OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL)) {

                    return true;