Enable depthconv and reshape tests in config (#788)

Enable the depthwiseconv and reshape in test config files for the operations to be tested in test_run

diff --git a/src/runtime/ref/nn/common/CpuExecutor.cpp b/src/runtime/ref/nn/common/CpuExecutor.cpp
index bb80d7c..aa916df 100755 (executable)
--- a/src/runtime/ref/nn/common/CpuExecutor.cpp
+++ b/src/runtime/ref/nn/common/CpuExecutor.cpp
@@ -479,9 +479,7 @@ int CpuExecutor::executeOperation(const Operation& operation) {
                                                padding_top, padding_bottom,
                                                stride_width, stride_height,
                                                &outShape) &&
-                          setInfoAndAllocateIfNeeded(&output, outShape);
-#if 0 // TODO depthwiseConvFloat32 from NNFW_KERNELS
-                                                  &&
+                          setInfoAndAllocateIfNeeded(&output, outShape) &&
                           depthwiseConvFloat32(reinterpret_cast<const float*>(input.buffer),
                                                input.shape(),
                                                reinterpret_cast<const float*>(filter.buffer),
@@ -494,7 +492,6 @@ int CpuExecutor::executeOperation(const Operation& operation) {
                                                depth_multiplier, activation,
                                                reinterpret_cast<float*>(output.buffer),
                                                outShape);
-#endif
             } else if (input.type == OperandType::TENSOR_QUANT8_ASYMM) {
                 success = depthwiseConvPrepare(input.shape(), filter.shape(), bias.shape(),
                                                padding_left, padding_right,

diff --git a/tests/framework/tests/depthconv1/config.sh b/tests/framework/tests/depthconv1/config.sh
index 70c889f..0f1c606 100644 (file)
--- a/tests/framework/tests/depthconv1/config.sh
+++ b/tests/framework/tests/depthconv1/config.sh
@@ -1,4 +1,3 @@
 MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
 MODELFILE_NAME="depth_conv_test1.tflite"
 MODELFILE_MD5SUM="759c4209bbbd852627560a2342da3e53"
-STATUS="disabled"

diff --git a/tests/framework/tests/depthconv2/config.sh b/tests/framework/tests/depthconv2/config.sh
index 8baf8c0..d5efaf4 100644 (file)
--- a/tests/framework/tests/depthconv2/config.sh
+++ b/tests/framework/tests/depthconv2/config.sh
@@ -1,4 +1,3 @@
 MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
 MODELFILE_NAME="depth_conv_test2.tflite"
 MODELFILE_MD5SUM="9952066a8c67c2f99bbf7752255f4b7d"
-STATUS="disabled"

diff --git a/tests/framework/tests/reshape1/config.sh b/tests/framework/tests/reshape1/config.sh
index c73b006..21af876 100644 (file)
--- a/tests/framework/tests/reshape1/config.sh
+++ b/tests/framework/tests/reshape1/config.sh
@@ -1,4 +1,3 @@
 MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
 MODELFILE_NAME="reshape_test1.tflite"
 MODELFILE_MD5SUM="5d4c70e0fafb8ed43a9f1171533002bb"
-STATUS="disabled"

diff --git a/tests/framework/tests/reshape2/config.sh b/tests/framework/tests/reshape2/config.sh
index 97cdfb1..0247d5a 100644 (file)
--- a/tests/framework/tests/reshape2/config.sh
+++ b/tests/framework/tests/reshape2/config.sh
@@ -1,4 +1,3 @@
 MODELFILE_SERVER="http://npuarchive.mooo.com/archive/nnfw/nn_framework_test"
 MODELFILE_NAME="reshape_test2.tflite"
 MODELFILE_MD5SUM="02f258fd953a5cebc3319cd67e772669"
-STATUS="disabled"