Fix UST_LOGGER_MARK_COMPLETED build failure in manifold_trace_logger (#1389)#1389
Closed
Raymo111 wants to merge 1 commit into
Closed
Fix UST_LOGGER_MARK_COMPLETED build failure in manifold_trace_logger (#1389)#1389Raymo111 wants to merge 1 commit into
Raymo111 wants to merge 1 commit into
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates libkineto's stage/USDT logging macros so they no longer expand through LOG(...), avoiding build failures when glog transitively redefines LOG in translation units that include both headers.
Changes:
- Replaced
UST_LOGGER_MARK_COMPLETEDwith a directlibkineto::Logger(...).stream()expansion. - Replaced
USDT_LOGGER_EMIT_MESSAGEsimilarly to avoidLOGmacro substitution at the call site. - Kept the higher-level
USDT_EMIT_START_TRACE/USDT_EMIT_STOP_TRACEhelpers unchanged.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+257
to
+265
| // glog/logging.h. | ||
| #define UST_LOGGER_MARK_COMPLETED(stage) \ | ||
| libkineto::VoidLogger() & \ | ||
| libkineto::Logger(libkineto::LoggerOutputType::STAGE, __LINE__, __FILE__).stream() \ | ||
| << "Completed Stage: " << stage | ||
|
|
||
| #define USDT_LOGGER_EMIT_MESSAGE(usdt_type) \ | ||
| libkineto::VoidLogger() & \ | ||
| libkineto::Logger(libkineto::LoggerOutputType::USDT, __LINE__, __FILE__).stream() << usdt_type |
Comment on lines
+263
to
+265
| #define USDT_LOGGER_EMIT_MESSAGE(usdt_type) \ | ||
| libkineto::VoidLogger() & \ | ||
| libkineto::Logger(libkineto::LoggerOutputType::USDT, __LINE__, __FILE__).stream() << usdt_type |
meta-codesync
Bot
changed the title
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 6, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235 Signed-off-by: Raymond Li <raymo@meta.com>
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 6, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235 Signed-off-by: Raymond Li <raymo@meta.com>
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 11, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235
Raymo111
force-pushed
the
export-D98533235
branch
from
2e73ebd to
aca90bc
Compare
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 11, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235
Raymo111
force-pushed
the
export-D98533235
branch
from
aca90bc to
a77f61e
Compare
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 11, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235
Raymo111
force-pushed
the
export-D98533235
branch
from
a77f61e to
8f19706
Compare
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 12, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235 Signed-off-by: Raymond Li <raymo@meta.com>
Raymo111
force-pushed
the
export-D98533235
branch
from
8f19706 to
1934a92
Compare
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 12, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235 Signed-off-by: Raymond Li <raymo@meta.com>
Raymo111
force-pushed
the
export-D98533235
branch
from
1934a92 to
01ca837
Compare
Raymo111
added a commit
to Raymo111/kineto
that referenced
this pull request
May 13, 2026
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Differential Revision: D98533235 Signed-off-by: Raymond Li <raymo@meta.com>
Raymo111
force-pushed
the
export-D98533235
branch
from
01ca837 to
a52c3d5
Compare
…ytorch#1389) Summary: The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies on kineto's custom LOG macro. However, glog's LOG macro (included transitively via ust_logger_collector -> fb_device_utils -> glog) redefines LOG to COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier COMPACT_GOOGLE_LOG_libkineto at the call site. These macros now expand directly to the underlying libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them immune to glog redefining LOG at the call site. Reviewed By: scotts Differential Revision: D98533235
Raymo111
force-pushed
the
export-D98533235
branch
from
a52c3d5 to
df5cbfc
Compare
|
This pull request has been merged in 60967ce. |
pytorchmergebot
pushed a commit
to pytorch/pytorch
that referenced
this pull request
May 22, 2026
Includes the following commits: - ci: declare workflow-level `contents: read` on 5 workflows (pytorch/kineto#1404) 5902263 - Remove deprecated `REQUEST_TIMESTAMP` config key (pytorch/kineto#1409) 55883de - Fix intermittent Mac CI failure from conda channel reset (pytorch/kineto#1407) ee27b5c - Add nlohmann/json as a top-level third_party submodule (pytorch/kineto#1406) c044281 - Remove SIGUSR2 on-demand profiling path (pytorch/kineto#1408) 471ed38 - Fix ROCm HtoD memcpy stream attribution (pytorch/kineto#1398) 799b5f4 - Fix UST_LOGGER_MARK_COMPLETED build failure in manifold_trace_logger (pytorch/kineto#1389) 60967ce - Remove `DefaultTimeConverterIsIdentity` test (pytorch/kineto#1401) 81d31cd - Re-enable most PyTorch tests (pytorch/kineto#1403) 212f9a5 - Daily `arc lint --take CLANGFORMAT` (pytorch/kineto#1402) 6481fac - Resolve CUPTI cbid names via cuptiGetCallbackName (pytorch/kineto#1400) e07e121 - XPUPTI: Fix ts=0 trace events on Windows (pytorch/kineto#1381) 4c8d01c - Remove LIBKINETO_NO* compatibility shim (pytorch/kineto#1399) ea8bc18 - Upgrade Kineto to C++20 (pytorch/kineto#1397) 77e2b46 - Update the rocm api filtering (pytorch/kineto#1392) e0ac578 Pull Request resolved: #184784 Approved by: https://github.com/NicolasHug, https://github.com/malfet
pytorchmergebot
pushed a commit
to khushi-411/pytorch
that referenced
this pull request
May 24, 2026
Includes the following commits: - ci: declare workflow-level `contents: read` on 5 workflows (pytorch/kineto#1404) 5902263 - Remove deprecated `REQUEST_TIMESTAMP` config key (pytorch/kineto#1409) 55883de - Fix intermittent Mac CI failure from conda channel reset (pytorch/kineto#1407) ee27b5c - Add nlohmann/json as a top-level third_party submodule (pytorch/kineto#1406) c044281 - Remove SIGUSR2 on-demand profiling path (pytorch/kineto#1408) 471ed38 - Fix ROCm HtoD memcpy stream attribution (pytorch/kineto#1398) 799b5f4 - Fix UST_LOGGER_MARK_COMPLETED build failure in manifold_trace_logger (pytorch/kineto#1389) 60967ce - Remove `DefaultTimeConverterIsIdentity` test (pytorch/kineto#1401) 81d31cd - Re-enable most PyTorch tests (pytorch/kineto#1403) 212f9a5 - Daily `arc lint --take CLANGFORMAT` (pytorch/kineto#1402) 6481fac - Resolve CUPTI cbid names via cuptiGetCallbackName (pytorch/kineto#1400) e07e121 - XPUPTI: Fix ts=0 trace events on Windows (pytorch/kineto#1381) 4c8d01c - Remove LIBKINETO_NO* compatibility shim (pytorch/kineto#1399) ea8bc18 - Upgrade Kineto to C++20 (pytorch/kineto#1397) 77e2b46 - Update the rocm api filtering (pytorch/kineto#1392) e0ac578 Pull Request resolved: pytorch#184784 Approved by: https://github.com/NicolasHug, https://github.com/malfet
pytorchmergebot
pushed a commit
to gaurav-redhat/pytorch
that referenced
this pull request
May 26, 2026
Includes the following commits: - ci: declare workflow-level `contents: read` on 5 workflows (pytorch/kineto#1404) 5902263 - Remove deprecated `REQUEST_TIMESTAMP` config key (pytorch/kineto#1409) 55883de - Fix intermittent Mac CI failure from conda channel reset (pytorch/kineto#1407) ee27b5c - Add nlohmann/json as a top-level third_party submodule (pytorch/kineto#1406) c044281 - Remove SIGUSR2 on-demand profiling path (pytorch/kineto#1408) 471ed38 - Fix ROCm HtoD memcpy stream attribution (pytorch/kineto#1398) 799b5f4 - Fix UST_LOGGER_MARK_COMPLETED build failure in manifold_trace_logger (pytorch/kineto#1389) 60967ce - Remove `DefaultTimeConverterIsIdentity` test (pytorch/kineto#1401) 81d31cd - Re-enable most PyTorch tests (pytorch/kineto#1403) 212f9a5 - Daily `arc lint --take CLANGFORMAT` (pytorch/kineto#1402) 6481fac - Resolve CUPTI cbid names via cuptiGetCallbackName (pytorch/kineto#1400) e07e121 - XPUPTI: Fix ts=0 trace events on Windows (pytorch/kineto#1381) 4c8d01c - Remove LIBKINETO_NO* compatibility shim (pytorch/kineto#1399) ea8bc18 - Upgrade Kineto to C++20 (pytorch/kineto#1397) 77e2b46 - Update the rocm api filtering (pytorch/kineto#1392) e0ac578 Pull Request resolved: pytorch#184784 Approved by: https://github.com/NicolasHug, https://github.com/malfet
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
The UST_LOGGER_MARK_COMPLETED, USDT_LOGGER_EMIT_MESSAGE, and USDT_EMIT_START_TRACE
macros in Logger.h expanded to LOG(libkineto::LoggerOutputType::STAGE), which relies
on kineto's custom LOG macro. However, glog's LOG macro (included transitively via
ust_logger_collector -> fb_device_utils -> glog) redefines LOG to
COMPACT_GOOGLE_LOG_##severity, producing the nonsensical identifier
COMPACT_GOOGLE_LOG_libkineto at the call site.
These macros now expand directly to the underlying
libkineto::VoidLogger() & libkineto::Logger(...).stream() expression, making them
immune to glog redefining LOG at the call site.
Reviewed By: scotts
Differential Revision: D98533235