Mark optimized_kernels as a dependency for custom_ops. (#2764)

Summary: Pull Request resolved: #2764

Reviewed By: kirklandsign

Differential Revision: D55535501

fbshipit-source-id: ace93dc0010cc4e5be23a97d9c3b7d5d475308d6

Author: shoumikhin

build/cmake_deps.toml

@@ -56,8 +56,6 @@ excludes = [
   # Exclude the codegen templates, which are picked up because the buck target
   # is the generated_lib and not the unwrapped set of kernels.
   "^codegen/templates",
-  # Exclude blas, since it's built as a separate target.
-  "^kernels/optimized/blas",
 ]
 deps = [
   "executorch",
@@ -274,11 +272,11 @@ filters = [
 ]
 excludes = [
   "^codegen",
-  # Exclude blas, since it's built as a separate target.
-  "^kernels/optimized/blas",
 ]
 deps = [
   "executorch",
+  "optimized_kernels",
+  "xnnpack_backend",
 ]
 
 [targets.llama_runner]

examples/models/llama2/custom_ops/CMakeLists.txt

@@ -4,7 +4,6 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-
 cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -44,7 +43,6 @@ include(${EXECUTORCH_SRCS_FILE})
 # Let files say "include <executorch/path/to/header.h>".
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
-
 # Custom op libraries
 set(custom_ops_libs extension_module)
 list(APPEND custom_ops_libs pthreadpool)
@@ -57,25 +55,34 @@ list(APPEND custom_ops_libs eigen_blas)
 set(_yaml "${CMAKE_CURRENT_LIST_DIR}/custom_ops.yaml")
 gen_selected_ops("${_yaml}" "" "")
 
-generate_bindings_for_kernels(
-  FUNCTIONS_YAML ${CMAKE_CURRENT_SOURCE_DIR}/custom_ops.yaml)
+generate_bindings_for_kernels(FUNCTIONS_YAML
+                              ${CMAKE_CURRENT_SOURCE_DIR}/custom_ops.yaml)
 message("Generated files ${gen_command_sources}")
 
 list(TRANSFORM _custom_ops__srcs PREPEND "${EXECUTORCH_ROOT}/")
+
+# TODO: Consider moving xnnpack/threadpool in a separate lib since it's now used
+# by custom ops too.
+if(NOT EXECUTORCH_BUILD_XNNPACK)
+  list(
+    APPEND
+    _custom_ops__srcs
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../../../backends/xnnpack/threadpool/threadpool.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../../../backends/xnnpack/threadpool/threadpool_guard.cpp"
+  )
+endif()
+
 add_library(custom_ops ${_custom_ops__srcs})
 
 target_include_directories(custom_ops PUBLIC "${_common_include_directories}")
-target_include_directories(custom_ops PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/../../../../include")
+target_include_directories(
+  custom_ops PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../../../include")
 target_link_libraries(custom_ops PUBLIC ${custom_ops_libs})
 
 target_compile_options(custom_ops PUBLIC ${_common_compile_options}
-  -DET_USE_THREADPOOL)
+                                         -DET_USE_THREADPOOL)
 
 # Build a library for _custom_ops_srcs
 #
 # custom_ops_lib: Register optimized ops kernels into Executorch runtime
-gen_operators_lib(
-  "custom_ops_lib"
-  KERNEL_LIBS custom_ops
-  DEPS executorch)
+gen_operators_lib("custom_ops_lib" KERNEL_LIBS custom_ops DEPS executorch)