[caffegen] Allow Command to read command-line (#125)

This commit revises 'Command' interface to take command-line arguments
from main.

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

diff --git a/contrib/caffegen/include/Command.h b/contrib/caffegen/include/Command.h
index bc1c77e..1ca806a 100644 (file)
--- a/contrib/caffegen/include/Command.h
+++ b/contrib/caffegen/include/Command.h
@@ -5,7 +5,7 @@ struct Command
 {
   virtual ~Command() = default;
 
-  virtual int run(void) const = 0;
+  virtual int run(int argc, char **argv) const = 0;
 };
 
 #endif // __COMMAND_H__

diff --git a/contrib/caffegen/src/Driver.cpp b/contrib/caffegen/src/Driver.cpp
index 05899a6..76f7344 100644 (file)
--- a/contrib/caffegen/src/Driver.cpp
+++ b/contrib/caffegen/src/Driver.cpp
@@ -13,5 +13,5 @@ int main(int argc, char **argv)
   commands["fill"] = nncc::foundation::make_unique<FillCommand>();
   commands["encode"] = nncc::foundation::make_unique<EncodeCommand>();
 
-  return commands.at(argv[1])->run();
+  return commands.at(argv[1])->run(argc - 2, argv + 2);
 }

diff --git a/contrib/caffegen/src/EncodeCommand.cpp b/contrib/caffegen/src/EncodeCommand.cpp
index 382a270..3f7428d 100644 (file)
--- a/contrib/caffegen/src/EncodeCommand.cpp
+++ b/contrib/caffegen/src/EncodeCommand.cpp
@@ -8,7 +8,7 @@
 
 #include <iostream>
 
-int EncodeCommand::run(void) const
+int EncodeCommand::run(int, char **) const
 {
   caffe::NetParameter param;
 

diff --git a/contrib/caffegen/src/EncodeCommand.h b/contrib/caffegen/src/EncodeCommand.h
index 4371fd1..2188297 100644 (file)
--- a/contrib/caffegen/src/EncodeCommand.h
+++ b/contrib/caffegen/src/EncodeCommand.h
@@ -5,7 +5,7 @@
 
 struct EncodeCommand final : public Command
 {
-  int run(void) const override;
+  int run(int argc, char **argv) const override;
 };
 
 #endif // __ENCODE_COMMAND_H__

diff --git a/contrib/caffegen/src/FillCommand.cpp b/contrib/caffegen/src/FillCommand.cpp
index 0c366f7..266b205 100644 (file)
--- a/contrib/caffegen/src/FillCommand.cpp
+++ b/contrib/caffegen/src/FillCommand.cpp
@@ -13,7 +13,7 @@
 #include <random>
 #include <iostream>
 
-int FillCommand::run(void) const
+int FillCommand::run(int, char **) const
 {
   caffe::NetParameter param;
 

diff --git a/contrib/caffegen/src/FillCommand.h b/contrib/caffegen/src/FillCommand.h
index d9ce04e..1300cef 100644 (file)
--- a/contrib/caffegen/src/FillCommand.h
+++ b/contrib/caffegen/src/FillCommand.h
@@ -5,7 +5,7 @@
 
 struct FillCommand final : public Command
 {
-  int run(void) const override;
+  int run(int argc, char **argv) const override;
 };
 
 #endif // __FILL_COMMAND_H__