Skip to content

Build: fix compatibility with oneAPI 2024.2 #4603

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
mohanchen merged 2 commits into from
Jul 8, 2024
Merged

Build: fix compatibility with oneAPI 2024.2 #4603

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
caea827
Build: fix compatibility with oneAPI 2024.2
caic99 Jul 8, 2024
dc18a0f
fix linking
caic99 Jul 8, 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
10 changes: 2 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ if(ENABLE_LCAO)
if(ENABLE_FFT_TWO_CENTER)
add_compile_definitions(USE_NEW_TWO_CENTER)
endif()

if(ENABLE_PEXSI)
find_package(PEXSI REQUIRED)
target_link_libraries(${ABACUS_BIN_NAME} ${PEXSI_LIBRARY} ${SuperLU_DIST_LIBRARY} ${ParMETIS_LIBRARY} ${METIS_LIBRARY} pexsi)
Expand Down Expand Up @@ -397,13 +397,7 @@ if(MKLROOT)
find_package(IntelMKL REQUIRED)
add_definitions(-D__MKL)
include_directories(${MKL_INCLUDE_DIRS} ${MKL_INCLUDE_DIRS}/fftw)

# Since libtorch will find its own MKL, the fftw part conflicts with the
# original one. When enable deepks, mkl will be linked within
# ${TORCH_LIBRARIES}.
if(NOT ENABLE_DEEPKS)
list(APPEND math_libs IntelMKL::MKL)
endif()
list(APPEND math_libs IntelMKL::MKL)

if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
list(APPEND math_libs -lifcore)
Expand Down
7 changes: 0 additions & 7 deletions cmake/FindIntelMKL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
# Find the native MKL headers and libraries.
#
# MKL_INCLUDE_DIRS - where to find mkl.h, etc.
# MKL_LIBRARIES - List of libraries when using mkl.
# MKL_FOUND - True if mkl found.
#

find_path(MKL_INCLUDE_DIR mkl_service.h HINTS ${MKLROOT}/include)

Expand All @@ -27,11 +25,6 @@ else()
endif()

if(IntelMKL_FOUND)
if (ENABLE_MPI)
set(MKL_LIBRARIES ${MKL_INTEL} ${MKL_INTEL_THREAD} ${MKL_CORE} ${MKL_SCALAPACK} ${MKL_BLACS_INTELMPI})
else()
set(MKL_LIBRARIES ${MKL_INTEL} ${MKL_INTEL_THREAD} ${MKL_CORE})
endif()
set(MKL_INCLUDE_DIRS ${MKL_INCLUDE_DIR})

if(NOT TARGET IntelMKL::INTEL)
Expand Down