Skip to content

Change how we handle looking for rocTX #515

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
jsandham merged 2 commits into from
Jun 20, 2025
Merged

Change how we handle looking for rocTX #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1850afb
Revert "Better handle building rocSPARSE with ROC-TX (#484)" (#511)
jsandham Jun 18, 2025
00f92a1
Handle ROCTX using find_path and find_library instead of Findroctx.cm…
jsandham Jun 20, 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
14 changes: 10 additions & 4 deletions clients/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,16 @@ if (NOT WIN32)
endif()

if (NOT WIN32)
if(BUILD_WITH_ROCTX)
find_package(roctx REQUIRED)
target_link_libraries(rocsparse-bench PRIVATE roctx::roctx)
target_compile_definitions( rocsparse-bench PRIVATE ROCSPARSE_CLIENTS_WITH_ROCTX )
if (BUILD_WITH_ROCTX)

if(ROCTRACER_INCLUDE_DIR AND ROCTX_LIBRARY)
# Add the include directory
target_include_directories(rocsparse-bench PRIVATE ${ROCTRACER_INCLUDE_DIR})

# Link the rocTx lib
target_link_libraries(rocsparse-bench PRIVATE ${ROCTX_LIBRARY})
target_compile_definitions( rocsparse-bench PRIVATE ROCSPARSE_CLIENTS_WITH_ROCTX )
endif()
endif()
endif()

Expand Down
13 changes: 9 additions & 4 deletions clients/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,15 @@ if (NOT WIN32)
endif()

if (NOT WIN32)
if(BUILD_WITH_ROCTX)
find_package(roctx REQUIRED)
target_link_libraries(rocsparse-test PRIVATE roctx::roctx)
target_compile_definitions( rocsparse-test PRIVATE ROCSPARSE_CLIENTS_WITH_ROCTX )
if (BUILD_WITH_ROCTX)
if(ROCTRACER_INCLUDE_DIR AND ROCTX_LIBRARY)
# Add the include directory
target_include_directories(rocsparse-test PRIVATE ${ROCTRACER_INCLUDE_DIR})

# Link the rocTx lib
target_link_libraries(rocsparse-test PRIVATE ${ROCTX_LIBRARY})
target_compile_definitions( rocsparse-test PRIVATE ROCSPARSE_CLIENTS_WITH_ROCTX )
endif()
endif()
endif()

Expand Down
72 changes: 0 additions & 72 deletions cmake/Findroctx.cmake
View file
Open in desktop

This file was deleted.

47 changes: 44 additions & 3 deletions library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,50 @@ endif()

if (NOT WIN32)
if (BUILD_SHARED_LIBS AND BUILD_WITH_ROCTX)
find_package(roctx REQUIRED)
target_link_libraries(rocsparse PRIVATE roctx::roctx)
target_compile_definitions( rocsparse PRIVATE ROCSPARSE_BUILT_WITH_ROCTX )

set(ROCTX_PATH "" CACHE STRING "Path to the roctx library (directory containing libroctx64.so)")

find_path(ROCTRACER_INCLUDE_DIR
NAMES roctracer/roctx.h
HINTS
${ROCTX_PATH}
${ROCTX_PATH}/include
/opt/rocm/include
${ROCTX_PATH}/../include
DOC "Path to the roctracer include directory containing roctx.h")

find_library(ROCTX_LIBRARY
NAMES roctx64
HINTS
${ROCTX_PATH} # User-provided path
${ROCTX_PATH}/lib
${ROCTX_PATH}/lib64
PATHS
/opt/rocm/lib # Default ROCm path
)

if(ROCTRACER_INCLUDE_DIR AND ROCTX_LIBRARY)
message(STATUS "Found roctracer include directory: ${ROCTRACER_INCLUDE_DIR}")
message(STATUS "Found roctx library: ${ROCTX_LIBRARY}")

# Add the include directory
target_include_directories(rocsparse PRIVATE ${ROCTRACER_INCLUDE_DIR})

# Link the rocTx lib
target_link_libraries(rocsparse PRIVATE ${ROCTX_LIBRARY})
target_compile_definitions( rocsparse PRIVATE ROCSPARSE_BUILT_WITH_ROCTX )
message(STATUS "ROCTX tracing support enabled for target rocsparse.")
else()
message(WARNING "ROCTX tracing will be disabled for target rocsparse.")

if(NOT ROCTRACER_INCLUDE_DIR)
message(WARNING "Header 'roctracer/roctx.h' not found.")
endif()

if(NOT ROCTX_LIBRARY)
message(WARNING "Library 'roctx64' not found. ROCTX_PATH: '${ROCTX_PATH}' Default PATH: '/opt/rocm/lib'.")
endif()
endif()
endif()
endif()

Expand Down