Update Kokkos library in LAMMPS to v4.1.0
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
|
||||
FIND_PACKAGE(HPX REQUIRED 1.7.0)
|
||||
FIND_PACKAGE(HPX REQUIRED 1.8.0)
|
||||
#as of right now, HPX doesn't export correctly
|
||||
#so let's convert it to an interface target
|
||||
KOKKOS_CREATE_IMPORTED_TPL(HPX INTERFACE
|
||||
|
||||
@ -1 +0,0 @@
|
||||
KOKKOS_FIND_IMPORTED(LIBNUMA HEADER numa.h LIBRARY numa)
|
||||
46
lib/kokkos/cmake/Modules/FindTPLONEDPL.cmake
Normal file
46
lib/kokkos/cmake/Modules/FindTPLONEDPL.cmake
Normal file
@ -0,0 +1,46 @@
|
||||
INCLUDE(CheckIncludeFileCXX)
|
||||
CHECK_INCLUDE_FILE_CXX(oneapi/dpl/execution KOKKOS_COMPILER_HAS_ONEDPL_EXECUTION_HEADER)
|
||||
CHECK_INCLUDE_FILE_CXX(oneapi/dpl/algorithm KOKKOS_COMPILER_HAS_ONEDPL_ALGORITHM_HEADER)
|
||||
|
||||
INCLUDE(CheckCXXSourceCompiles)
|
||||
CHECK_CXX_SOURCE_COMPILES("
|
||||
#include <iostream>
|
||||
|
||||
int main()
|
||||
{
|
||||
#if defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE == 9 || _GLIBCXX_RELEASE == 10)
|
||||
static_assert(false);
|
||||
#endif
|
||||
return 0;
|
||||
}"
|
||||
KOKKOS_NO_TBB_CONFLICT)
|
||||
|
||||
IF (KOKKOS_COMPILER_HAS_ONEDPL_EXECUTION_HEADER AND KOKKOS_COMPILER_HAS_ONEDPL_ALGORITHM_HEADER)
|
||||
IF(KOKKOS_NO_TBB_CONFLICT)
|
||||
KOKKOS_CREATE_IMPORTED_TPL(
|
||||
ONEDPL INTERFACE
|
||||
)
|
||||
ELSE()
|
||||
KOKKOS_CREATE_IMPORTED_TPL(
|
||||
ONEDPL INTERFACE
|
||||
# https://stackoverflow.com/questions/67923287/how-to-resolve-no-member-named-task-in-namespace-tbb-error-when-using-oned/
|
||||
COMPILE_DEFINITIONS PSTL_USE_PARALLEL_POLICIES=0 _GLIBCXX_USE_TBB_PAR_BACKEND=0
|
||||
)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
FIND_PACKAGE(oneDPL REQUIRED)
|
||||
|
||||
IF(KOKKOS_NO_TBB_CONFLICT)
|
||||
KOKKOS_CREATE_IMPORTED_TPL(
|
||||
ONEDPL INTERFACE
|
||||
LINK_LIBRARIES oneDPL
|
||||
)
|
||||
ELSE()
|
||||
KOKKOS_CREATE_IMPORTED_TPL(
|
||||
ONEDPL INTERFACE
|
||||
LINK_LIBRARIES oneDPL
|
||||
# https://stackoverflow.com/questions/67923287/how-to-resolve-no-member-named-task-in-namespace-tbb-error-when-using-oned/
|
||||
COMPILE_DEFINITIONS PSTL_USE_PARALLEL_POLICIES=0 _GLIBCXX_USE_TBB_PAR_BACKEND=0
|
||||
)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
Reference in New Issue
Block a user