Update DEPTHWISE_CONV_2D to use OperationResolver

Bug: 143935136
Test: NNTest_static
Change-Id: Icf8c92bf01e547ade01ba3dddbcd9b99d5d1b441

1 files changed, 11 insertions, 1 deletions

diff --git a/nn/runtime/test/TestValidateOperations.cpp b/nn/runtime/test/TestValidateOperations.cpp
index 7b50087df..05d83634e 100644
--- a/nn/runtime/test/TestValidateOperations.cpp
+++ b/nn/runtime/test/TestValidateOperations.cpp
@@ -160,7 +160,9 @@ class OperationTestBase {
             std::set<int32_t> operandTypesToSkip;
             // Transposed conv can have either fully quantized or per-channel
             // quantized filter for the quantized version of the op.
-            if (mOpCode == ANEURALNETWORKS_TRANSPOSE_CONV_2D && i == 1) {
+            if ((mOpCode == ANEURALNETWORKS_TRANSPOSE_CONV_2D ||
+                 mOpCode == ANEURALNETWORKS_DEPTHWISE_CONV_2D) &&
+                i == 1) {
                 if (originalOperandCode == ANEURALNETWORKS_TENSOR_QUANT8_ASYMM ||
                     originalOperandCode == ANEURALNETWORKS_TENSOR_QUANT8_ASYMM_SIGNED ||
                     originalOperandCode == ANEURALNETWORKS_TENSOR_QUANT8_SYMM_PER_CHANNEL) {
@@ -1542,6 +1544,10 @@ void depthwiseConvOpTest(int32_t inputOperandCode, int32_t filterOperandCode) {
             {input, filter, bias, padLeft, padRight, padTop, padBottom, strideWidth, strideHeight,
              multiplier, activation, layout, dilationWidthFactor, dilationHeightFactor},
             {output});
+    if (filterOperandCode == ANEURALNETWORKS_TENSOR_QUANT8_SYMM_PER_CHANNEL) {
+        explicitDilationDepthwiseConvTest.setInputSymmPerChannelQuantParams(
+                1, filterChannelQuantParams);
+    }
     explicitDilationDepthwiseConvTest.testOpsValidations();
 
     OperationTestBase implicitDilationDepthwiseConvTest(
@@ -1549,6 +1555,10 @@ void depthwiseConvOpTest(int32_t inputOperandCode, int32_t filterOperandCode) {
             {input, filter, bias, padImplicit, strideWidth, strideHeight, multiplier, activation,
              layout, dilationWidthFactor, dilationHeightFactor},
             {output});
+    if (filterOperandCode == ANEURALNETWORKS_TENSOR_QUANT8_SYMM_PER_CHANNEL) {
+        implicitDilationDepthwiseConvTest.setInputSymmPerChannelQuantParams(
+                1, filterChannelQuantParams);
+    }
     implicitDilationDepthwiseConvTest.testOpsValidations();
 }