[UnitTest/NPU] Fix the handling of runInput() return values

This patch fixes the handling of runInput() return values.
Now, runInput can return 0 or positive values.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/src/core/npu/NPUdrvAPI_triv.cc b/src/core/npu/NPUdrvAPI_triv.cc
index dd4cc18..d0e8930 100644 (file)
--- a/src/core/npu/NPUdrvAPI_triv.cc
+++ b/src/core/npu/NPUdrvAPI_triv.cc
@@ -309,7 +309,7 @@ TrinityVisionAPI::deregisterModel (unsigned long long id) const
 /**
  * @brief run inference with the input config
  * @param[in] input_config input configuration for the inference
- * @return 0 if no error. otherwise a negative errno
+ * @return 0 or positive id if no error. otherwise a negative errno
  */
 int
 TrinityVisionAPI::runInput (input_config_t *input_config) const
@@ -325,7 +325,7 @@ TrinityVisionAPI::runInput (input_config_t *input_config) const
   if (ret != 0)
     return -errno;
 
-  return ret;
+  return input_config->task_id;
 }
 
 /**

diff --git a/src/core/npu/NPUdrvAPI_triv2.cc b/src/core/npu/NPUdrvAPI_triv2.cc
index 9f9e51c..1f760c1 100644 (file)
--- a/src/core/npu/NPUdrvAPI_triv2.cc
+++ b/src/core/npu/NPUdrvAPI_triv2.cc
@@ -309,7 +309,7 @@ TrinityVision2API::deregisterModel (unsigned long long id) const
 /**
  * @brief run inference with the input config
  * @param[in] input_config input configuration for the inference
- * @return 0 if no error. otherwise a negative errno
+ * @return 0 or positive id if no error. otherwise a negative errno
  */
 int
 TrinityVision2API::runInput (input_config_t *input_config) const
@@ -325,7 +325,7 @@ TrinityVision2API::runInput (input_config_t *input_config) const
   if (ret != 0)
     return -errno;
 
-  return ret;
+  return input_config->task_id;
 }
 
 /**

diff --git a/tests/unittests/ne_core_npu_test.cc b/tests/unittests/ne_core_npu_test.cc
index 63e79eb..25da12e 100644 (file)
--- a/tests/unittests/ne_core_npu_test.cc
+++ b/tests/unittests/ne_core_npu_test.cc
@@ -330,7 +330,7 @@ TEST (ne_core_npu_test, manage_mem_triv2)
 /**
  * @brief manage memory blocks using driver api (negative cases)
  */
-TEST (ne_core_npu_test, manage_mem_tirv_n)
+TEST (ne_core_npu_test, manage_mem_triv_n)
 {
   int num_devices = DriverAPI::getNumDevices (NPUCOND_TRIV_CONN_SOCIP);
   ASSERT_GT (num_devices, 0);
@@ -373,7 +373,7 @@ TEST (ne_core_npu_test, manage_mem_tirv_n)
 /**
  * @brief manage memory blocks using driver api (negative cases)
  */
-TEST (ne_core_npu_test, manage_mem_tirv2_n)
+TEST (ne_core_npu_test, manage_mem_triv2_n)
 {
   int num_devices = DriverAPI::getNumDevices (NPUCOND_TRIV2_CONN_SOCIP);
   ASSERT_GT (num_devices, 0);
@@ -540,7 +540,7 @@ TEST (ne_core_npu_test, run_inference_triv)
   input.dbuf_fd = buffer_dmabuf;
   input.model_id = model.id;
 
-  EXPECT_EQ (api->runInput (&input), 0);
+  EXPECT_GE (api->runInput (&input), 0);
 
   EXPECT_EQ (api->dealloc (model_dmabuf), 0);
   EXPECT_EQ (api->dealloc (buffer_dmabuf), 0);
@@ -591,8 +591,10 @@ TEST (ne_core_npu_test, run_inference_triv2)
   input.dbuf_fd = buffer_dmabuf;
   input.model_id = model.id;
   input.num_segments = 1;
+  input.input_mode = INPUT_CPU;
+  input.output_mode = OUTPUT_CPU_INTR;
 
-  EXPECT_EQ (api->runInput (&input), 0);
+  EXPECT_GE (api->runInput (&input), 0);
   EXPECT_EQ (api->munmap (buf, size), 0);
   EXPECT_EQ (api->dealloc (model_dmabuf), 0);
   EXPECT_EQ (api->dealloc (buffer_dmabuf), 0);
@@ -650,11 +652,13 @@ TEST (ne_core_npu_test, run_inference_async0_triv2)
         input.dbuf_fd = buffer_dmabuf;
         input.model_id = model.id;
         input.num_segments = 1;
+        input.input_mode = INPUT_CPU;
+        input.output_mode = OUTPUT_CPU_INTR;
 
         return api->runInput (&input);
        });
 
-  EXPECT_EQ (f_ret.get(), 0);
+  EXPECT_GE (f_ret.get(), 0);
   EXPECT_EQ (api->munmap (buf, size), 0);
   EXPECT_EQ (api->dealloc (model_dmabuf), 0);
   EXPECT_EQ (api->dealloc (buffer_dmabuf), 0);
@@ -722,8 +726,10 @@ TEST (ne_core_npu_test, run_inference_async1_triv2)
   ASSERT_GE (model.dbuf_fd, 0);
   input.model_id = model.id;
   input.num_segments = 1;
+  input.input_mode = INPUT_CPU;
+  input.output_mode = OUTPUT_CPU_INTR;
 
-  EXPECT_EQ (api->runInput (&input), 0);
+  EXPECT_GE (api->runInput (&input), 0);
   EXPECT_EQ (api->munmap (buf, size), 0);
   EXPECT_EQ (api->dealloc (model.dbuf_fd), 0);
   EXPECT_EQ (api->dealloc (buffer_dmabuf), 0);
@@ -767,6 +773,8 @@ TEST (ne_core_npu_test, run_inference_triv2_n)
   input.model_id = model.id;
   /** failure case: segments information is not properly set */
   input.num_segments = 0;
+  input.input_mode = INPUT_CPU;
+  input.output_mode = OUTPUT_CPU_INTR;
 
   EXPECT_EQ (api->runInput (&input), -EINVAL);
   EXPECT_EQ (api->dealloc (model_dmabuf), 0);