[Common] fix tensor dimension compare util

This patch fixes `gst_tensor_dimension_is_equal`
and adds unittests.

Signed-off-by: Yelin Jeong <yelini.jeong@samsung.com>

diff --git a/gst/nnstreamer/nnstreamer_plugin_api_util_impl.c b/gst/nnstreamer/nnstreamer_plugin_api_util_impl.c
index 25f3577..5be6781 100644 (file)
--- a/gst/nnstreamer/nnstreamer_plugin_api_util_impl.c
+++ b/gst/nnstreamer/nnstreamer_plugin_api_util_impl.c
@@ -1018,26 +1018,16 @@ gst_tensor_dimension_is_equal (const tensor_dim dim1, const tensor_dim dim2)
 {
   guint i;
 
-  /* Do not compare zero dimension. */
-  if (dim1[0] == 0U || dim2[0] == 0U)
+  /* Do not compare invalid dimensions. */
+  if (!gst_tensor_dimension_is_valid (dim1) ||
+      !gst_tensor_dimension_is_valid (dim2))
     return FALSE;
 
   for (i = 0; i < NNS_TENSOR_RANK_LIMIT; i++) {
     if (dim1[i] != dim2[i]) {
-      const tensor_dim *remained;
-
-      if (dim1[i] == 0U)
-        remained = (const tensor_dim *) &dim2;
-      else if (dim2[i] == 0U)
-        remained = (const tensor_dim *) &dim1;
-      else
-        return FALSE;
-
       /* Supposed dimension is same if remained dimension is 1. */
-      for (; i < NNS_TENSOR_RANK_LIMIT; i++) {
-        if ((*remained)[i] > 1)
-          return FALSE;
-      }
+      if (dim1[i] > 1 || dim2[i] > 1)
+        return FALSE;
     }
   }
 

diff --git a/tests/common/unittest_common.cc b/tests/common/unittest_common.cc
index 5770e79..9087a61 100644 (file)
--- a/tests/common/unittest_common.cc
+++ b/tests/common/unittest_common.cc
@@ -2114,6 +2114,110 @@ TEST (commonUtil, createTensorBufferInvalidSize_n)
 }
 
 /**
+ * @brief Test tensor dimension validation check util
+ */
+TEST (commonUtil, tensorDimensionIsValid)
+{
+  tensor_dim dim;
+  gint i;
+
+  dim[0] = 3;
+  dim[1] = 280;
+  dim[2] = 40;
+  dim[3] = 1;
+
+  for (i = 4; i < NNS_TENSOR_RANK_LIMIT; i++) {
+    dim[i] = 0;
+  }
+
+  EXPECT_TRUE (gst_tensor_dimension_is_valid (dim));
+}
+
+/**
+ * @brief Test tensor dimension validation check util
+ */
+TEST (commonUtil, tensorDimensionIsValid_n)
+{
+  tensor_dim dim;
+  gint i;
+
+  dim[0] = 3;
+  dim[1] = 280;
+  dim[2] = 40;
+  dim[3] = 0;
+
+  for (i = 4; i < NNS_TENSOR_RANK_LIMIT; i++) {
+    dim[i] = 1;
+  }
+
+  EXPECT_FALSE (gst_tensor_dimension_is_valid (dim));
+}
+
+/**
+ * @brief Test tensor dimension compare util
+ */
+TEST (commonUtil, tensorDimensionIsEqual)
+{
+  tensor_dim dim1, dim2;
+  gint i;
+
+  dim1[0] = dim2[0] = 3;
+  dim1[1] = dim2[1] = 280;
+  dim1[2] = dim2[2] = 40;
+  dim1[3] = dim2[3] = 1;
+
+  for (i = 4; i < NNS_TENSOR_RANK_LIMIT; i++) {
+    dim1[i] = 0;
+    dim2[i] = 1;
+  }
+
+  EXPECT_TRUE (gst_tensor_dimension_is_equal (dim1, dim2));
+}
+
+/**
+ * @brief Test tensor dimension compare util
+ */
+TEST (commonUtil, tensorDimensionIsEqual_n)
+{
+  tensor_dim dim1, dim2;
+  gint i;
+
+  dim1[0] = dim2[0] = 3;
+  dim1[1] = dim2[1] = 280;
+  dim1[2] = dim2[2] = 40;
+  dim1[3] = dim2[3] = 1;
+  dim1[4] = 0;
+  dim2[4] = 2;
+
+  for (i = 5; i < NNS_TENSOR_RANK_LIMIT; i++) {
+    dim1[i] = 0;
+    dim2[i] = 1;
+  }
+
+  EXPECT_FALSE (gst_tensor_dimension_is_equal (dim1, dim2));
+}
+
+/**
+ * @brief Test tensor dimension compare util
+ */
+TEST (commonUtil, tensorDimensionIsEqualInvalid_n)
+{
+  tensor_dim dim1, dim2;
+  gint i;
+
+  dim1[0] = dim2[0] = 3;
+  dim1[1] = dim2[1] = 4;
+  dim1[2] = dim2[2] = 0;
+  dim1[3] = dim2[3] = 1;
+
+  for (i = 5; i < NNS_TENSOR_RANK_LIMIT; i++) {
+    dim1[i] = dim2[i] = 0;
+  }
+
+  EXPECT_FALSE (gst_tensor_dimension_is_equal (dim1, dim2));
+}
+
+/**
  * @brief Main function for unit test.
  */
 int