Manual merge of #14156, second try (#14266)

Something went wrong with the automated merge here as well as the first
manual merge. This is an exact export of the corresponding diff.

Differential Revision: D82127665

Author: swolchok

backends/arm/TARGETS

@@ -14,7 +14,8 @@ runtime.python_library(
         "ethosu/partitioner.py"
     ],
     deps = [
-        ":arm_partitioner",
+        ":arm_vela",
+        "//executorch/backends/arm/tosa:arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -25,7 +26,7 @@ runtime.python_library(
         "vgf/partitioner.py"
     ],
     deps = [
-        ":arm_partitioner",
+        "//executorch/backends/arm/tosa:arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -50,21 +51,6 @@ runtime.python_library(
         "//executorch/exir:lib",
     ],
 )
-runtime.python_library(
-    name = "arm_partitioner",
-    srcs = [
-        "tosa/backend.py",
-        "tosa/partitioner.py",
-    ],
-    deps = [
-        ":arm_backend",
-        ":constants",
-        "//executorch/backends/arm/debug:schema",
-        "//executorch/backends/arm/operator_support:operator_support",
-        "//executorch/backends/arm/_passes:passes",
-        "//executorch/exir:lib",
-    ],
-)
 runtime.python_library(
     name = "arm_backend",
     srcs = [
@@ -77,7 +63,6 @@ runtime.python_library(
         "fbsource//third-party/tosa_tools/v1.00/serialization_lib/python/serializer:serializer",
         "fbsource//third-party/tosa_tools/v0.80/serialization_lib/python/tosa:tosa",
         "fbsource//third-party/tosa_tools/v1.00/serialization_lib/python/tosa:tosa",
-        ":arm_vela",
         ":process_node",
         "//executorch/backends/arm/operators:lib",
         "//executorch/backends/arm/operators:node_visitor",

backends/arm/tosa/TARGETS

@@ -59,3 +59,20 @@ runtime.python_library(
        ":specification",
     ],
 )
+
+runtime.python_library(
+    name = "arm_partitioner",
+    srcs = [
+        "backend.py",
+        "partitioner.py",
+    ],
+    deps = [
+        "//executorch/backends/arm:arm_backend",
+        "//executorch/backends/arm:constants",
+        "//executorch/backends/arm:process_node",
+        "//executorch/backends/arm/debug:schema",
+        "//executorch/backends/arm/operator_support:operator_support",
+        "//executorch/backends/arm/_passes:passes",
+        "//executorch/exir:lib",
+    ],
+)