Skip to content

Commit 7114386

Browse files
committed
Use find_package() with HINTS per implementation used by oneMath for find_package(MKL ...)
1 parent 60278b1 commit 7114386

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

CMakeLists.txt

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,36 +45,28 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
4545
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
4646

4747

48-
find_package(IntelSYCL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
49-
find_package(TBB QUIET)
50-
if(TBB_FOUND)
51-
find_package(TBB REQUIRED)
52-
else()
53-
find_package(TBB REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
54-
endif()
48+
# find_package() search order:
49+
# 1. User-specified overrides (-DMKL_DIR=..., cache variables, package root variables like MKLROOT)
50+
# 2. Environment variables (ENV{MKLROOT}, CMAKE_PREFIX_PATH which is automatically set by conda)
51+
# 3. PATHS (if specified, but without NO_DEFAULT_PATH)
52+
# 4. HINTS
53+
# 5. System prefixes (/usr, /usr/local, etc.)
54+
# 6. CMake built-in modules
55+
find_package(IntelSYCL REQUIRED HINTS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Module)
56+
find_package(TBB REQUIRED HINTS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Module)
5557

5658
set(MKL_ARCH "intel64")
5759
set(MKL_LINK "dynamic")
5860
set(MKL_THREADING "tbb_thread")
5961
set(MKL_INTERFACE "ilp64")
60-
find_package(MKL QUIET)
61-
if(MKL_FOUND)
62-
find_package(MKL REQUIRED)
63-
else()
64-
find_package(MKL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
65-
endif()
62+
find_package(MKL REQUIRED
63+
HINTS ${MKL_ROOT}/lib/cmake
64+
${MKL_ROOT}/lib/cmake/mkl
65+
$ENV{MKLROOT}
66+
${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Module)
6667

6768
set(ONEDPL_PAR_BACKEND tbb)
68-
find_package(oneDPL QUIET)
69-
if(oneDPL_FOUND)
70-
if(oneDPL_VERSION VERSION_GREATER_EQUAL "2022.3.0")
71-
find_package(oneDPL REQUIRED)
72-
else()
73-
find_package(oneDPL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
74-
endif()
75-
else()
76-
find_package(oneDPL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
77-
endif()
69+
find_package(oneDPL REQUIRED HINTS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Module)
7870

7971
include(GNUInstallDirs)
8072

0 commit comments

Comments
 (0)