[nnkit] Use make_unique in stdex instead of nncc::foundation (#2654)

This commit replaces all the occurrences of nncc::foundation::make_unique
with stdex::make_unique.

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

diff --git a/contrib/nnkit/actions/HDF5/CMakeLists.txt b/contrib/nnkit/actions/HDF5/CMakeLists.txt
index fdd421b..b799f6d 100644 (file)
--- a/contrib/nnkit/actions/HDF5/CMakeLists.txt
+++ b/contrib/nnkit/actions/HDF5/CMakeLists.txt
@@ -12,8 +12,10 @@ add_library(nnkit_HDF5_export_action SHARED Export.cpp)
 target_include_directories(nnkit_HDF5_export_action PRIVATE ${HDF5_INCLUDE_DIRS})
 target_link_libraries(nnkit_HDF5_export_action nnkit_intf_action)
 target_link_libraries(nnkit_HDF5_export_action nnkit_HDF5_common)
+target_link_libraries(nnkit_HDF5_export_action stdex)
 
 add_library(nnkit_HDF5_import_action SHARED Import.cpp)
 target_include_directories(nnkit_HDF5_import_action PRIVATE ${HDF5_INCLUDE_DIRS})
 target_link_libraries(nnkit_HDF5_import_action nnkit_intf_action)
 target_link_libraries(nnkit_HDF5_import_action nnkit_HDF5_common)
+target_link_libraries(nnkit_HDF5_import_action stdex)

diff --git a/contrib/nnkit/actions/HDF5/Export.cpp b/contrib/nnkit/actions/HDF5/Export.cpp
index 28cc39f..0d8ba5c 100644 (file)
--- a/contrib/nnkit/actions/HDF5/Export.cpp
+++ b/contrib/nnkit/actions/HDF5/Export.cpp
@@ -86,9 +86,9 @@ private:
 };
 
 #include <nnkit/CmdlineArguments.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 extern "C" std::unique_ptr<nnkit::Action> make_action(const nnkit::CmdlineArguments &args)
 {
-  return nncc::foundation::make_unique<HD5ExportAction>(args.at(0));
+  return stdex::make_unique<HD5ExportAction>(args.at(0));
 }

diff --git a/contrib/nnkit/actions/HDF5/Import.cpp b/contrib/nnkit/actions/HDF5/Import.cpp
index e66ab73..14628a2 100644 (file)
--- a/contrib/nnkit/actions/HDF5/Import.cpp
+++ b/contrib/nnkit/actions/HDF5/Import.cpp
@@ -89,9 +89,9 @@ private:
 };
 
 #include <nnkit/CmdlineArguments.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 extern "C" std::unique_ptr<nnkit::Action> make_action(const nnkit::CmdlineArguments &args)
 {
-  return nncc::foundation::make_unique<HD5ImportAction>(args.at(0));
+  return stdex::make_unique<HD5ImportAction>(args.at(0));
 }

diff --git a/contrib/nnkit/actions/builtin/CMakeLists.txt b/contrib/nnkit/actions/builtin/CMakeLists.txt
index 4de70df..910e12e 100644 (file)
--- a/contrib/nnkit/actions/builtin/CMakeLists.txt
+++ b/contrib/nnkit/actions/builtin/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_library(nnkit_show_action SHARED Show.cpp)
 target_link_libraries(nnkit_show_action nnkit_intf_action)
+target_link_libraries(nnkit_show_action stdex)
 
 add_library(nnkit_randomize_action SHARED Randomize.cpp)
 target_link_libraries(nnkit_randomize_action nnkit_intf_action)
+target_link_libraries(nnkit_randomize_action stdex)

diff --git a/contrib/nnkit/actions/builtin/Randomize.cpp b/contrib/nnkit/actions/builtin/Randomize.cpp
index ae4aeec..914e467 100644 (file)
--- a/contrib/nnkit/actions/builtin/Randomize.cpp
+++ b/contrib/nnkit/actions/builtin/Randomize.cpp
@@ -53,9 +53,9 @@ struct RandomizeAction final : public nnkit::Action
 };
 
 #include <nnkit/CmdlineArguments.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 extern "C" std::unique_ptr<nnkit::Action> make_action(const nnkit::CmdlineArguments &args)
 {
-  return nncc::foundation::make_unique<RandomizeAction>();
+  return stdex::make_unique<RandomizeAction>();
 }

diff --git a/contrib/nnkit/actions/builtin/Show.cpp b/contrib/nnkit/actions/builtin/Show.cpp
index d4ade55..92bf9b4 100644 (file)
--- a/contrib/nnkit/actions/builtin/Show.cpp
+++ b/contrib/nnkit/actions/builtin/Show.cpp
@@ -64,9 +64,9 @@ void ShowAction::run(nnkit::TensorContext &ctx)
 }
 
 #include <nnkit/CmdlineArguments.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 extern "C" std::unique_ptr<nnkit::Action> make_action(const nnkit::CmdlineArguments &args)
 {
-  return nncc::foundation::make_unique<ShowAction>();
+  return stdex::make_unique<ShowAction>();
 }

diff --git a/contrib/nnkit/backends/caffe/CMakeLists.txt b/contrib/nnkit/backends/caffe/CMakeLists.txt
index 3139fea..125822a 100644 (file)
--- a/contrib/nnkit/backends/caffe/CMakeLists.txt
+++ b/contrib/nnkit/backends/caffe/CMakeLists.txt
@@ -4,3 +4,4 @@ endif(NOT TARGET nnkit_support_caffe)
 
 add_library(nnkit_caffe_backend SHARED Module.cpp)
 target_link_libraries(nnkit_caffe_backend nnkit_support_caffe)
+target_link_libraries(nnkit_caffe_backend stdex)

diff --git a/contrib/nnkit/backends/caffe/Module.cpp b/contrib/nnkit/backends/caffe/Module.cpp
index 613aae1..cb24a4e 100644 (file)
--- a/contrib/nnkit/backends/caffe/Module.cpp
+++ b/contrib/nnkit/backends/caffe/Module.cpp
@@ -17,11 +17,11 @@
 #include "nnkit/support/caffe/Backend.h"
 
 #include <nnkit/CmdlineArguments.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 extern "C" std::unique_ptr<nnkit::Backend> make_backend(const nnkit::CmdlineArguments &args)
 {
-  using nncc::foundation::make_unique;
+  using stdex::make_unique;
 
   auto net = make_unique<::caffe::Net<float>>(args.at(0), caffe::TEST);
 
@@ -30,5 +30,5 @@ extern "C" std::unique_ptr<nnkit::Backend> make_backend(const nnkit::CmdlineArgu
     net->CopyTrainedLayersFrom(args.at(1));
   }
 
-  return nncc::foundation::make_unique<::nnkit::support::caffe::Backend<float>>(std::move(net));
+  return make_unique<::nnkit::support::caffe::Backend<float>>(std::move(net));
 }

diff --git a/contrib/nnkit/backends/tflite/Backend.cpp b/contrib/nnkit/backends/tflite/Backend.cpp
index ee11f73..d2fc31f 100644 (file)
--- a/contrib/nnkit/backends/tflite/Backend.cpp
+++ b/contrib/nnkit/backends/tflite/Backend.cpp
@@ -55,9 +55,9 @@ private:
 }
 
 #include <nnkit/CmdlineArguments.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 extern "C" std::unique_ptr<nnkit::Backend> make_backend(const nnkit::CmdlineArguments &args)
 {
-  return nncc::foundation::make_unique<GenericBackend>(args.at(0));
+  return stdex::make_unique<GenericBackend>(args.at(0));
 }

diff --git a/contrib/nnkit/backends/tflite/CMakeLists.txt b/contrib/nnkit/backends/tflite/CMakeLists.txt
index 31606b1..3f4a8ca 100644 (file)
--- a/contrib/nnkit/backends/tflite/CMakeLists.txt
+++ b/contrib/nnkit/backends/tflite/CMakeLists.txt
@@ -4,3 +4,4 @@ endif(NOT TARGET nnkit_support_tflite)
 
 add_library(nnkit_tflite_backend SHARED Backend.cpp)
 target_link_libraries(nnkit_tflite_backend nnkit_support_tflite)
+target_link_libraries(nnkit_tflite_backend stdex)

diff --git a/contrib/nnkit/tools/benchmark/CMakeLists.txt b/contrib/nnkit/tools/benchmark/CMakeLists.txt
index 9a2bd1d..4f2d669 100644 (file)
--- a/contrib/nnkit/tools/benchmark/CMakeLists.txt
+++ b/contrib/nnkit/tools/benchmark/CMakeLists.txt
@@ -3,3 +3,4 @@ file(GLOB_RECURSE SOURCES "src/*.cpp")
 add_executable(nnkit-benchmark ${SOURCES})
 target_link_libraries(nnkit-benchmark nnkit_support_cmdline)
 target_link_libraries(nnkit-benchmark nnkit_support_backend)
+target_link_libraries(nnkit-benchmark stdex)

diff --git a/contrib/nnkit/tools/benchmark/src/Benchmark.cpp b/contrib/nnkit/tools/benchmark/src/Benchmark.cpp
index b6061e7..a3e3ea0 100644 (file)
--- a/contrib/nnkit/tools/benchmark/src/Benchmark.cpp
+++ b/contrib/nnkit/tools/benchmark/src/Benchmark.cpp
@@ -18,7 +18,7 @@
 #include <nnkit/VectorArguments.h>
 #include <nnkit/BackendPlugin.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 #include <string>
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <iomanip>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 using std::chrono::milliseconds;
 using std::chrono::microseconds;

diff --git a/contrib/nnkit/tools/run/CMakeLists.txt b/contrib/nnkit/tools/run/CMakeLists.txt
index 1526e0a..99c1539 100644 (file)
--- a/contrib/nnkit/tools/run/CMakeLists.txt
+++ b/contrib/nnkit/tools/run/CMakeLists.txt
@@ -3,3 +3,4 @@ target_link_libraries(nnkit-run nnkit_intf_action)
 target_link_libraries(nnkit-run nnkit_intf_backend)
 target_link_libraries(nnkit-run nnkit_support_cmdline)
 target_link_libraries(nnkit-run nnkit_support_backend)
+target_link_libraries(nnkit-run stdex)

diff --git a/contrib/nnkit/tools/run/nnkit-run.cpp b/contrib/nnkit/tools/run/nnkit-run.cpp
index 95830e7..540787a 100644 (file)
--- a/contrib/nnkit/tools/run/nnkit-run.cpp
+++ b/contrib/nnkit/tools/run/nnkit-run.cpp
@@ -146,7 +146,7 @@ private:
 
 }
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 #include <iostream>
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
 
   argparse["--backend"] = [&sections] (const std::string &tag)
   {
-    sections.backend = nncc::foundation::make_unique<BackendSection>(tag);
+    sections.backend = stdex::make_unique<BackendSection>(tag);
   };
 
   argparse["--backend-arg"] = [&sections] (const std::string &arg)