diff options
Diffstat (limited to 'compiler/oneco')
| -rw-r--r-- | compiler/oneco/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | compiler/oneco/requires.cmake | 1 | ||||
| -rw-r--r-- | compiler/oneco/src/Frontend.cpp | 4 | ||||
| -rw-r--r-- | compiler/oneco/src/GraphBuilder.h | 6 | ||||
| -rw-r--r-- | compiler/oneco/src/GraphBuilderContext.h | 6 | ||||
| -rw-r--r-- | compiler/oneco/src/GraphBuilderRegistry.h | 28 | ||||
| -rw-r--r-- | compiler/oneco/src/Op/Constant.h | 16 | ||||
| -rw-r--r-- | compiler/oneco/src/Op/Identity.h | 8 |
8 files changed, 39 insertions, 41 deletions
diff --git a/compiler/oneco/CMakeLists.txt b/compiler/oneco/CMakeLists.txt index 73bc57d43..951194d9d 100644 --- a/compiler/oneco/CMakeLists.txt +++ b/compiler/oneco/CMakeLists.txt @@ -1,5 +1,5 @@ nnas_find_package(Protobuf QUIET) -nnas_find_package(ONNXSource EXACT 1.4.1 QUIET) +nnas_find_package(ONNXSource EXACT 1.6.0 QUIET) if(NOT Protobuf_FOUND) return() @@ -20,14 +20,13 @@ target_include_directories(moco_onnx_frontend PRIVATE src) target_include_directories(moco_onnx_frontend PUBLIC include) target_link_libraries(moco_onnx_frontend PUBLIC moco_onnx_proto) target_link_libraries(moco_onnx_frontend PUBLIC loco) -target_link_libraries(moco_onnx_frontend PRIVATE stdex) target_link_libraries(moco_onnx_frontend PRIVATE cwrap) -nnas_find_package(GTest QUIET) - -if(NOT GTest_FOUND) +if(NOT ENABLE_TEST) return() -endif(NOT GTest_FOUND) +endif(NOT ENABLE_TEST) + +nnas_find_package(GTest QUIET) add_executable(moco_onnx_frontend_test ${TESTS}) target_include_directories(moco_onnx_frontend_test PRIVATE src) diff --git a/compiler/oneco/requires.cmake b/compiler/oneco/requires.cmake index 4e99b0eac..c11a84d9c 100644 --- a/compiler/oneco/requires.cmake +++ b/compiler/oneco/requires.cmake @@ -1,3 +1,2 @@ -require("stdex") require("loco") require("cwrap") diff --git a/compiler/oneco/src/Frontend.cpp b/compiler/oneco/src/Frontend.cpp index d633c1c2e..4b1554ee8 100644 --- a/compiler/oneco/src/Frontend.cpp +++ b/compiler/oneco/src/Frontend.cpp @@ -76,8 +76,8 @@ void load_onnx(const std::string &path, moco::onnx::Frontend::FileType type, // TODO Make comments clear void convert_graph(::onnx::ModelProto &onnx_model_proto, loco::Graph *graph) { - auto nodes = stdex::make_unique<moco::onnx::SymbolTable>(); - auto input_names = stdex::make_unique<moco::onnx::SymbolTable>(); + auto nodes = std::make_unique<moco::onnx::SymbolTable>(); + auto input_names = std::make_unique<moco::onnx::SymbolTable>(); moco::onnx::GraphBuilderContext gb_context(graph, nodes.get(), input_names.get()); diff --git a/compiler/oneco/src/GraphBuilder.h b/compiler/oneco/src/GraphBuilder.h index 7271eb81a..7e463ce9a 100644 --- a/compiler/oneco/src/GraphBuilder.h +++ b/compiler/oneco/src/GraphBuilder.h @@ -27,9 +27,9 @@ namespace onnx { /** -* @brief Parent class of onnx operation graph builders -* @note GraphBuilder call proper build and validate function according to opset version -*/ + * @brief Parent class of onnx operation graph builders + * @note GraphBuilder call proper build and validate function according to opset version + */ class GraphBuilder { public: diff --git a/compiler/oneco/src/GraphBuilderContext.h b/compiler/oneco/src/GraphBuilderContext.h index f1f394b50..dd368e335 100644 --- a/compiler/oneco/src/GraphBuilderContext.h +++ b/compiler/oneco/src/GraphBuilderContext.h @@ -69,13 +69,13 @@ private: }; /** -* @brief Class to store context to build IR from onnx -*/ + * @brief Class to store context to build IR from onnx + */ class GraphBuilderContext { public: GraphBuilderContext(loco::Graph *g, SymbolTable *nodes, SymbolTable *input_names) - : _g(g), _nodes(nodes), _input_names(input_names) + : _g(g), _nodes(nodes), _input_names(input_names) { // DO NOTHING } diff --git a/compiler/oneco/src/GraphBuilderRegistry.h b/compiler/oneco/src/GraphBuilderRegistry.h index 1bf4d9514..863a6ee3a 100644 --- a/compiler/oneco/src/GraphBuilderRegistry.h +++ b/compiler/oneco/src/GraphBuilderRegistry.h @@ -27,15 +27,15 @@ namespace onnx { /** -* @brief Class to return graph builder for passed onnx Operator -*/ + * @brief Class to return graph builder for passed onnx Operator + */ class GraphBuilderRegistry { public: /** - * @brief Returns registered GraphBuilder pointer for operator or - * nullptr if not registered - */ + * @brief Returns registered GraphBuilder pointer for operator or + * nullptr if not registered + */ const GraphBuilder *lookup(const std::string &op) const { if (_builder_map.find(op) == _builder_map.end()) @@ -63,16 +63,16 @@ private: } // namespace onnx } // namespace moco -#include <stdex/Memory.h> +#include <memory> -#define REGISTER_OP_BUILDER(NAME, BUILDER) \ - namespace \ - { \ - __attribute__((constructor)) void reg_op(void) \ - { \ - std::unique_ptr<moco::onnx::BUILDER> builder = stdex::make_unique<moco::onnx::BUILDER>(); \ - moco::onnx::GraphBuilderRegistry::get().add(#NAME, std::move(builder)); \ - } \ +#define REGISTER_OP_BUILDER(NAME, BUILDER) \ + namespace \ + { \ + __attribute__((constructor)) void reg_op(void) \ + { \ + std::unique_ptr<moco::onnx::BUILDER> builder = std::make_unique<moco::onnx::BUILDER>(); \ + moco::onnx::GraphBuilderRegistry::get().add(#NAME, std::move(builder)); \ + } \ } #endif // __MOCO_FRONTEND_ONNX_GRAPH_BUILDER_REGISTRY_H__ diff --git a/compiler/oneco/src/Op/Constant.h b/compiler/oneco/src/Op/Constant.h index e25441d58..be74cfcdd 100644 --- a/compiler/oneco/src/Op/Constant.h +++ b/compiler/oneco/src/Op/Constant.h @@ -24,8 +24,8 @@ namespace onnx { /** - * @brief GraphBuilder for Constant(since version 1) node - */ + * @brief GraphBuilder for Constant(since version 1) node + */ class Constant_V1 { public: @@ -34,10 +34,10 @@ public: }; /** - * @brief GraphBuilder for Constant(since version 9) node - * @note Until version 1, only FLOAT16, FLOAT, DOUBLE was supported - * Since version 9, all types are supported - */ + * @brief GraphBuilder for Constant(since version 9) node + * @note Until version 1, only FLOAT16, FLOAT, DOUBLE was supported + * Since version 9, all types are supported + */ class Constant_V9 { public: @@ -46,8 +46,8 @@ public: }; /** - * @brief GraphBuilder for Constant node - */ + * @brief GraphBuilder for Constant node + */ class ConstantGraphBuilder : public GraphBuilder { public: diff --git a/compiler/oneco/src/Op/Identity.h b/compiler/oneco/src/Op/Identity.h index 41367bea0..dde614592 100644 --- a/compiler/oneco/src/Op/Identity.h +++ b/compiler/oneco/src/Op/Identity.h @@ -24,8 +24,8 @@ namespace onnx { /** - * @brief GraphBuilder for Identity(since version 1) node - */ + * @brief GraphBuilder for Identity(since version 1) node + */ class Identity_V1 { public: @@ -34,8 +34,8 @@ public: }; /** - * @brief GraphBuilder for Identity node - */ + * @brief GraphBuilder for Identity node + */ class IdentityGraphBuilder : public GraphBuilder { public: |