commit 725f68487ae0ec3bac3ac56a1f8acb9315c75c32
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Dec 11 13:42:27 2018 +0000
committer Michael K. Sanders <mks@google.com> Thu Jan 10 18:12:28 2019 +0000
tree 1b430be4d4889019fe77ee9b08b87aae8a790b17
parent c3ea0775ba856cbeff4e194fa59281532228b974

mutateOperationOperandTypeSkip for new DEPTHWISE_CONV_2D variant.

Bug: 119255406
Test: Vts NNAPI tests.
Change-Id: Iaeb1ef1095dde51e9324f526a2126ed5d0491586
Merged-In: Iaeb1ef1095dde51e9324f526a2126ed5d0491586
(cherry picked from commit 47b9141609cd83c41ab5efae32da71eaa786a563)

neuralnetworks/1.2/vts/functional/ValidateModel.cpp

diff --git a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
index 9621009..b1a0e53 100644
--- a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
+++ b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
@@ -327,6 +327,7 @@
         // - 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 @@
                     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)) {