From 94bb4dcefec32492cf96d73a37179bc646ccb121 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 13 Dec 2018 12:16:06 +0900 Subject: [PATCH] [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 --- contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt | 2 +- contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp | 4 ++-- contrib/nnsuite/conv/nnkit-tflite/CMakeLists.txt | 2 +- contrib/nnsuite/conv/nnkit-tflite/Entry.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt b/contrib/nnsuite/conv/nnkit-caffe/CMakeLists.txt index c321dd4..8aae310 100644 --- 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 --- a/contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp +++ b/contrib/nnsuite/conv/nnkit-caffe/ConvBackend.cpp @@ -23,9 +23,9 @@ #include #include -#include +#include -using nncc::foundation::make_unique; +using stdex::make_unique; std::unique_ptr 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 --- 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 --- a/contrib/nnsuite/conv/nnkit-tflite/Entry.cpp +++ b/contrib/nnsuite/conv/nnkit-tflite/Entry.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -40,5 +40,5 @@ extern "C" std::unique_ptr make_backend(const nnkit::CmdlineArgu const nnsuite::conv::RandomModel model{seed}; - return nncc::foundation::make_unique(model); + return stdex::make_unique(model); } -- 2.7.4