Skip to content

fix(rocprofiler-sdk): TheRock fixes for SQLite3 include paths and rocm_sysdeps in RUNPATH #9670

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
yhuiYH merged 4 commits into from
Oct 8, 2026
Merged

fix(rocprofiler-sdk): TheRock fixes for SQLite3 include paths and rocm_sysdeps in RUNPATH #9670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
856ae5a
Move source/lib/rocprofiler-sdk/rocprofiler-avail
jrmadsen Aug 4, 2026
6193c23
Fix RUNPATH for libraries using rocm_sysdeps
jrmadsen Aug 4, 2026
4b0f6a1
Fix implicit SQLite include path
jrmadsen Aug 4, 2026
a944aae
formatting fix
yhuiYH Oct 7, 2026
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: 3 additions & 0 deletions projects/rocprofiler-sdk/cmake/rocprofiler_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,6 @@ rocprofiler_add_nolink_interface_library(
rocprofiler_add_nolink_interface_library(
rocprofiler-sdk-hipfile-nolink "hipFILE headers without linking to hipFILE library"
IMPORTED)
rocprofiler_add_nolink_interface_library(
rocprofiler-sdk-sqlite3-nolink "SQLite3 headers without linking to SQLite3 library"
IMPORTED)
14 changes: 13 additions & 1 deletion projects/rocprofiler-sdk/external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
#
include(rocprofiler_utilities)
include(rocprofiler_config_nolink_target)

cmake_policy(PUSH)
cmake_policy(SET CMP0077 NEW) # option() honors normal variables
Expand Down Expand Up @@ -305,9 +306,20 @@ if(ROCPROFILER_BUILD_SQLITE3)
add_dependencies(rocprofiler-sdk-sqlite3 rocprofiler-sdk-sqlite-build)
else()
find_package(SQLite3 REQUIRED)
Comment thread
yhuiYH marked this conversation as resolved.
Resolved
target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE SQLite::SQLite3)
if(TARGET SQLite::SQLite3)
target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE SQLite::SQLite3)
elseif(TARGET SQLite3::SQLite3)
target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE SQLite3::SQLite3)
else()
target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE ${SQLite3_LIBRARIES})
target_include_directories(rocprofiler-sdk-sqlite3 SYSTEM
INTERFACE ${SQLite3_INCLUDE_DIRS})
endif()
endif()

rocprofiler_config_nolink_target(rocprofiler-sdk-sqlite3-nolink
rocprofiler-sdk::rocprofiler-sdk-sqlite3)

#
# PyBind11
#
Expand Down
1 change: 1 addition & 0 deletions projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ target_link_libraries(
rocprofiler-sdk-output-library
PUBLIC rocprofiler-sdk::rocprofiler-sdk-rocpd-library
rocprofiler-sdk::rocprofiler-sdk-aqlprofile
rocprofiler-sdk::rocprofiler-sdk-sqlite3-nolink
PRIVATE rocprofiler-sdk::rocprofiler-sdk-headers
rocprofiler-sdk::rocprofiler-sdk-build-flags
rocprofiler-sdk::rocprofiler-sdk-sanitizer
Expand Down
4 changes: 3 additions & 1 deletion projects/rocprofiler-sdk/source/lib/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#

set(CMAKE_MESSAGE_INDENT "[${PROJECT_NAME}][python] ")
set(DEFAULT_PYTHON_RPATH "\$ORIGIN:\$ORIGIN/../../..:\$ORIGIN/../../../rocprofiler-sdk")
set(DEFAULT_PYTHON_RPATH
"\$ORIGIN:\$ORIGIN/../../..:\$ORIGIN/../../../rocprofiler-sdk:\$ORIGIN/../../../rocm_sysdeps/lib"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities.cmake")

Expand Down
3 changes: 2 additions & 1 deletion projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ set_target_properties(
SOVERSION ${PROJECT_VERSION_MAJOR}
VERSION ${PROJECT_VERSION}
BUILD_RPATH "\$ORIGIN:\$ORIGIN/.."
INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..:\$ORIGIN/../rocm_sysdeps/lib")

install(
TARGETS rocprofiler-sdk-tool
Expand All @@ -67,3 +67,4 @@ install(
EXPORT rocprofiler-sdk-tool-targets)

add_subdirectory(kokkosp)
add_subdirectory(list-avail)
Comment thread
yhuiYH marked this conversation as resolved.
Resolved
2 changes: 1 addition & 1 deletion ...iler-sdk/rocprofiler-avail/CMakeLists.txt → ...ofiler-sdk-tool/list-avail/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ set_target_properties(
SOVERSION ${PROJECT_VERSION_MAJOR}
VERSION ${PROJECT_VERSION}
BUILD_RPATH "\$ORIGIN:\$ORIGIN/.."
INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..:\$ORIGIN/../rocm_sysdeps/lib")

install(
TARGETS rocprofv3-list-avail
Expand Down
0 ...sdk/rocprofiler-avail/rocprofv3_avail.cpp → ...r-sdk-tool/list-avail/rocprofv3_avail.cpp
View file
Open in desktop
File renamed without changes.
0 ...sdk/rocprofiler-avail/rocprofv3_avail.hpp → ...r-sdk-tool/list-avail/rocprofv3_avail.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,3 @@ set_target_properties(
if(ROCPROFILER_BUILD_TESTS)
add_subdirectory(tests)
endif()

add_subdirectory(rocprofiler-avail)
Loading