Skip to content
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

[CMake] Remove FindRoc* files #490

Merged
merged 2 commits into from
Jun 3, 2024
Merged

[CMake] Remove FindRoc* files #490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b05ce7
Remove FindRoc* files
hjabird May 14, 2024
8e04fce
Add hip::host dependencies; Remove version requirements
hjabird May 31, 2024
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
60 changes: 0 additions & 60 deletions cmake/FindrocBLAS.cmake
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions cmake/FindrocRAND.cmake
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions cmake/FindrocSOLVER.cmake
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions src/blas/backends/rocblas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

set(LIB_NAME onemkl_blas_rocblas)
set(LIB_OBJ ${LIB_NAME}_obj)
find_package(rocBLAS REQUIRED)
find_package(rocblas 2.46.0 REQUIRED) # Corresponds to ROCm 5.4.3
find_package(Threads REQUIRED)

set(SOURCES rocblas_level1.cpp
rocblas_level2.cpp
rocblas_level3.cpp
Expand Down Expand Up @@ -55,7 +57,8 @@ else()
target_link_options(ONEMKL::SYCL::SYCL INTERFACE)
endif()

target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL ONEMKL::rocBLAS::rocBLAS)
target_link_libraries(${LIB_OBJ} PRIVATE roc::rocblas Threads::Threads)
target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL)
target_compile_features(${LIB_OBJ} PUBLIC cxx_std_17)
set_target_properties(${LIB_OBJ} PROPERTIES
POSITION_INDEPENDENT_CODE ON)
Expand Down
7 changes: 5 additions & 2 deletions src/lapack/backends/rocsolver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

set(LIB_NAME onemkl_lapack_rocsolver)
set(LIB_OBJ ${LIB_NAME}_obj)
find_package(rocSOLVER REQUIRED)
find_package(rocsolver 3.20.0 REQUIRED) # Version for ROCm 5.4.3
find_package(Threads REQUIRED)

set(SOURCES rocsolver_lapack.cpp
rocsolver_batch.cpp
$<$<STREQUAL:${ONEMKL_SYCL_IMPLEMENTATION},dpc++>:rocsolver_scope_handle.cpp>
Expand All @@ -38,7 +40,8 @@ target_include_directories(${LIB_OBJ}
${ONEMKL_GENERATED_INCLUDE_PATH}
)
target_compile_options(${LIB_OBJ} PRIVATE ${ONEMKL_BUILD_COPT})
target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL ONEMKL::rocSOLVER::rocSOLVER)
target_link_libraries(${LIB_OBJ} PRIVATE roc::rocsolver Threads::Threads)
target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL)
target_compile_features(${LIB_OBJ} PUBLIC cxx_std_17)
set_target_properties(${LIB_OBJ} PROPERTIES
POSITION_INDEPENDENT_CODE ON)
Expand Down
8 changes: 5 additions & 3 deletions src/rng/backends/rocrand/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@

set(LIB_NAME onemkl_rng_rocrand)
set(LIB_OBJ ${LIB_NAME}_obj)
find_package(rocRAND REQUIRED)
find_package(hip REQUIRED)
find_package(rocrand REQUIRED)
dnhsieh-intel marked this conversation as resolved.
Show resolved Hide resolved
find_package(Threads REQUIRED)

set(SOURCES philox4x32x10.cpp mrg32k3a.cpp $<$<BOOL:${BUILD_SHARED_LIBS}>:
mkl_rng_rocrand_wrappers.cpp>)
Expand All @@ -67,8 +69,8 @@ target_include_directories(
${LIB_OBJ} PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/bin ${MKL_INCLUDE} ${ONEMKL_GENERATED_INCLUDE_PATH})

target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL
ONEMKL::rocRAND::rocRAND)
target_link_libraries(${LIB_OBJ} PRIVATE roc::rocrand hip::host Threads::Threads)
target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL)
target_compile_features(${LIB_OBJ} PUBLIC cxx_std_11)
set_target_properties(${LIB_OBJ} PROPERTIES POSITION_INDEPENDENT_CODE ON)

Expand Down