[enco] Do NOT use nncc::foundation::make_unique (#2657)

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/enco/cli/CMakeLists.txt b/contrib/enco/cli/CMakeLists.txt
index 582ca67..96d2419 100644 (file)
--- a/contrib/enco/cli/CMakeLists.txt
+++ b/contrib/enco/cli/CMakeLists.txt
@@ -5,5 +5,5 @@ target_include_directories(enco-cli PRIVATE src)
 target_link_libraries(enco-cli enco_intf_cmdline)
 target_link_libraries(enco-cli enco_intf_frontend)
 target_link_libraries(enco-cli enco_core)
-target_link_libraries(enco-cli nncc_foundation)
+target_link_libraries(enco-cli stdex)
 target_link_libraries(enco-cli dl)

diff --git a/contrib/enco/cli/src/Driver.cpp b/contrib/enco/cli/src/Driver.cpp
index 15fcb7a..185bb13 100644 (file)
--- a/contrib/enco/cli/src/Driver.cpp
+++ b/contrib/enco/cli/src/Driver.cpp
@@ -135,7 +135,7 @@ private:
 
 } // namespace
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 
@@ -153,7 +153,7 @@ static int entry(int argc, char **argv)
   std::map<std::string, std::function<void(const std::string &arg)>> argparse;
 
   argparse["--frontend"] = [&](const std::string &path) {
-    frontend_zone = nncc::foundation::make_unique<FrontendZone>(path);
+    frontend_zone = stdex::make_unique<FrontendZone>(path);
   };
 
   argparse["--frontend-arg"] = [&](const std::string &arg) { frontend_zone->append(arg); };

diff --git a/contrib/enco/core/CMakeLists.txt b/contrib/enco/core/CMakeLists.txt
index 0c2fcd7..02723c1 100644 (file)
--- a/contrib/enco/core/CMakeLists.txt
+++ b/contrib/enco/core/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(enco_core coco_core)
 target_link_libraries(enco_core coco_generic)
 target_link_libraries(enco_core pp)
 target_link_libraries(enco_core morph)
+target_link_libraries(enco_core stdex)
 
 nncc_find_package(GTest QUIET)
 

diff --git a/contrib/enco/core/src/ANN/Context.cpp b/contrib/enco/core/src/ANN/Context.cpp
index 39a706c..d4d1882 100644 (file)
--- a/contrib/enco/core/src/ANN/Context.cpp
+++ b/contrib/enco/core/src/ANN/Context.cpp
@@ -16,12 +16,12 @@
 
 #include "ANN/Context.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 ANNBinder *ANNContext::create(coco::Block *blk)
 {
-  auto mod = nncc::foundation::make_unique<ann::Module>();
-  auto obj = nncc::foundation::make_unique<ANNBinder>(blk, std::move(mod));
+  auto mod = stdex::make_unique<ann::Module>();
+  auto obj = stdex::make_unique<ANNBinder>(blk, std::move(mod));
   auto ptr = obj.get();
 
   _binders.emplace_back(std::move(obj));

diff --git a/contrib/enco/core/src/ANN/IR/OperandInventory.cpp b/contrib/enco/core/src/ANN/IR/OperandInventory.cpp
index 432038e..c7ad388 100644 (file)
--- a/contrib/enco/core/src/ANN/IR/OperandInventory.cpp
+++ b/contrib/enco/core/src/ANN/IR/OperandInventory.cpp
@@ -16,9 +16,9 @@
 
 #include "ANN/IR/OperandInventory.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace ann
 {

diff --git a/contrib/enco/core/src/ANN/IR/OperationInventory.cpp b/contrib/enco/core/src/ANN/IR/OperationInventory.cpp
index 01bfe7f..37d48c1 100644 (file)
--- a/contrib/enco/core/src/ANN/IR/OperationInventory.cpp
+++ b/contrib/enco/core/src/ANN/IR/OperationInventory.cpp
@@ -16,9 +16,9 @@
 
 #include "OperationInventory.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace ann
 {

diff --git a/contrib/enco/core/src/ANN/IR/WeightInventory.cpp b/contrib/enco/core/src/ANN/IR/WeightInventory.cpp
index 5dde220..d8809ac 100644 (file)
--- a/contrib/enco/core/src/ANN/IR/WeightInventory.cpp
+++ b/contrib/enco/core/src/ANN/IR/WeightInventory.cpp
@@ -16,9 +16,9 @@
 
 #include "WeightInventory.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace ann
 {

diff --git a/contrib/enco/core/src/Backend.cpp b/contrib/enco/core/src/Backend.cpp
index 129aa53..1480127 100644 (file)
--- a/contrib/enco/core/src/Backend.cpp
+++ b/contrib/enco/core/src/Backend.cpp
@@ -43,13 +43,13 @@
 #include "Transforms/Split.h"
 #include "Transforms/GlobalDataGeneration.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <stdexcept>
 #include <iostream>
 #include <fstream>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 using namespace enco;
 
 namespace

diff --git a/contrib/enco/core/src/CppGen/Host.cpp b/contrib/enco/core/src/CppGen/Host.cpp
index 73c0be7..37e0583 100644 (file)
--- a/contrib/enco/core/src/CppGen/Host.cpp
+++ b/contrib/enco/core/src/CppGen/Host.cpp
@@ -18,7 +18,7 @@
 
 #include <pp/EnclosedDocument.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 #include <string>
@@ -293,7 +293,7 @@ std::unique_ptr<pp::MultiLineText> HostBlockCompiler::compile(const coco::Block
 {
   InstrPrinter prn{_mem};
 
-  auto res = nncc::foundation::make_unique<pp::LinearDocument>();
+  auto res = stdex::make_unique<pp::LinearDocument>();
 
   for (auto ins = blk->instr()->head(); ins; ins = ins->next())
   {

diff --git a/contrib/enco/core/src/CppGen/Subnet.cpp b/contrib/enco/core/src/CppGen/Subnet.cpp
index 9477704..a3c89c9 100644 (file)
--- a/contrib/enco/core/src/CppGen/Subnet.cpp
+++ b/contrib/enco/core/src/CppGen/Subnet.cpp
@@ -21,11 +21,11 @@
 
 #include <pp/LinearDocument.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <sstream>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 using enco::concat;
 
 #define S(content) #content
@@ -379,7 +379,7 @@ std::unique_ptr<SubnetStruct> SubnetStructBuilder::build(const ANNBinder *binder
 
 std::unique_ptr<pp::MultiLineText> SubnetBlockCompiler::compile(const ANNBinder *binder) const
 {
-  auto res = nncc::foundation::make_unique<pp::LinearDocument>();
+  auto res = make_unique<pp::LinearDocument>();
 
   const auto compilation = _compilation_ctx.at(binder);
 

diff --git a/contrib/enco/core/src/Session.cpp b/contrib/enco/core/src/Session.cpp
index f930faa..034f238 100644 (file)
--- a/contrib/enco/core/src/Session.cpp
+++ b/contrib/enco/core/src/Session.cpp
@@ -16,12 +16,12 @@
 
 #include "Session.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 #include <memory>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace
 {

diff --git a/contrib/enco/core/src/Transforms/AvgPoolLowering.cpp b/contrib/enco/core/src/Transforms/AvgPoolLowering.cpp
index 3b90090..b398dba 100644 (file)
--- a/contrib/enco/core/src/Transforms/AvgPoolLowering.cpp
+++ b/contrib/enco/core/src/Transforms/AvgPoolLowering.cpp
@@ -22,16 +22,12 @@
 #include <nncc/core/ADT/feature/Shape.h>
 #include <nncc/core/ADT/feature/HWCLayout.h>
 
-#include <nncc/foundation/Memory.h>
-
 #include <set>
 #include <cassert>
 
 using namespace nncc::core::ADT;
 using nncc::core::ADT::feature::num_elements;
 
-using nncc::foundation::make_unique;
-
 namespace
 {
 

diff --git a/contrib/enco/core/src/Transforms/DataLayoutConversion.cpp b/contrib/enco/core/src/Transforms/DataLayoutConversion.cpp
index 524574b..29202a7 100644 (file)
--- a/contrib/enco/core/src/Transforms/DataLayoutConversion.cpp
+++ b/contrib/enco/core/src/Transforms/DataLayoutConversion.cpp
@@ -29,12 +29,8 @@
 #include <nncc/core/ADT/feature/HWCLayout.h>
 #include <nncc/core/ADT/kernel/NHWCLayout.h>
 
-#include <nncc/foundation/Memory.h>
-
 #include <set>
 
-using nncc::foundation::make_unique;
-
 namespace
 {
 

diff --git a/contrib/enco/core/src/Transforms/FeatureUnification.cpp b/contrib/enco/core/src/Transforms/FeatureUnification.cpp
index 95e79b5..56ac79f 100644 (file)
--- a/contrib/enco/core/src/Transforms/FeatureUnification.cpp
+++ b/contrib/enco/core/src/Transforms/FeatureUnification.cpp
@@ -17,14 +17,14 @@
 #include "FeatureUnification.h"
 #include "IRUtils.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <set>
 #include <vector>
 
 #include <cassert>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace
 {

diff --git a/contrib/enco/core/src/Transforms/GlobalDataGeneration.cpp b/contrib/enco/core/src/Transforms/GlobalDataGeneration.cpp
index f45b63a..5c254b6 100644 (file)
--- a/contrib/enco/core/src/Transforms/GlobalDataGeneration.cpp
+++ b/contrib/enco/core/src/Transforms/GlobalDataGeneration.cpp
@@ -18,11 +18,11 @@
 #include "Split.h"
 #include "Dims.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace
 {

diff --git a/contrib/enco/core/src/Transforms/Split.cpp b/contrib/enco/core/src/Transforms/Split.cpp
index 9ecb51b..40d7b7d 100644 (file)
--- a/contrib/enco/core/src/Transforms/Split.cpp
+++ b/contrib/enco/core/src/Transforms/Split.cpp
@@ -22,13 +22,13 @@
 #include <coco/IR.h>
 
 #include <nncc/core/ADT/kernel/NHWCLayout.h>
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <map>
 #include <stdexcept>
 #include <functional>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace
 {

diff --git a/contrib/enco/frontend/caffe/CMakeLists.txt b/contrib/enco/frontend/caffe/CMakeLists.txt
index e50cdb4..5305042 100644 (file)
--- a/contrib/enco/frontend/caffe/CMakeLists.txt
+++ b/contrib/enco/frontend/caffe/CMakeLists.txt
@@ -14,7 +14,6 @@ target_link_libraries(enco_caffe_frontend coco_core)
 target_link_libraries(enco_caffe_frontend coco_generic)
 target_link_libraries(enco_caffe_frontend enco_intf_frontend)
 target_link_libraries(enco_caffe_frontend enco_intf_cmdline)
-target_link_libraries(enco_caffe_frontend nncc_foundation)
 target_link_libraries(enco_caffe_frontend morph)
 target_link_libraries(enco_caffe_frontend caffeproto)
 target_link_libraries(enco_caffe_frontend stdex)

diff --git a/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp b/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp
index 6f7bf64..02670b0 100644 (file)
--- a/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp
+++ b/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp
@@ -18,7 +18,6 @@
 #include "Importer.h"
 
 #include <nncc/core/ADT/tensor/Shape.h>
-#include <nncc/foundation/Memory.h>
 
 #include <caffe/net.hpp>
 
@@ -29,8 +28,6 @@
 
 using namespace nncc::core::ADT;
 
-using nncc::foundation::make_unique;
-
 #define STRING(content) #content
 
 namespace

diff --git a/contrib/enco/frontend/caffe/src/Entry.cpp b/contrib/enco/frontend/caffe/src/Entry.cpp
index 2b2e708..35b216e 100644 (file)
--- a/contrib/enco/frontend/caffe/src/Entry.cpp
+++ b/contrib/enco/frontend/caffe/src/Entry.cpp
@@ -19,7 +19,7 @@
 
 #include <cmdline/View.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <fstream>
 #include <cassert>
@@ -28,7 +28,7 @@ extern "C" std::unique_ptr<enco::Frontend> make_frontend(const cmdline::View &cm
 {
   assert(cmdline.size() == 2);
 
-  auto frontend = nncc::foundation::make_unique<Frontend>();
+  auto frontend = stdex::make_unique<Frontend>();
 
   // Fill prototxt
   {

diff --git a/contrib/enco/frontend/caffe/src/PoolingSpec.test.cpp b/contrib/enco/frontend/caffe/src/PoolingSpec.test.cpp
index 1798c03..26bcaa0 100644 (file)
--- a/contrib/enco/frontend/caffe/src/PoolingSpec.test.cpp
+++ b/contrib/enco/frontend/caffe/src/PoolingSpec.test.cpp
@@ -18,7 +18,6 @@
 #include "Importer.h"
 
 #include <nncc/core/ADT/tensor/Shape.h>
-#include <nncc/foundation/Memory.h>
 
 #include <caffe/net.hpp>
 
@@ -32,8 +31,6 @@
 
 using namespace nncc::core::ADT;
 
-using nncc::foundation::make_unique;
-
 #define STRING(content) #content
 
 bool from_txt(const std::string &txt, ::caffe::PoolingParameter &out)

diff --git a/contrib/enco/frontend/tflite/src/Entry.cpp b/contrib/enco/frontend/tflite/src/Entry.cpp
index 6ce5d9e..c69e180 100644 (file)
--- a/contrib/enco/frontend/tflite/src/Entry.cpp
+++ b/contrib/enco/frontend/tflite/src/Entry.cpp
@@ -19,12 +19,12 @@
 
 #include <cmdline/View.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <fstream>
 #include <cassert>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 extern "C" std::unique_ptr<enco::Frontend> make_frontend(const cmdline::View &cmdline)
 {

diff --git a/contrib/enco/frontend/tflite/src/Frontend.test.cpp b/contrib/enco/frontend/tflite/src/Frontend.test.cpp
index 58e99d9..aee6099 100644 (file)
--- a/contrib/enco/frontend/tflite/src/Frontend.test.cpp
+++ b/contrib/enco/frontend/tflite/src/Frontend.test.cpp
@@ -16,11 +16,11 @@
 
 #include "Frontend.h"
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 #include <gtest/gtest.h>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 
 namespace
 {

diff --git a/contrib/enco/test/basic/000/CMakeLists.txt b/contrib/enco/test/basic/000/CMakeLists.txt
index ac64049..0ea8d5d 100644 (file)
--- a/contrib/enco/test/basic/000/CMakeLists.txt
+++ b/contrib/enco/test/basic/000/CMakeLists.txt
@@ -11,6 +11,7 @@ set(LIB_TARGET ${PREFIX}-lib)
 add_library(${PREFIX}-frontend SHARED enco.test.cpp)
 target_link_libraries(${PREFIX}-frontend enco_intf_cmdline)
 target_link_libraries(${PREFIX}-frontend enco_intf_frontend)
+target_link_libraries(${PREFIX}-frontend stdex)
 
 # NOTE BYPRODUCTS are not specified in order to enforce source code generation
 add_custom_target(${SOURCE_TARGET}

diff --git a/contrib/enco/test/basic/000/enco.test.cpp b/contrib/enco/test/basic/000/enco.test.cpp
index 5bd0b41..3dbf966 100644 (file)
--- a/contrib/enco/test/basic/000/enco.test.cpp
+++ b/contrib/enco/test/basic/000/enco.test.cpp
@@ -19,7 +19,7 @@
 
 #include <nncc/core/ADT/tensor/LexicalLayout.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
 using namespace nncc::core::ADT;
 
@@ -77,5 +77,5 @@ struct Frontend final : public enco::Frontend
 
 extern "C" std::unique_ptr<enco::Frontend> make_frontend(const cmdline::View &cmdline)
 {
-  return nncc::foundation::make_unique<Frontend>();
+  return stdex::make_unique<Frontend>();
 }

diff --git a/contrib/enco/test/binder.cpp b/contrib/enco/test/binder.cpp
index 08a26be..c8c72fc 100644 (file)
--- a/contrib/enco/test/binder.cpp
+++ b/contrib/enco/test/binder.cpp
@@ -46,9 +46,9 @@ void Network_invoke(Network *net);
 #include <nncc/core/ADT/tensor/LexicalLayout.h>
 #include <nncc/core/ADT/tensor/Overlay.h>
 
-#include <nncc/foundation/Memory.h>
+#include <stdex/Memory.h>
 
-using nncc::foundation::make_unique;
+using stdex::make_unique;
 using namespace nncc::core::ADT;
 
 namespace
@@ -184,5 +184,5 @@ private:
 
 extern "C" std::unique_ptr<nnkit::Backend> make_backend(const nnkit::CmdlineArguments &args)
 {
-  return nncc::foundation::make_unique<::Backend>();
+  return make_unique<::Backend>();
 }

diff --git a/contrib/enco/test/caffe/CMakeLists.txt b/contrib/enco/test/caffe/CMakeLists.txt
index a93ff73..b5de5ea 100644 (file)
--- a/contrib/enco/test/caffe/CMakeLists.txt
+++ b/contrib/enco/test/caffe/CMakeLists.txt
@@ -98,6 +98,7 @@ foreach(PREFIX IN ITEMS ${CANDIDATES})
   target_link_libraries(${BINDER_TARGET} nnkit_intf_backend)
   target_link_libraries(${BINDER_TARGET} ann_api)
   target_link_libraries(${BINDER_TARGET} ann_ref_static)
+  target_link_libraries(${BINDER_TARGET} stdex)
   set_target_properties(${BINDER_TARGET} PROPERTIES OUTPUT_NAME ${PREFIX})
   add_dependencies(${BINDER_TARGET} ${SOURCE_TARGET})
 

diff --git a/contrib/enco/test/tflite/CMakeLists.txt b/contrib/enco/test/tflite/CMakeLists.txt
index cbe37cc..67c1224 100644 (file)
--- a/contrib/enco/test/tflite/CMakeLists.txt
+++ b/contrib/enco/test/tflite/CMakeLists.txt
@@ -94,6 +94,7 @@ foreach(PREFIX IN ITEMS ${CANDIDATES})
   target_link_libraries(${BINDER_TARGET} nnkit_intf_backend)
   target_link_libraries(${BINDER_TARGET} ann_api)
   target_link_libraries(${BINDER_TARGET} ann_ref_static)
+  target_link_libraries(${BINDER_TARGET} stdex)
   set_target_properties(${BINDER_TARGET} PROPERTIES OUTPUT_NAME ${PREFIX})
   add_dependencies(${BINDER_TARGET} ${SOURCE_TARGET})