Repository navigation
[BugFix] fix for new verision of cann #11445
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -99,7 +99,12 @@ set_directory_properties(PROPERTIES | |
| ) | ||
|
|
||
| # Suppress warnings from catlass/tla third-party headers for CANN kernel compilation | ||
| set(VLLM_ASCEND_CANN_COMPAT_HEADER "${OPS_TRANSFORMER_DIR}/common/include/cann_compat.h") | ||
| list(APPEND OPS_COMPILE_OPTIONS -Wno-ignored-attributes) | ||
| list(APPEND OPS_COMPILE_OPTIONS -include${VLLM_ASCEND_CANN_COMPAT_HEADER}) | ||
| add_compile_options( | ||
| $<$<COMPILE_LANGUAGE:CXX>:-include${VLLM_ASCEND_CANN_COMPAT_HEADER}> | ||
| ) | ||
|
Comment on lines
+104
to
+107
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Passing |
||
|
|
||
| include(cmake/config.cmake) | ||
| include(cmake/func.cmake) | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,30 @@ | ||||||
| #pragma once | ||||||
|
|
||||||
| #include <stdint.h> | ||||||
|
|
||||||
| // B080 op_common/log/log.h stopped exposing the unqualified OP module id used | ||||||
| // by inherited ops-transformer tiling/error headers. Include the CANN log type | ||||||
| // header early so OP still comes from the active CANN version. | ||||||
| #if defined(__has_include) | ||||||
| #if __has_include("base/log_types.h") | ||||||
| #include "base/log_types.h" | ||||||
| #elif __has_include("toolchain/log_types.h") | ||||||
| #include "toolchain/log_types.h" | ||||||
| #endif | ||||||
| #endif | ||||||
|
|
||||||
| #if !defined(LOG_TYPES_H_) && !defined(OP) | ||||||
| #define OP 63 | ||||||
| #endif | ||||||
|
|
||||||
| #if defined(LOG_CPP) && !defined(DLOG_PUB_H_) | ||||||
| #ifdef __cplusplus | ||||||
| extern "C" { | ||||||
| #endif | ||||||
| int32_t CheckLogLevel(int32_t moduleId, int32_t logLevel); | ||||||
| void DlogRecord(int32_t moduleId, int32_t level, const char *fmt, ...); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To prevent format string vulnerabilities and ensure compile-time type safety of arguments, it is highly recommended to add the
Suggested change
|
||||||
| #ifdef __cplusplus | ||||||
| } | ||||||
| #endif | ||||||
| #define DLOG_PUB_H_ | ||||||
| #endif | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the Repository Style Guide, the PR Title and PR Summary should follow a specific format, especially when the PR description is empty.
Here are the suggested PR Title and PR Summary for this pull request:
Suggested PR Title:
Suggested PR Summary:
References