[tflchef] Remove dependency to stdex (#2146)

Getting rid of `stdex::make_unique` to minimize dependency.

Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>

diff --git a/contrib/tflchef/core/CMakeLists.txt b/contrib/tflchef/core/CMakeLists.txt
index e8f01a3..6081647 100644 (file)
--- a/contrib/tflchef/core/CMakeLists.txt
+++ b/contrib/tflchef/core/CMakeLists.txt
@@ -5,5 +5,4 @@ target_include_directories(tflchef_core PUBLIC include)
 target_include_directories(tflchef_core PRIVATE ${TensorFlowSource_DIR})
 target_include_directories(tflchef_core PRIVATE src)
 target_link_libraries(tflchef_core tflchef_proto)
-target_link_libraries(tflchef_core stdex)
 target_link_libraries(tflchef_core flatbuffers)

diff --git a/contrib/tflchef/core/src/ModelChef.cpp b/contrib/tflchef/core/src/ModelChef.cpp
index fa5cbaa..278f225 100644 (file)
--- a/contrib/tflchef/core/src/ModelChef.cpp
+++ b/contrib/tflchef/core/src/ModelChef.cpp
@@ -25,8 +25,6 @@
 
 #include "Dataset.h"
 
-#include <stdex/Memory.h>
-
 #include <map>
 #include <string>
 #include <vector>
@@ -37,8 +35,6 @@
 #include <numeric>
 #include <stdexcept>
 
-using stdex::make_unique;
-
 namespace
 {
 
@@ -201,13 +197,15 @@ namespace tflchef
 GeneratedModel cook(const ::tflchef::ModelRecipe &model_recipe)
 {
 // Initialize Op Chef Registry
-#define OP_CHEF(NAME, FACTORY_CLASS) op_chef_registry().add(#NAME, make_unique<FACTORY_CLASS>());
+#define OP_CHEF(NAME, FACTORY_CLASS) \
+  op_chef_registry().add(#NAME, std::unique_ptr<FACTORY_CLASS>(new FACTORY_CLASS()));
 #include "OpChef.def"
 #undef OP_CHEF
 
 // Initialize Data Chef Registry
 #define DATA_CHEF(TYPE, NAME, FACTORY_CLASS) \
-  data_chef_registry(::tflchef::TYPE).add(#NAME, make_unique<FACTORY_CLASS>());
+  data_chef_registry(::tflchef::TYPE)        \
+      .add(#NAME, std::unique_ptr<FACTORY_CLASS>(new FACTORY_CLASS()));
 #include "DataChef.def"
 #undef DATA_CHEF
 
@@ -219,7 +217,8 @@ GeneratedModel cook(const ::tflchef::ModelRecipe &model_recipe)
   //
   // Create FlatBufferBuilder
   //
-  auto flatbuffer_builder = make_unique<flatbuffers::FlatBufferBuilder>(1024);
+  auto flatbuffer_builder =
+      std::unique_ptr<flatbuffers::FlatBufferBuilder>(new flatbuffers::FlatBufferBuilder(1024));
 
   // Operand-related
   std::vector<flatbuffers::Offset<::tflite::Buffer>> buffer_vec;
@@ -379,7 +378,8 @@ GeneratedModel cook(const ::tflchef::ModelRecipe &model_recipe)
   ::tflite::FinishModelBuffer(*flatbuffer_builder, model);
 
   // Return "GenerateModel"
-  return GeneratedModel{make_unique<GeneratedModelImpl>(std::move(flatbuffer_builder))};
+  return GeneratedModel{
+      std::unique_ptr<GeneratedModelImpl>(new GeneratedModelImpl(std::move(flatbuffer_builder)))};
 }
 
 } // namespace tflchef