Skip to content

Dynolog fix on MacOS #1137

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

Open
cyyever wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Dynolog fix on MacOS #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61c089e
Fix dynolog
cyyever Aug 30, 2025
448c139
Fix MacOS
cyyever Aug 30, 2025
004eb9e
Fix dynolog
cyyever Aug 30, 2025
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
3 changes: 0 additions & 3 deletions libkineto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ endif()

set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
add_subdirectory("${IPCFABRIC_INCLUDE_DIR}")

if(NOT TARGET fmt::fmt-header-only)
if(NOT FMT_SOURCE_DIR)
Expand All @@ -204,8 +203,6 @@ message(STATUS " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
message(STATUS " DYNOLOG_INCLUDE_DIR = ${DYNOLOG_INCLUDE_DIR}")
message(STATUS " IPCFABRIC_INCLUDE_DIR = ${IPCFABRIC_INCLUDE_DIR}")

target_link_libraries(kineto_base PRIVATE dynolog_ipcfabric_lib)

target_include_directories(kineto_base PUBLIC
$<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>
$<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}>
Expand Down
9 changes: 6 additions & 3 deletions libkineto/test/PidInfoTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

#include "include/ThreadUtil.h"

#include <thread>

#include <gtest/gtest.h>

using namespace KINETO_NAMESPACE;
Expand All @@ -26,8 +24,13 @@ TEST(ThreadNameTest, setAndGet) {
EXPECT_EQ(getThreadName(), "Name w/ spaces");

// More than 16 chars is not OK
#ifndef _WIN32
#if defined(__APPLE__)
GTEST_EXPECT_TRUE(setThreadName("More than 16 characters"));
EXPECT_EQ(getThreadName(), "More than 16 ch");
#else
#if !defined(_WIN32)
GTEST_EXPECT_FALSE(setThreadName("More than 16 characters"));
EXPECT_EQ(getThreadName(), "Name w/ spaces");
#endif
#endif
}