diff options
author | Chunseok Lee <chunseok.lee@samsung.com> | 2020-10-28 12:16:55 +0900 |
---|---|---|
committer | Chunseok Lee <chunseok.lee@samsung.com> | 2020-10-28 12:16:55 +0900 |
commit | c55f8a6db48cda9d3a78048338b7f18c4cca62b8 (patch) | |
tree | 761ee8e171e5203f5c598ad93b2e7e0bc2e31aa2 /runtime/onert/frontend/circle | |
parent | 74476a2d0296bdad70a2f7f90bc7419a8b05bffd (diff) | |
download | nnfw-c55f8a6db48cda9d3a78048338b7f18c4cca62b8.tar.gz nnfw-c55f8a6db48cda9d3a78048338b7f18c4cca62b8.tar.bz2 nnfw-c55f8a6db48cda9d3a78048338b7f18c4cca62b8.zip |
Imported Upstream version 1.10.0upstream/1.10.0submit/tizen/20201028.104702submit/tizen/20201028.031836accepted/tizen/unified/20201029.124827
Diffstat (limited to 'runtime/onert/frontend/circle')
-rw-r--r-- | runtime/onert/frontend/circle/CMakeLists.txt | 2 | ||||
-rw-r--r-- | runtime/onert/frontend/circle/src/circle_loader.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/runtime/onert/frontend/circle/CMakeLists.txt b/runtime/onert/frontend/circle/CMakeLists.txt index 8bcf85dd3..76dca9989 100644 --- a/runtime/onert/frontend/circle/CMakeLists.txt +++ b/runtime/onert/frontend/circle/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(circle_loader SHARED ${CIRCLE_LOADER_SOURCES}) target_include_directories(circle_loader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_link_libraries(circle_loader PUBLIC onert_core) +target_link_libraries(circle_loader PRIVATE onert_core) target_link_libraries(circle_loader PRIVATE base_loader nnfw_common nnfw_coverage) target_link_libraries(circle_loader PRIVATE circle_schema) diff --git a/runtime/onert/frontend/circle/src/circle_loader.cc b/runtime/onert/frontend/circle/src/circle_loader.cc index 92a9ee7a5..4565ffc00 100644 --- a/runtime/onert/frontend/circle/src/circle_loader.cc +++ b/runtime/onert/frontend/circle/src/circle_loader.cc @@ -69,7 +69,7 @@ struct LoaderDomain static bool VerifyModelBuffer(Verifier &verifier) { return circle::VerifyModelBuffer(verifier); } }; -class CircleLoader final : public base_loader::BaseLoader<LoaderDomain, CircleLoader> +class CircleLoader final : public base_loader::BaseLoader<LoaderDomain> { protected: void loadInstanceNorm(const Operator *op, ir::Graph &subg); @@ -91,7 +91,8 @@ public: } } - std::unique_ptr<ir::Graph> loadSubgraph(const circle::SubGraph *circle_subg) +private: + std::unique_ptr<ir::Graph> loadSubgraph(const circle::SubGraph *circle_subg) override { auto subg = std::make_unique<ir::Graph>(); // Load tensors |