Skip to content

[AOT][BUG] Only include extra headers if the constants array is needed. #12061

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

Merged
merged 1 commit into from
Jul 12, 2022
Merged

[AOT][BUG] Only include extra headers if the constants array is needed. #12061

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
11 changes: 7 additions & 4 deletions src/relay/backend/contrib/codegen_c/codegen.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ class CodegenC : public backend::MemoizedExprTranslator<std::vector<Output>>, pu
* \return The emitted code.
*/
std::string JIT(const std::vector<Output>& out) override {
if (!ext_func_args_.empty()) {
*needs_extra_headers_ = true;
}
// Write function macros
for (auto decl : func_decl_) {
code_stream_ << decl << "\n";
Expand Down Expand Up @@ -109,6 +106,9 @@ class CodegenC : public backend::MemoizedExprTranslator<std::vector<Output>>, pu
}

std::vector<Output> VisitExpr_(const ConstantNode* cn) override {
// Remember we'll need some extra headers to support the runtime constants array.
*needs_extra_headers_ = true;

std::ostringstream decl_stream;
std::ostringstream buf_stream;

Expand Down Expand Up @@ -215,7 +215,10 @@ class CodegenC : public backend::MemoizedExprTranslator<std::vector<Output>>, pu
std::unordered_map<std::string, runtime::NDArray>* const_name_to_constant_;
/*! \brief The accumulated constant names, in the order they were generated. */
Array<String>* const_names_;
/*! \brief Set to true if the ndarray and packed function headers are required. */
/*!
* \brief Set to true if the ndarray and packed function headers are required to declare and
* manage the constants array.
*/
bool* needs_extra_headers_;
/*! \brief Name of the global function currently being compiled. */
std::string ext_func_id_;
Expand Down