From: Wook Song <wook16.song@samsung.com>
Date: Mon, 27 May 2019 05:22:13 +0000 (+0900)
Subject: [Filter/MvNCSDK] Write callbacks for getting dimensions of in/out tensor
X-Git-Tag: v0.2.0~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e1f7c88409518a13aef680f7d10b18b207a8f62;p=platform%2Fupstream%2Fnnstreamer.git

[Filter/MvNCSDK] Write callbacks for getting dimensions of in/out tensor

This patch fills the bodies of callback functions, getInputDimension and
getOutputDimensions, which return the dimension information of input and
output tensor of this filter.

Signed-off-by: Wook Song <wook16.song@samsung.com>
---

diff --git a/ext/nnstreamer/tensor_filter/tensor_filter_movidius_ncsdk2.c b/ext/nnstreamer/tensor_filter/tensor_filter_movidius_ncsdk2.c
index 82afc2f..bd55195 100644
--- a/ext/nnstreamer/tensor_filter/tensor_filter_movidius_ncsdk2.c
+++ b/ext/nnstreamer/tensor_filter/tensor_filter_movidius_ncsdk2.c
@@ -44,6 +44,7 @@ enum _private_constants
   NNS_MVNCSDK2_SUPPORT_API_MAJOR_VER = 2,
   NNS_MVNCSDK2_API_VER_ARRAY_SIZE = NC_VERSION_MAX_SIZE,
   NNS_MVNCSDK2_MAX_NUM_ELEM_IN_FIFO = 2,
+  NNS_MVNCSDK2_MAX_NUM_TENOSORS_SUPPORTED = 1,
 };
 
 static const char NNS_MVNCSDK2_NAME_INPUT_FIFO[] = "INPUT_FIFO";
@@ -294,12 +295,30 @@ _mvncsdk2_invoke (const GstTensorFilterProperties * prop, void **private_data,
  * @param prop : property of tensor_filter instance
  * @param private_data : movidius-ncsdk2 plugin's private data
  * @param[out] info : The dimesions and types of input tensors
- * @todo : fill this function
  */
 static int
 _mvncsdk2_getInputDim (const GstTensorFilterProperties * prop,
     void **private_data, GstTensorsInfo * info)
 {
+  mvncsdk2_data *pdata = *private_data;
+  struct ncTensorDescriptor_t *nc_input_desc = &(pdata->tensor_desc_input);
+  GstTensorInfo *nns_input_tensor_info;
+
+  /** MVNCSDK only supports one tensor at a time */
+  info->num_tensors = NNS_MVNCSDK2_MAX_NUM_TENOSORS_SUPPORTED;
+  nns_input_tensor_info = &(info->info[NNS_MVNCSDK2_MAX_NUM_TENOSORS_SUPPORTED -1]);
+  /**
+   * MVNCSDK only supports data types of FP32 and FP16. If the data type of
+   * input tensor is set to FP32, NCSDK automatically convert it to FP16 as
+   * needed
+   */
+  nns_input_tensor_info->type = _NNS_FLOAT32;
+
+  nns_input_tensor_info->dimension[0] = nc_input_desc->c;
+  nns_input_tensor_info->dimension[1] = nc_input_desc->w;
+  nns_input_tensor_info->dimension[2] = nc_input_desc->h;
+  nns_input_tensor_info->dimension[3] = nc_input_desc->n;
+
   return 0;
 }
 
@@ -314,6 +333,26 @@ static int
 _mvncsdk2_getOutputDim (const GstTensorFilterProperties * prop,
     void **private_data, GstTensorsInfo * info)
 {
+  mvncsdk2_data *pdata = *private_data;
+  struct ncTensorDescriptor_t *nc_output_desc = &(pdata->tensor_desc_output);
+  GstTensorInfo *nns_output_info;
+
+  g_printerr ("data_type = %d\n", nc_output_desc->dataType);
+  /** MVNCSDK only supports one tensor at a time */
+  info->num_tensors = NNS_MVNCSDK2_MAX_NUM_TENOSORS_SUPPORTED;
+  nns_output_info = &(info->info[NNS_MVNCSDK2_MAX_NUM_TENOSORS_SUPPORTED -1]);
+  /**
+   * MVNCSDK only supports data types of FP32 and FP16. If the data type of
+   * input tensor is set to FP32, NCSDK automatically convert it to FP16 as
+   * needed
+   */
+  nns_output_info->type = _NNS_FLOAT32;
+
+  nns_output_info->dimension[0] = nc_output_desc->c;
+  nns_output_info->dimension[1] = nc_output_desc->w;
+  nns_output_info->dimension[2] = nc_output_desc->h;
+  nns_output_info->dimension[3] = nc_output_desc->n;
+
   return 0;
 }