[UTC][nnstreamer][nntrainer][Non-ACR] Fix the meaninful dimesion

Change to use ml_tensor_dimension
Tensor dimension's default value will be changed to 0 from 1.
One unit test of the nnstreamer/nntrainer module has the wrong test when updating
the dimension of the tensor. This patch fixes it.

Change-Id: Idcc8263c4a0f0198399660299f9331c23b79e7e1
Signed-off-by: Suyeon Kim <suyeon5.kim@samsung.com>

diff --git a/src/utc/nnstreamer/utc-nnstreamer-scenario.c b/src/utc/nnstreamer/utc-nnstreamer-scenario.c
index e65e149204ffc0e58141156f572a6c05d08d5f49..8f30e119bd4b0cbf0e247f140ae75a625aa1c61a 100644 (file)
--- a/src/utc/nnstreamer/utc-nnstreamer-scenario.c
+++ b/src/utc/nnstreamer/utc-nnstreamer-scenario.c
@@ -1204,8 +1204,6 @@ int utc_nnstreamer_scenario_filter_tensorflow_lite_p1 (void)
   ml_tensors_info_get_tensor_dimension (out_res, 0, res_dim);
   assert (out_dim[0] == res_dim[0]);
   assert (out_dim[1] == res_dim[1]);
-  assert (out_dim[2] == res_dim[2]);
-  assert (out_dim[3] == res_dim[3]);
 
   input = output = NULL;
 

diff --git a/src/utc/nnstreamer/utc-nnstreamer-single.c b/src/utc/nnstreamer/utc-nnstreamer-single.c
index 968b6fdb2e02ddd21c59c2a79bc6ece18626b93e..792ebcafd0781f5fd9dd9b69ce0a78e6ade24dba 100644 (file)
--- a/src/utc/nnstreamer/utc-nnstreamer-single.c
+++ b/src/utc/nnstreamer/utc-nnstreamer-single.c
@@ -415,8 +415,8 @@ int utc_ml_single_set_input_info_p (void)
   assert_eq (status, ML_ERROR_NONE);
 
   ml_tensors_info_get_tensor_dimension (in_info, 0, res_dim);
-  /* dim change */
-  res_dim[3] += 1;
+  /* dim change (1:0:0:0 > 2:0:0:0) */
+  res_dim[0] += 1;
   status = ml_tensors_info_set_tensor_dimension (in_info, 0, res_dim);
   assert_eq (status, ML_ERROR_NONE);
 

diff --git a/src/utc/nntrainer/utc-nntrainer-model.c b/src/utc/nntrainer/utc-nntrainer-model.c
index 903591a8ae7957b3ba41e6ab4f3b5a491613597d..6026330bf4316d29454ccb85cd26f65938373043 100644 (file)
--- a/src/utc/nntrainer/utc-nntrainer-model.c
+++ b/src/utc/nntrainer/utc-nntrainer-model.c
@@ -658,8 +658,12 @@ int utc_nntrainer_model_run_n(void)
 int utc_nntrainer_model_get_input_tensors_info_p(void)
 {
   unsigned int input_count;
-  unsigned int input_dim_expected[4] = {2, 1, 1, 1280};
-  unsigned int dim[4];
+  ml_tensor_dimension dim, input_dim_expected;
+
+  input_dim_expected[0] = 2;
+  input_dim_expected[1] = 1;
+  input_dim_expected[2] = 1;
+  input_dim_expected[3] = 1280;
 
   ml_train_model_construct_with_conf(conf_path, &model);
   ml_train_model_compile(model, NULL);
@@ -756,8 +760,12 @@ int utc_nntrainer_model_get_input_tensors_info_n2(void)
 int utc_nntrainer_model_get_output_tensors_info_p(void)
 {
   unsigned int output_count;
-  unsigned int output_dim_expected[4] = {2, 1, 1, 10};
-  unsigned int dim[4];
+  ml_tensor_dimension dim, output_dim_expected;
+
+  output_dim_expected[0] = 2;
+  output_dim_expected[1] = 1;
+  output_dim_expected[2] = 1;
+  output_dim_expected[3] = 10;
 
   ml_train_model_construct_with_conf(conf_path, &model);
   ml_train_model_compile(model, NULL);