[UAPI] Set model's npubinfmt version

This patch sets model's npubinfmt version.

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

diff --git a/src/core/ne-handler.cc b/src/core/ne-handler.cc
index a2cd891..2e59748 100644 (file)
--- a/src/core/ne-handler.cc
+++ b/src/core/ne-handler.cc
@@ -862,6 +862,7 @@ TrinityVision::setModel (const generic_buffer *model_buf, Model ** model_ptr)
   if (hwmem_prog != nullptr) {
     /** register this model to the driver */
     model_config_t config;
+    config.version = model->getMetadata()->getVersion ();
     config.dbuf_fd = hwmem_prog->getDmabuf ();
     config.program_size = hwmem_prog->getSize ();
     config.program_offset_addr = hwmem_prog->getOffset ();
@@ -1128,6 +1129,7 @@ TrinityVision2::setModel (const generic_buffer *model_buf, Model ** model_ptr)
 
     /** register this model to the driver */
     model_config_t config;
+    config.version = model->getMetadata()->getVersion ();
     config.dbuf_fd = hwmem_prog->getDmabuf ();
     config.program_size = hwmem_prog->getSize ();
     config.program_offset_addr = 0;

diff --git a/tests/unittests/ne_core_npu_test.cc b/tests/unittests/ne_core_npu_test.cc
index 5fe47a0..e7878ab 100644 (file)
--- a/tests/unittests/ne_core_npu_test.cc
+++ b/tests/unittests/ne_core_npu_test.cc
@@ -519,6 +519,7 @@ TEST (ne_core_npu_test, run_inference_triv)
   model_dmabuf = api->alloc (size);
   EXPECT_GE (model_dmabuf, 0);
 
+  model.version = 2;
   model.dbuf_fd = model_dmabuf;
   model.program_offset_addr = 0;
   model.program_size = 0;
@@ -565,6 +566,7 @@ TEST (ne_core_npu_test, run_inference_triv2)
   model_dmabuf = api->alloc (size);
   EXPECT_GE (model_dmabuf, 0);
 
+  model.version = 3;
   model.dbuf_fd = model_dmabuf;
   model.program_offset_addr = 0;
   model.program_size = 0;
@@ -622,6 +624,7 @@ TEST (ne_core_npu_test, run_inference_async0_triv2)
   model_dmabuf = api->alloc (size);
   EXPECT_GE (model_dmabuf, 0);
 
+  model.version = 3;
   model.dbuf_fd = model_dmabuf;
   model.program_offset_addr = 0;
   model.program_size = 0;
@@ -697,6 +700,7 @@ TEST (ne_core_npu_test, run_inference_async1_triv2)
         if (ret < 0)
           return model;
 
+        model.version = 3;
         model.program_offset_addr = 0;
         model.program_size = 0;
         model.metadata_dbuf_fd = ret; /* dummy */
@@ -762,6 +766,7 @@ TEST (ne_core_npu_test, run_inference_triv2_n)
   model_dmabuf = api->alloc (size);
   EXPECT_GE (model_dmabuf, 0);
 
+  model.version = 3;
   model.dbuf_fd = model_dmabuf;
   model.program_offset_addr = 0;
   model.program_size = 0;