From 7ce23ee850f8b9ecd6a2efb34dc9f4e7a7c08854 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 24 Jul 2019 14:34:52 +0900 Subject: [PATCH] Apply coding style to compiler modules (#5812) Apply coding style to - cli - moco-onnx - nnop Signed-off-by: Hyeongseok Oh --- compiler/cli/.FORMATCHECKED | 0 compiler/cli/include/cli/App.h | 4 +- compiler/cli/include/cli/Command.h | 2 +- compiler/cli/include/cli/FunctionCommand.h | 4 +- compiler/cli/src/App.cpp | 20 ++--- compiler/cli/src/App.test.cpp | 8 +- compiler/moco-onnx/.FORMATCHECKED | 0 compiler/moco-onnx/src/Convert.cpp | 134 ++++++++++++++--------------- compiler/nnop/.FORMATCHECKED | 0 compiler/nnop/include/nnop/Conv2D.h | 16 ++-- compiler/nnop/src/Conv2D.test.cpp | 6 +- 11 files changed, 95 insertions(+), 99 deletions(-) create mode 100644 compiler/cli/.FORMATCHECKED create mode 100644 compiler/moco-onnx/.FORMATCHECKED create mode 100644 compiler/nnop/.FORMATCHECKED diff --git a/compiler/cli/.FORMATCHECKED b/compiler/cli/.FORMATCHECKED new file mode 100644 index 0000000..e69de29 diff --git a/compiler/cli/include/cli/App.h b/compiler/cli/include/cli/App.h index 4629c3d..61554e9 100644 --- a/compiler/cli/include/cli/App.h +++ b/compiler/cli/include/cli/App.h @@ -35,10 +35,10 @@ public: App &insert(const std::string &tag, std::unique_ptr &&command); public: - int run(int argc, const char * const *argv) const; + int run(int argc, const char *const *argv) const; private: - void usage(std::ostream& os) const; + void usage(std::ostream &os) const; private: const std::string _name; diff --git a/compiler/cli/include/cli/Command.h b/compiler/cli/include/cli/Command.h index e006225..2e264f9 100644 --- a/compiler/cli/include/cli/Command.h +++ b/compiler/cli/include/cli/Command.h @@ -24,7 +24,7 @@ struct Command { virtual ~Command() = default; - virtual int run(int argc, const char * const *argv) const = 0; + virtual int run(int argc, const char *const *argv) const = 0; }; } // namespace cli diff --git a/compiler/cli/include/cli/FunctionCommand.h b/compiler/cli/include/cli/FunctionCommand.h index 8dbc685..5856530 100644 --- a/compiler/cli/include/cli/FunctionCommand.h +++ b/compiler/cli/include/cli/FunctionCommand.h @@ -26,7 +26,7 @@ class FunctionCommand final : public Command { public: // NOTE The use of pure funtion pointer here is intended to disallow variable capture - using Entry = int (*)(int argc, const char * const *argv); + using Entry = int (*)(int argc, const char *const *argv); public: FunctionCommand(const Entry &entry) : _entry{entry} @@ -35,7 +35,7 @@ public: } public: - int run(int argc, const char * const *argv) const override { return _entry(argc, argv); }; + int run(int argc, const char *const *argv) const override { return _entry(argc, argv); }; private: Entry const _entry; diff --git a/compiler/cli/src/App.cpp b/compiler/cli/src/App.cpp index cfc2b29..5052f68 100644 --- a/compiler/cli/src/App.cpp +++ b/compiler/cli/src/App.cpp @@ -36,7 +36,7 @@ App &App::insert(const std::string &tag, std::unique_ptr &&command) return (*this); } -int App::run(int argc, const char * const *argv) const +int App::run(int argc, const char *const *argv) const { if (argc < 1) { @@ -59,16 +59,16 @@ int App::run(int argc, const char * const *argv) const return it->second->run(argc - 1, argv + 1); } -void App::usage(std::ostream& os) const +void App::usage(std::ostream &os) const { - os << std::endl; - os << "USAGE: " << _name << " [COMMAND] ..." << std::endl; - os << std::endl; - os << "SUPPORTED COMMANDS:" << std::endl; - for (auto it = _commands.begin(); it != _commands.end(); ++it) - { - os << " " << it->first << std::endl; - } + os << std::endl; + os << "USAGE: " << _name << " [COMMAND] ..." << std::endl; + os << std::endl; + os << "SUPPORTED COMMANDS:" << std::endl; + for (auto it = _commands.begin(); it != _commands.end(); ++it) + { + os << " " << it->first << std::endl; + } } } // namespace cli diff --git a/compiler/cli/src/App.test.cpp b/compiler/cli/src/App.test.cpp index 80f25ac..fe2d441 100644 --- a/compiler/cli/src/App.test.cpp +++ b/compiler/cli/src/App.test.cpp @@ -29,7 +29,7 @@ public: } public: - int run(int argc, const char * const *argv) const override + int run(int argc, const char *const *argv) const override { _out += std::to_string(argc); @@ -54,11 +54,7 @@ TEST(APP, run) std::string args; app.insert("record", stdex::make_unique(3, args)); - const char *argv[] = { - "record", - "hello", - "world" - }; + const char *argv[] = {"record", "hello", "world"}; int ret = app.run(3, argv); diff --git a/compiler/moco-onnx/.FORMATCHECKED b/compiler/moco-onnx/.FORMATCHECKED new file mode 100644 index 0000000..e69de29 diff --git a/compiler/moco-onnx/src/Convert.cpp b/compiler/moco-onnx/src/Convert.cpp index 82824ba..b56b03e 100644 --- a/compiler/moco-onnx/src/Convert.cpp +++ b/compiler/moco-onnx/src/Convert.cpp @@ -29,38 +29,38 @@ loco::DataType as_loco_datatype(const int32_t tensor_dtype) { switch (tensor_dtype) { - case 0: // UNDEFINED - return loco::DataType::Unknown; - case 1: // FLOAT - return loco::DataType::FLOAT32; - case 2: // UINT8 - return loco::DataType::U8; - case 3: // INT8 - return loco::DataType::S8; - case 4: // UINT16 - return loco::DataType::U16; - case 5: // INT16 - return loco::DataType::S16; - case 6: // INT32 - return loco::DataType::S32; - case 7: // INT64 - return loco::DataType::S64; - case 10: // FLOAT16 - return loco::DataType::FLOAT16; - case 11: // DOUBLE - return loco::DataType::FLOAT64; - case 12: // UINT32 - return loco::DataType::U32; - case 13: // UINT64 - return loco::DataType::U64; + case 0: // UNDEFINED + return loco::DataType::Unknown; + case 1: // FLOAT + return loco::DataType::FLOAT32; + case 2: // UINT8 + return loco::DataType::U8; + case 3: // INT8 + return loco::DataType::S8; + case 4: // UINT16 + return loco::DataType::U16; + case 5: // INT16 + return loco::DataType::S16; + case 6: // INT32 + return loco::DataType::S32; + case 7: // INT64 + return loco::DataType::S64; + case 10: // FLOAT16 + return loco::DataType::FLOAT16; + case 11: // DOUBLE + return loco::DataType::FLOAT64; + case 12: // UINT32 + return loco::DataType::U32; + case 13: // UINT64 + return loco::DataType::U64; - case 8: // STRING - case 9: // BOOL - case 14: // COMPLEX64 - case 15: // COMPLEX128 - case 16: // BFLOAT16 - default: - break; + case 8: // STRING + case 9: // BOOL + case 14: // COMPLEX64 + case 15: // COMPLEX128 + case 16: // BFLOAT16 + default: + break; } throw std::runtime_error{"Unsupported onnx dtype"}; } @@ -69,42 +69,42 @@ std::string tensor_dtype_as_string(const int32_t tensor_dtype) { switch (tensor_dtype) { - case 0: // UNDEFINED - return "UNDEFINED"; - case 1: // FLOAT - return "FLOAT"; - case 2: // UINT8 - return "UINT8"; - case 3: // INT8 - return "INT8"; - case 4: // UINT16 - return "UINT16"; - case 5: // INT16 - return "INT16"; - case 6: // INT32 - return "INT32"; - case 7: // INT64 - return "INT64"; - case 8: // STRING - return "STRING"; - case 9: // BOOL - return "BOOL"; - case 10: // FLOAT16 - return "FLOAT16"; - case 11: // DOUBLE - return "DOUBLE"; - case 12: // UINT32 - return "UINT32"; - case 13: // UINT64 - return "UINT64"; - case 14: // COMPLEX64 - return "COMPLEX64"; - case 15: // COMPLEX128 - return "COMPLEX128"; - case 16: // BFLOAT16 - return "BFLOAT16"; - default: - break; + case 0: // UNDEFINED + return "UNDEFINED"; + case 1: // FLOAT + return "FLOAT"; + case 2: // UINT8 + return "UINT8"; + case 3: // INT8 + return "INT8"; + case 4: // UINT16 + return "UINT16"; + case 5: // INT16 + return "INT16"; + case 6: // INT32 + return "INT32"; + case 7: // INT64 + return "INT64"; + case 8: // STRING + return "STRING"; + case 9: // BOOL + return "BOOL"; + case 10: // FLOAT16 + return "FLOAT16"; + case 11: // DOUBLE + return "DOUBLE"; + case 12: // UINT32 + return "UINT32"; + case 13: // UINT64 + return "UINT64"; + case 14: // COMPLEX64 + return "COMPLEX64"; + case 15: // COMPLEX128 + return "COMPLEX128"; + case 16: // BFLOAT16 + return "BFLOAT16"; + default: + break; } throw std::runtime_error{"Unsupported onnx dtype"}; } diff --git a/compiler/nnop/.FORMATCHECKED b/compiler/nnop/.FORMATCHECKED new file mode 100644 index 0000000..e69de29 diff --git a/compiler/nnop/include/nnop/Conv2D.h b/compiler/nnop/include/nnop/Conv2D.h index eae2f9c..a39caa3 100644 --- a/compiler/nnop/include/nnop/Conv2D.h +++ b/compiler/nnop/include/nnop/Conv2D.h @@ -30,14 +30,14 @@ namespace nnop { -template +template void conv(const nncc::core::ADT::feature::Shape &out_shape, nncc::core::ADT::feature::Accessor &out_data, const nncc::core::ADT::feature::Shape &in_shape, const nncc::core::ADT::feature::Reader &in_data, const nncc::core::ADT::kernel::Shape &ker_shape, - const nncc::core::ADT::kernel::Reader &ker_data, - const PadInfo &pad_info, const StrideInfo &stride_info) + const nncc::core::ADT::kernel::Reader &ker_data, const PadInfo &pad_info, + const StrideInfo &stride_info) { for (uint32_t out_ch = 0; out_ch < out_shape.depth(); ++out_ch) { @@ -62,12 +62,12 @@ void conv(const nncc::core::ADT::feature::Shape &out_shape, const int64_t in_row = vertical_stride * out_row - top_padding + ker_row; const int64_t in_col = horizontal_stride * out_col - left_padding + ker_col; - const bool is_padding = (in_row < 0) || (in_row >= in_shape.height()) - || (in_col < 0) || (in_col >= in_shape.width()); + const bool is_padding = (in_row < 0) || (in_row >= in_shape.height()) || + (in_col < 0) || (in_col >= in_shape.width()); - const auto in_value = (is_padding) - ? 0 - : in_data.at(in_ch, static_cast(in_row), static_cast(in_col)); + const auto in_value = (is_padding) ? 0 + : in_data.at(in_ch, static_cast(in_row), + static_cast(in_col)); const auto ker_value = ker_data.at(out_ch, in_ch, ker_row, ker_col); diff --git a/compiler/nnop/src/Conv2D.test.cpp b/compiler/nnop/src/Conv2D.test.cpp index ebe23ce..9cb2ecb 100644 --- a/compiler/nnop/src/Conv2D.test.cpp +++ b/compiler/nnop/src/Conv2D.test.cpp @@ -30,15 +30,15 @@ using namespace nncc::core::ADT; TEST(CONV2D, conv_1) { const feature::Shape ofm_shape{1, 1, 1}; - int ofm_data[] = { 0 }; + int ofm_data[] = {0}; auto ofm_overlay = feature::make_overlay(ofm_shape, ofm_data); const feature::Shape ifm_shape{1, 3, 3}; - int ifm_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + int ifm_data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; auto ifm_overlay = feature::make_overlay(ifm_shape, ifm_data); const kernel::Shape ker_shape{1, 1, 3, 3}; - int ker_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + int ker_data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; auto ker_overlay = kernel::make_overlay(ker_shape, ker_data); const PadInfo pad{0, 0, 0, 0}; -- 2.7.4