Skip to content

Commit bcf317c

Browse files
committed
Fix multiple MKL targets
1 parent 4e3a8bd commit bcf317c

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,13 @@ target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
602602
target_compile_options(executorch PUBLIC ${_common_compile_options})
603603
target_link_options_shared_lib(executorch)
604604

605+
#
606+
# find pytorch lib here to make it available to all sub-directories, trying to
607+
# call find_package(Torch) multiple times doesn't work because it brings in MKL
608+
# which is defined once globally
609+
#
610+
find_package(Torch CONFIG REQUIRED)
611+
605612
#
606613
# portable_ops_lib: A library to register core ATen ops using portable kernels,
607614
# see kernels/portable/CMakeLists.txt.
@@ -749,8 +756,7 @@ if(EXECUTORCH_BUILD_PYBIND)
749756
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/devtools)
750757
endif()
751758

752-
# find pytorch lib, to allow pybind to take at::Tensor as input/output
753-
find_package(Torch CONFIG REQUIRED)
759+
# to allow pybind to take at::Tensor as input/output
754760
find_library(
755761
TORCH_PYTHON_LIBRARY torch_python PATHS "${TORCH_INSTALL_PREFIX}/lib"
756762
)

build/Codegen.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ function(gen_custom_ops_aot_lib)
146146
${_out_dir}/CustomOpsNativeFunctions.h "${GEN_KERNEL_SOURCES}"
147147
)
148148
# Find `Torch`.
149-
find_package(Torch REQUIRED)
149+
if(NOT TARGET torch)
150+
find_package(Torch REQUIRED)
151+
endif()
150152
# This lib uses ATen lib, so we explicitly enable rtti and exceptions.
151153
target_compile_options(${GEN_LIB_NAME} PRIVATE -frtti -fexceptions)
152154
target_compile_definitions(${GEN_LIB_NAME} PRIVATE USE_ATEN_LIB=1)

extension/llm/custom_ops/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ install(TARGETS custom_ops DESTINATION lib)
6969

7070
if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT)
7171
# Add a AOT library
72-
find_package(Torch CONFIG REQUIRED)
72+
if(NOT TARGET torch)
73+
find_package(Torch CONFIG REQUIRED)
74+
endif()
7375
add_library(
7476
custom_ops_aot_lib SHARED
7577
${_custom_ops__srcs}

0 commit comments

Comments
 (0)