From 47b9141609cd83c41ab5efae32da71eaa786a563 Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Tue, 11 Dec 2018 13:42:27 +0000 Subject: [PATCH] mutateOperationOperandTypeSkip for new DEPTHWISE_CONV_2D variant. Bug: 119255406 Test: Vts NNAPI tests. Change-Id: Iaeb1ef1095dde51e9324f526a2126ed5d0491586 --- neuralnetworks/1.2/vts/functional/ValidateModel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp index 9621009758..b1a0e53d46 100644 --- a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp +++ b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp @@ -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)) {