From 52b2202fa7b825f03069d7854a69982f15fa0937 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: Fri, 5 Oct 2018 13:15:20 +0900 Subject: [PATCH] [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 --- contrib/nnkit/tools/nni/CMakeLists.txt | 1 + contrib/nnkit/tools/nni/nni.cpp | 26 ++------------------------ 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/contrib/nnkit/tools/nni/CMakeLists.txt b/contrib/nnkit/tools/nni/CMakeLists.txt index 73edd02..6f4064e 100644 --- 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 --- a/contrib/nnkit/tools/nni/nni.cpp +++ b/contrib/nnkit/tools/nni/nni.cpp @@ -15,29 +15,7 @@ */ #include - -#include -#include - -// 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 _args; -}; +#include namespace { @@ -54,7 +32,7 @@ public: void append(const std::string &arg) { _args.append(arg); } private: - VectorArguments _args; + nnkit::VectorArguments _args; }; } -- 2.7.4