[test/layers] enable tests when only available

This patch enables tests when only available. for example,
unittest_layers_nnstreamer.cpp cannot be run on tizen so excluded.

**Self evaluation:**
1. Build test: [X]Passed [ ]Failed [ ]Skipped
2. Run test: [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Jihoon Lee <jhoon.it.lee@samsung.com>

diff --git a/nntrainer/layers/common_properties.cpp b/nntrainer/layers/common_properties.cpp
index aaefc76..0f21d0c 100644 (file)
--- a/nntrainer/layers/common_properties.cpp
+++ b/nntrainer/layers/common_properties.cpp
@@ -246,6 +246,8 @@ bool WeightRegularizer::isValid(
   const nntrainer::WeightRegularizer &value) const {
   return value != nntrainer::WeightRegularizer::UNKNOWN;
 }
+
+FlipDirection::FlipDirection(FlipDirectionInfo::Enum value) { set(value); }
 } // namespace props
 
 static const std::vector<std::pair<char, std::string>>

diff --git a/nntrainer/layers/common_properties.h b/nntrainer/layers/common_properties.h
index 9687573..4e47320 100644 (file)
--- a/nntrainer/layers/common_properties.h
+++ b/nntrainer/layers/common_properties.h
@@ -823,6 +823,8 @@ struct FlipDirectionInfo {
  */
 class FlipDirection final : public EnumProperty<FlipDirectionInfo> {
 public:
+  FlipDirection(FlipDirectionInfo::Enum value =
+                  FlipDirectionInfo::Enum::horizontal_and_vertical);
   using prop_tag = enum_class_prop_tag;
   static constexpr const char *key = "flip_direction";
 };

diff --git a/nntrainer/layers/preprocess_flip_layer.cpp b/nntrainer/layers/preprocess_flip_layer.cpp
index fdaf1a7..b9e711d 100644 (file)
--- a/nntrainer/layers/preprocess_flip_layer.cpp
+++ b/nntrainer/layers/preprocess_flip_layer.cpp
@@ -40,8 +40,8 @@ void PreprocessFlipLayer::setProperty(const std::vector<std::string> &values) {
 }
 
 void PreprocessFlipLayer::forwarding(RunLayerContext &context, bool training) {
-  props::FlipDirection flipdirection =
-    std::get<props::FlipDirection>(preprocess_flip_props);
+  props::FlipDirectionInfo::Enum flipdirection =
+    std::get<props::FlipDirection>(preprocess_flip_props).get();
 
   if (!training) {
     for (unsigned int idx = 0; idx < context.getNumInputs(); idx++) {

diff --git a/nntrainer/layers/preprocess_translate_layer.cpp b/nntrainer/layers/preprocess_translate_layer.cpp
index 181ae0d..314914f 100644 (file)
--- a/nntrainer/layers/preprocess_translate_layer.cpp
+++ b/nntrainer/layers/preprocess_translate_layer.cpp
@@ -82,12 +82,12 @@ void PreprocessTranslateLayer::forwarding(RunLayerContext &context,
     return;
   }
 
+  float random_translate =
+    std::get<props::RandomTranslate>(preprocess_translate_props);
   for (unsigned int idx = 0; idx < context.getNumInputs(); idx++) {
     Tensor &hidden_ = context.getOutput(idx);
     Tensor &input_ = context.getInput(idx);
     const TensorDim input_dim = input_.getDim();
-    float random_translate =
-      std::get<props::RandomTranslate>(preprocess_translate_props);
 
     if (random_translate < epsilon) {
       hidden_ = input_;

diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec
index a08cca4..3a7a001 100644 (file)
--- a/packaging/nntrainer.spec
+++ b/packaging/nntrainer.spec
@@ -413,7 +413,9 @@ lcov -t 'NNTrainer Unit Test Coverage' -o unittest.info -c -d . -b %{_builddir}/
     --exclude "*/test/*" \
     --exclude "*/meson*/*" \
     --exclude "*/nntrainer_logger.cpp" \
-    --exclude "*/tf_schema_generated.h"
+    --exclude "*/tf_schema_generated.h" \
+    --exclude "*/nnstreamer_layer.*"
+# nnstreamer layer is untestable here
 
 # Visualize the report
 genhtml -o result unittest.info -t "nntrainer %{version}-%{release} ${VCS}" --ignore-errors source -p ${RPM_BUILD_DIR}

diff --git a/test/unittest/layers/meson.build b/test/unittest/layers/meson.build
index c3f6abf..aad326f 100644 (file)
--- a/test/unittest/layers/meson.build
+++ b/test/unittest/layers/meson.build
@@ -43,15 +43,28 @@ test_target = [
   'unittest_layers_rnn.cpp',
   'unittest_layers_lstm.cpp',
   'unittest_layers_gru.cpp',
-  'unittest_layers_preprocess.cpp',
+  'unittest_layers_preprocess_flip.cpp',
   'unittest_layers_split.cpp',
   'unittest_layers_embedding.cpp',
   'unittest_layers_concat.cpp',
-  'unittest_layers_tflite.cpp',
   'unittest_layers_permute.cpp',
-  'unittest_layers_nnstreamer.cpp',
 ]
 
+if get_option('enable-tflite-backbone')
+  test_target += 'unittest_layers_tflite.cpp'
+endif
+
+if opencv_dep.found()
+  test_target += 'unittest_layers_preprocess_translate.cpp'
+endif
+
+if get_option('enable-nnstreamer-backbone')
+  if get_option('platform') != 'tizen'
+    # ml singleshot api cannot be tested inside tizen because of feature issue
+    test_target += 'unittest_layers_nnstreamer.cpp'
+  endif
+endif
+
 exe = executable(
   'unittest_layers', test_target,
   dependencies: [

diff --git a/test/unittest/layers/unittest_layers_preprocess.cpp b/test/unittest/layers/unittest_layers_preprocess_flip.cpp
similarity index 59%
rename from test/unittest/layers/unittest_layers_preprocess.cpp
rename to test/unittest/layers/unittest_layers_preprocess_flip.cpp
index ac70ca6..c82c629 100644 (file)
--- a/test/unittest/layers/unittest_layers_preprocess.cpp
+++ b/test/unittest/layers/unittest_layers_preprocess_flip.cpp
@@ -2,9 +2,9 @@
 /**
  * Copyright (C) 2021 Parichay Kapoor <pk.kapoor@samsung.com>
  *
- * @file unittest_layers_fully_connected.cpp
- * @date 11 June 2021
- * @brief Preprocess Layer Test
+ * @file unittest_layers_preprocess_flip.cpp
+ * @date 11 June Flip
+ * @brief Preprocess flip Layer Test
  * @see        https://github.com/nnstreamer/nntrainer
  * @author Parichay Kapoor <pk.kapoor@samsung.com>
  * @bug No known bugs except for NYI items
@@ -15,15 +15,10 @@
 
 #include <layers_common_tests.h>
 #include <preprocess_flip_layer.h>
-#include <preprocess_translate_layer.h>
 
 auto semantic_flip = LayerSemanticsParamType(
   nntrainer::createLayer<nntrainer::PreprocessFlipLayer>,
   nntrainer::PreprocessFlipLayer::type, {}, 0, false);
 
-auto semantic_translate = LayerSemanticsParamType(
-  nntrainer::createLayer<nntrainer::PreprocessTranslateLayer>,
-  nntrainer::PreprocessTranslateLayer::type, {}, 0, false);
-
 INSTANTIATE_TEST_CASE_P(Preprocess, LayerSemantics,
-                        ::testing::Values(semantic_flip, semantic_translate));
+                        ::testing::Values(semantic_flip));

diff --git a/test/unittest/layers/unittest_layers_preprocess_translate.cpp b/test/unittest/layers/unittest_layers_preprocess_translate.cpp
new file mode 100644 (file)
index 0000000..611c4df
--- /dev/null
+++ b/test/unittest/layers/unittest_layers_preprocess_translate.cpp
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * Copyright (C) 2021 Parichay Kapoor <pk.kapoor@samsung.com>
+ *
+ * @file unittest_layers_preprocess_translate.cpp
+ * @date 11 June 2021
+ * @brief Preprocess Translate Layer Test
+ * @see        https://github.com/nnstreamer/nntrainer
+ * @author Parichay Kapoor <pk.kapoor@samsung.com>
+ * @bug No known bugs except for NYI items
+ */
+#include <tuple>
+
+#include <gtest/gtest.h>
+
+#include <layers_common_tests.h>
+#include <preprocess_translate_layer.h>
+
+auto semantic_translate = LayerSemanticsParamType(
+  nntrainer::createLayer<nntrainer::PreprocessTranslateLayer>,
+  nntrainer::PreprocessTranslateLayer::type, {"random_translate=0.1"}, 0,
+  false);
+
+INSTANTIATE_TEST_CASE_P(Preprocess, LayerSemantics,
+                        ::testing::Values(semantic_translate));

diff --git a/test/unittest/layers/unittest_layers_split.cpp b/test/unittest/layers/unittest_layers_split.cpp
index d8e93e3..ddb9c06 100644 (file)
--- a/test/unittest/layers/unittest_layers_split.cpp
+++ b/test/unittest/layers/unittest_layers_split.cpp
@@ -16,9 +16,9 @@
 #include <layers_common_tests.h>
 #include <split_layer.h>
 
-auto semantic_split =
-  LayerSemanticsParamType(nntrainer::createLayer<nntrainer::SplitLayer>,
-                          nntrainer::SplitLayer::type, {}, 0, false);
+auto semantic_split = LayerSemanticsParamType(
+  nntrainer::createLayer<nntrainer::SplitLayer>, nntrainer::SplitLayer::type,
+  {"split_dimension=3"}, 0, false);
 
 INSTANTIATE_TEST_CASE_P(Split, LayerSemantics,
                         ::testing::Values(semantic_split));