Update

[ghstack-poisoned]

Author: GregoryComer

backends/xnnpack/CMakeLists.txt

@@ -100,21 +100,6 @@ set(xnnpack_third_party pthreadpool extension_threadpool cpuinfo)
 
 include(cmake/Dependencies.cmake)
 
-# Graph runtime sources.
-list(
-  APPEND
-  _xnnpack_backend__srcs
-  backends/xnnpack/runtime/core/tensor.cpp
-  backends/xnnpack/runtime/core/quant_params.cpp
-  backends/xnnpack/runtime/graph/graph.cpp
-  backends/xnnpack/runtime/graph/graph_builder.cpp
-  backends/xnnpack/runtime/operators/operator.cpp
-  backends/xnnpack/runtime/executor/arena.cpp
-  backends/xnnpack/runtime/executor/shape_env.cpp
-  backends/xnnpack/runtime/plan/xnn_support.cpp
-  backends/xnnpack/runtime/plan/partition.cpp
-)
-
 list(TRANSFORM _xnnpack_backend__srcs PREPEND "${EXECUTORCH_ROOT}/")
 add_library(xnnpack_backend ${_xnnpack_backend__srcs})
 target_link_libraries(

backends/xnnpack/targets.bzl

@@ -41,6 +41,11 @@ def define_common_targets():
             headers = native.glob([
                 "runtime/*.h",
                 "runtime/profiling/*.h",
+                "runtime/core/*.h",
+                "runtime/graph/*.h",
+                "runtime/operators/*.h",
+                "runtime/executor/*.h",
+                "runtime/plan/*.h",
             ]),
             visibility = ["PUBLIC"],
             preprocessor_flags = [

shim_et/xplat/executorch/build/build_variables.bzl

@@ -480,6 +480,15 @@ XNNPACK_BACKEND_BUCK_SRCS = [
     "runtime/XNNWorkspaceManager.cpp",
     "runtime/XnnpackBackendOptions.cpp",
     "runtime/profiling/XNNProfiler.cpp",
+    "runtime/core/tensor.cpp",
+    "runtime/core/quant_params.cpp",
+    "runtime/graph/graph.cpp",
+    "runtime/graph/graph_builder.cpp",
+    "runtime/operators/operator.cpp",
+    "runtime/executor/arena.cpp",
+    "runtime/executor/shape_env.cpp",
+    "runtime/plan/partition.cpp",
+    "runtime/plan/xnn_support.cpp",
 ]
 
 XNNPACK_BACKEND_SRCS = ["backends/xnnpack/" + x for x in XNNPACK_BACKEND_BUCK_SRCS]