File tree Expand file tree Collapse file tree 3 files changed +14
-4
lines changed Expand file tree Collapse file tree 3 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -602,6 +602,13 @@ target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
602
602
target_compile_options (executorch PUBLIC ${_common_compile_options} )
603
603
target_link_options_shared_lib (executorch )
604
604
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
+
605
612
#
606
613
# portable_ops_lib: A library to register core ATen ops using portable kernels,
607
614
# see kernels/portable/CMakeLists.txt.
@@ -749,8 +756,7 @@ if(EXECUTORCH_BUILD_PYBIND)
749
756
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR} /devtools )
750
757
endif ()
751
758
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
754
760
find_library (
755
761
TORCH_PYTHON_LIBRARY torch_python PATHS "${TORCH_INSTALL_PREFIX} /lib"
756
762
)
Original file line number Diff line number Diff line change @@ -146,7 +146,9 @@ function(gen_custom_ops_aot_lib)
146
146
${_out_dir} /CustomOpsNativeFunctions.h "${GEN_KERNEL_SOURCES} "
147
147
)
148
148
# Find `Torch`.
149
- find_package (Torch REQUIRED )
149
+ if (NOT TARGET torch )
150
+ find_package (Torch REQUIRED )
151
+ endif ()
150
152
# This lib uses ATen lib, so we explicitly enable rtti and exceptions.
151
153
target_compile_options (${GEN_LIB_NAME} PRIVATE -frtti -fexceptions )
152
154
target_compile_definitions (${GEN_LIB_NAME} PRIVATE USE_ATEN_LIB=1 )
Original file line number Diff line number Diff line change @@ -69,7 +69,9 @@ install(TARGETS custom_ops DESTINATION lib)
69
69
70
70
if (EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT )
71
71
# Add a AOT library
72
- find_package (Torch CONFIG REQUIRED )
72
+ if (NOT TARGET torch )
73
+ find_package (Torch CONFIG REQUIRED )
74
+ endif ()
73
75
add_library (
74
76
custom_ops_aot_lib SHARED
75
77
${_custom_ops__srcs}
You can’t perform that action at this time.
0 commit comments