Kernels should depend on executorch_core

kirklandsign · kirklandsign · commit 94975dc5e451 · 2025-05-06T16:33:54.000-07:00
diff --git a/configurations/CMakeLists.txt b/configurations/CMakeLists.txt
@@ -59,7 +59,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
     optimized_kernels
     ${_optimized_native_cpu_ops_lib_portable_kernels_lib}
     DEPS
-    executorch
+    executorch_core
   )
 
   install(TARGETS optimized_native_cpu_ops_lib DESTINATION lib)
diff --git a/extension/flat_tensor/CMakeLists.txt b/extension/flat_tensor/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 
 list(TRANSFORM _extension_flat_tensor__srcs PREPEND "${EXECUTORCH_ROOT}/")
 add_library(extension_flat_tensor ${_extension_flat_tensor__srcs})
-target_link_libraries(extension_flat_tensor executorch extension_data_loader)
+target_link_libraries(extension_flat_tensor executorch_core)
 target_include_directories(
   extension_flat_tensor
   PUBLIC ${EXECUTORCH_ROOT}/..
diff --git a/kernels/optimized/CMakeLists.txt b/kernels/optimized/CMakeLists.txt
@@ -71,7 +71,7 @@ target_compile_options(optimized_kernels PUBLIC ${_common_compile_options})
 #
 # optimized_ops_lib: Register optimized ops kernels into Executorch runtime
 gen_operators_lib(
-  LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS executorch
+  LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS executorch_core
 )
 
 install(
diff --git a/kernels/quantized/CMakeLists.txt b/kernels/quantized/CMakeLists.txt
@@ -142,13 +142,13 @@ if(NOT CMAKE_GENERATOR STREQUAL "Xcode"
 endif()
 
 add_library(quantized_kernels ${_quantized_kernels__srcs})
-target_link_libraries(quantized_kernels PRIVATE executorch)
+target_link_libraries(quantized_kernels PRIVATE executorch_core)
 target_compile_options(quantized_kernels PUBLIC ${_common_compile_options})
 # Build a library for _quantized_kernels_srcs
 #
 # quantized_ops_lib: Register quantized ops kernels into Executorch runtime
 gen_operators_lib(
-  LIB_NAME "quantized_ops_lib" KERNEL_LIBS quantized_kernels DEPS executorch
+  LIB_NAME "quantized_ops_lib" KERNEL_LIBS quantized_kernels DEPS executorch_core
 )
 
 install(

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)`
`59`	`59`	`optimized_kernels`
`60`	`60`	`${_optimized_native_cpu_ops_lib_portable_kernels_lib}`
`61`	`61`	`DEPS`
`62`		`- executorch`
	`62`	`+ executorch_core`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`install(TARGETS optimized_native_cpu_ops_lib DESTINATION lib)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ target_compile_options(optimized_kernels PUBLIC ${_common_compile_options})`
`71`	`71`	`#`
`72`	`72`	`# optimized_ops_lib: Register optimized ops kernels into Executorch runtime`
`73`	`73`	`gen_operators_lib(`
`74`		`- LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS executorch`
	`74`	`+ LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS executorch_core`
`75`	`75`	`)`
`76`	`76`
`77`	`77`	`install(`
Original file line number	Diff line number	Diff line change
`@@ -142,13 +142,13 @@ if(NOT CMAKE_GENERATOR STREQUAL "Xcode"`
`142`	`142`	`endif()`
`143`	`143`
`144`	`144`	`add_library(quantized_kernels ${_quantized_kernels__srcs})`
`145`		`-target_link_libraries(quantized_kernels PRIVATE executorch)`
	`145`	`+target_link_libraries(quantized_kernels PRIVATE executorch_core)`
`146`	`146`	`target_compile_options(quantized_kernels PUBLIC ${_common_compile_options})`
`147`	`147`	`# Build a library for _quantized_kernels_srcs`
`148`	`148`	`#`
`149`	`149`	`# quantized_ops_lib: Register quantized ops kernels into Executorch runtime`
`150`	`150`	`gen_operators_lib(`
`151`		`- LIB_NAME "quantized_ops_lib" KERNEL_LIBS quantized_kernels DEPS executorch`
	`151`	`+ LIB_NAME "quantized_ops_lib" KERNEL_LIBS quantized_kernels DEPS executorch_core`
`152`	`152`	`)`
`153`	`153`
`154`	`154`	`install(`