Skip to content

improve cutensor lib discovery inc. conda install, allow custom tblis… #37

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
jurajHasik wants to merge 1 commit into
base: cutensor_bindings
Choose a base branch
from
+48 −13
Open

improve cutensor lib discovery inc. conda install, allow custom tblis… #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 48 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,30 @@ if(TAPP_REFERENCE_ENABLE_TBLIS)
endif()

set(TBLIS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/tblis)
# Option to provide custom path to tblis source
set(TAPP_REFERENCE_TBLIS_SOURCE_DIR "" CACHE PATH "Path to existing tblis source directory (if empty, will default to fetching from GitHub)")

if(TAPP_REFERENCE_TBLIS_SOURCE_DIR)
# Use user-provided tblis source directory
if(NOT EXISTS "${TAPP_REFERENCE_TBLIS_SOURCE_DIR}/CMakeLists.txt")
message(FATAL_ERROR "TAPP_REFERENCE_TBLIS_SOURCE_DIR is set to '${TAPP_REFERENCE_TBLIS_SOURCE_DIR}' but no CMakeLists.txt found there")
endif()
message(STATUS "Using tblis from: ${TAPP_REFERENCE_TBLIS_SOURCE_DIR}")
add_subdirectory(${TAPP_REFERENCE_TBLIS_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/_deps/tblis-build)
else()
# Fetch tblis from GitHub
include(FetchContent)

FetchContent_Declare(
tblis
GIT_REPOSITORY https://github.com/devinamatthews/tblis.git
GIT_TAG 9b95712
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_deps/tblis
UPDATE_DISCONNECTED TRUE
)

include(FetchContent)

FetchContent_Declare(
tblis
GIT_REPOSITORY https://github.com/devinamatthews/tblis.git
GIT_TAG 9b95712
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_deps/tblis
UPDATE_DISCONNECTED TRUE
)

FetchContent_MakeAvailable(tblis)
FetchContent_MakeAvailable(tblis)
endif()

target_compile_definitions(tapp-reference PRIVATE TAPP_REFERENCE_ENABLE_TBLIS=1)

Expand Down Expand Up @@ -206,7 +218,8 @@ if (TAPP_REFERENCE_BUILD_CUTENSOR_BINDS)

set(CUTENSOR_ROOT "/usr/local/cutensor")
set(CUTENSOR_INCLUDE_DIR "${CUTENSOR_ROOT}/include")
set(CUTENSOR_LIBRARY_DIR "${CUTENSOR_ROOT}/lib" "${CUTENSOR_ROOT}/lib/11")
file(GLOB CUTENSOR_VERSIONED_DIRS "${CUTENSOR_ROOT}/lib/[0-9]*")
set(CUTENSOR_LIBRARY_DIR "${CUTENSOR_ROOT}/lib" ${CUTENSOR_VERSIONED_DIRS})

find_library(
CUTENSOR_LIB
Expand All @@ -216,9 +229,18 @@ if (TAPP_REFERENCE_BUILD_CUTENSOR_BINDS)

if (NOT CUTENSOR_LIB)
message(FATAL_ERROR "cuTENSOR library not found. Set CUTENSOR_ROOT correctly.")
else()
get_filename_component(CUTENSOR_LIBRARY_DIR ${CUTENSOR_LIB} DIRECTORY)
if(CUTENSOR_LIBRARY_DIR MATCHES "/[0-9]+$")
get_filename_component(CUTENSOR_LIBRARY_DIR ${CUTENSOR_LIBRARY_DIR} DIRECTORY)
endif()
get_filename_component(CUTENSOR_ROOT ${CUTENSOR_LIBRARY_DIR} DIRECTORY)

set(CUTENSOR_INCLUDE_DIR "${CUTENSOR_ROOT}/include")
endif()

message(STATUS "Found cuTENSOR: ${CUTENSOR_LIB}")
message(STATUS "cuTENSOR include dir: ${CUTENSOR_INCLUDE_DIR}")

add_library(cutensor_binds SHARED)

Expand Down Expand Up @@ -294,6 +316,8 @@ if (TAPP_REFERENCE_BUILD_CUTENSOR_BINDS)
cudemo
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/test
PRIVATE
${CUTENSOR_INCLUDE_DIR}
)

add_test(
Expand All @@ -318,12 +342,17 @@ if (TAPP_REFERENCE_BUILD_CUTENSOR_BINDS)
${CMAKE_CURRENT_SOURCE_DIR}/api/include
)

target_link_libraries(
demo_dynamic
PRIVATE
${CMAKE_DL_LIBS}
)

add_test(
NAME demo_dynamic
COMMAND $<TARGET_FILE:demo_dynamic>
)


add_executable(test_dynamic)

target_sources(
Expand All @@ -340,6 +369,12 @@ if (TAPP_REFERENCE_BUILD_CUTENSOR_BINDS)
${CMAKE_CURRENT_SOURCE_DIR}/api/include
)

target_link_libraries(
test_dynamic
PRIVATE
${CMAKE_DL_LIBS}
)

add_test(
NAME test_dynamic
COMMAND $<TARGET_FILE:test_dynamic>
Expand Down