[nnkit] Remove duplicated VectorArguments (#1757)

This commit replaces VectorArguments implemented in nni with the one
that nnkit_support_cmdline provides.

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

diff --git a/contrib/nnkit/tools/nni/CMakeLists.txt b/contrib/nnkit/tools/nni/CMakeLists.txt
index 73edd02..6f4064e 100644 (file)
--- a/contrib/nnkit/tools/nni/CMakeLists.txt
+++ b/contrib/nnkit/tools/nni/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB_RECURSE SOURCES "*.cpp")
 add_executable(nni ${SOURCES})
 target_link_libraries(nni nnkit_intf_action)
 target_link_libraries(nni nnkit_intf_backend)
+target_link_libraries(nni nnkit_support_cmdline)
 target_link_libraries(nni dl)

diff --git a/contrib/nnkit/tools/nni/nni.cpp b/contrib/nnkit/tools/nni/nni.cpp
index 501b498..f754e53 100644 (file)
--- a/contrib/nnkit/tools/nni/nni.cpp
+++ b/contrib/nnkit/tools/nni/nni.cpp
@@ -15,29 +15,7 @@
  */
 
 #include <nnkit/CmdlineArguments.h>
-
-#include <string>
-#include <vector>
-
-// TODO Extract this helper class
-class VectorArguments : public nnkit::CmdlineArguments
-{
-public:
-  uint32_t size(void) const { return _args.size(); }
-
-public:
-  const char *at(uint32_t nth) const { return _args.at(nth).c_str(); }
-
-public:
-  VectorArguments &append(const std::string &arg)
-  {
-    _args.emplace_back(arg);
-    return (*this);
-  }
-
-private:
-  std::vector<std::string> _args;
-};
+#include <nnkit/VectorArguments.h>
 
 namespace
 {
@@ -54,7 +32,7 @@ public:
   void append(const std::string &arg) { _args.append(arg); }
 
 private:
-  VectorArguments _args;
+  nnkit::VectorArguments _args;
 };
 
 }