[nnsuite] Use stdex::make_unique (#2653)

This commit replaces all the use of nncc::foundation::make_unique in
nnsuite with stdex::make_unique.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt b/contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt
index c321dd4..8aae310 100644 (file)
--- a/contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt
+++ b/contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt
@@ -9,6 +9,7 @@ list(REMOVE_ITEM SOURCES ${TESTS})
 add_library(nnsuite_conv_caffe SHARED ${SOURCES})
 target_link_libraries(nnsuite_conv_caffe nnsuite_conv)
 target_link_libraries(nnsuite_conv_caffe nnkit_support_caffe)
+target_link_libraries(nnsuite_conv_caffe stdex)
 
 nncc_find_package(GTest QUIET)
 
@@ -18,7 +19,6 @@ endif(NOT GTest_FOUND)
 
 add_executable(nnsuite_conv_caffe_test ${TESTS})
 target_link_libraries(nnsuite_conv_caffe_test nnsuite_conv_caffe)
-target_link_libraries(nnsuite_conv_caffe_test nncc_foundation)
 target_link_libraries(nnsuite_conv_caffe_test morph)
 target_link_libraries(nnsuite_conv_caffe_test gtest_main)
 add_test(nnsuite_conv_caffe_test nnsuite_conv_caffe_test)

diff --git a/contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp b/contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp
index d894972..31d2b33 100644 (file)
--- a/contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp
+++ b/contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp
@@ -23,9 +23,9 @@
 #include <nncc/core/ADT/kernel/Overlay.h>
 #include <nncc/core/ADT/kernel/NCHWLayout.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 std::unique_ptr<nnkit::Backend> ConvBackend::create(const nnsuite::conv::Model &model)
 {

diff --git a/contrib/nnsuite/conv/nnkit-tflite/CMakeLists.txt b/contrib/nnsuite/conv/nnkit-tflite/CMakeLists.txt
index c1f3e92..9a51394 100644 (file)
--- a/contrib/nnsuite/conv/nnkit-tflite/CMakeLists.txt
+++ b/contrib/nnsuite/conv/nnkit-tflite/CMakeLists.txt
@@ -9,6 +9,7 @@ list(REMOVE_ITEM SOURCES ${TESTS})
 add_library(nnsuite_conv_tflite SHARED ${SOURCES})
 target_link_libraries(nnsuite_conv_tflite nnsuite_conv)
 target_link_libraries(nnsuite_conv_tflite nnkit_support_tflite)
+target_link_libraries(nnsuite_conv_tflite stdex)
 
 nncc_find_package(GTest QUIET)
 
@@ -18,6 +19,5 @@ endif(NOT GTest_FOUND)
 
 add_executable(nnsuite_conv_tflite_test ${TESTS})
 target_link_libraries(nnsuite_conv_tflite_test nnsuite_conv_tflite)
-target_link_libraries(nnsuite_conv_tflite_test nncc_foundation)
 target_link_libraries(nnsuite_conv_tflite_test gtest_main)
 add_test(nnsuite_conv_tflite_test nnsuite_conv_tflite_test)

diff --git a/contrib/nnsuite/conv/nnkit-tflite/Entry.cpp b/contrib/nnsuite/conv/nnkit-tflite/Entry.cpp
index af9f147..2c84f72 100644 (file)
--- a/contrib/nnsuite/conv/nnkit-tflite/Entry.cpp
+++ b/contrib/nnsuite/conv/nnkit-tflite/Entry.cpp
@@ -21,7 +21,7 @@
 #include <nnkit/Backend.h>
 #include <nnkit/CmdlineArguments.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <chrono>
 #include <iostream>
@@ -40,5 +40,5 @@ extern "C" std::unique_ptr<nnkit::Backend> make_backend(const nnkit::CmdlineArgu
 
   const nnsuite::conv::RandomModel model{seed};
 
-  return nncc::foundation::make_unique<ConvBackend>(model);
+  return stdex::make_unique<ConvBackend>(model);
 }