Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Fix reorder error #14450

Closed
wants to merge 1 commit into from
Closed

Draft: Fix reorder error #14450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Draft: Fix reorder error 
Fix nncc reorder build error (gcc-13)

ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <[email protected]>
  • Loading branch information
@hseok-oh
hseok-oh committed Dec 13, 2024
commit e24411be57a8b4f831515237b3257091999a56ed
2 changes: 1 addition & 1 deletion compiler/arser/include/arser/arser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ class Argument
private:
// The '_names' vector contains all of the options specified by the user.
// And among them, '_long_name' and '_short_name' are selected.
std::string _long_name;
std::string _short_name;
std::string _long_name;
std::vector<std::string> _names;
std::string _type = "string";
std::vector<std::string> _help_message;
Expand Down
2 changes: 1 addition & 1 deletion compiler/luci-interpreter/src/core/RuntimeGraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class RuntimeGraph
void execute() const;

private:
IMemoryManager *_memory_manager;
RuntimeModule *_owning_module;
IMemoryManager *_memory_manager;
std::vector<std::unique_ptr<Tensor>> _tensors;
std::vector<Tensor *> _input_tensors;
std::vector<Tensor *> _output_tensors;
Expand Down
2 changes: 2 additions & 0 deletions compiler/luci-interpreter/src/kernels/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ target_link_libraries(${LUCI_INTERPRETER_KERNELS} PRIVATE nncc_common)

add_pal_to_target(${LUCI_INTERPRETER_KERNELS})

target_compile_options(${LUCI_INTERPRETER_KERNELS} PRIVATE -Wno-error=array-bounds)

if(NOT ENABLE_TEST)
return()
endif(NOT ENABLE_TEST)
Expand Down
3 changes: 2 additions & 1 deletion compiler/luci-interpreter/src/loader/GraphLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ class GraphLoader
const loco::Graph *_graph;
RuntimeGraph *_runtime_graph;
RuntimeToIR &_runtime_to_ir;
IMemoryManager *_memory_manager;

const std::unordered_map<const loco::Graph *, RuntimeGraph *> &_graph_to_runtime_graph;
std::unordered_map<const loco::Node *, Tensor *> &_node_to_tensor;

IMemoryManager *_memory_manager;
};

} // namespace luci_interpreter
Expand Down
2 changes: 1 addition & 1 deletion compiler/luci-interpreter/src/loader/ModuleLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ class ModuleLoader
void load();

private:
IMemoryManager *_memory_manager;
const luci::Module *_module;
RuntimeModule *_runtime_module;
RuntimeToIR &_runtime_to_ir;
std::unordered_map<const loco::Node *, Tensor *> &_node_to_tensor;
std::unordered_map<const loco::Graph *, RuntimeGraph *> _graph_to_runtime_graph;
IMemoryManager *_memory_manager;
};

} // namespace luci_interpreter
Expand Down
2 changes: 1 addition & 1 deletion infra/nncc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ include("cmake/ApplyCompileFlags.cmake")
add_library(nncc_common INTERFACE)
if(ENABLE_STRICT_BUILD)
# TODO Remove -Wno-reoder
target_compile_options(nncc_common INTERFACE -Werror -Wall -Wextra -Wno-reorder)
target_compile_options(nncc_common INTERFACE -Werror -Wall -Wextra -Wno-error=overloaded-virtual)
endif(ENABLE_STRICT_BUILD)

add_library(nncc_coverage INTERFACE)
Expand Down