Revert "Migrate from cpp_python_extension to runtime.cxx_python_extension (#14154)"

.ci/scripts/unittest-buck2.sh

@@ -9,11 +9,7 @@ set -eux
 # TODO: expand this to //...
 # TODO: can't query cadence & vulkan backends
 # TODO: can't query //kernels/prim_ops because of non-buckified stuff in OSS.
-# TODO: Make //backends/arm tests use runtime wrapper so we can just query //backends/arm/...
-buck2 query "//backends/apple/... + //backends/arm: + //backends/arm/debug/... + \
-//backends/arm/operator_support/... + //backends/arm/operators/... + \
-//backends/arm/_passes/... + //backends/arm/runtime/... + //backends/arm/tosa/... \
-+ //backends/example/... + \
+buck2 query "//backends/apple/... + //backends/example/... + \
 //backends/mediatek/... + //backends/transforms/... + \
 //backends/xnnpack/... + //configurations/... + //extension/flat_tensor: + \
 //extension/llm/runner: + //kernels/aten/... + //kernels/optimized/... + \

backends/arm/TARGETS

@@ -14,8 +14,7 @@ runtime.python_library(
         "ethosu/partitioner.py"
     ],
     deps = [
-        ":arm_vela",
-        "//executorch/backends/arm/tosa:arm_partitioner",
+        ":arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -26,7 +25,7 @@ runtime.python_library(
         "vgf/partitioner.py"
     ],
     deps = [
-        "//executorch/backends/arm/tosa:arm_partitioner",
+        ":arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -51,6 +50,21 @@ 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 = [
@@ -63,6 +77,7 @@ 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,20 +59,3 @@ 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",
-    ],
-)

backends/cadence/aot/TARGETS

@@ -12,6 +12,7 @@ load(
     "CXX",
 )
 load("@fbsource//xplat/executorch/codegen:codegen.bzl", "executorch_generated_lib")
+load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 
 oncall("odai_jarvis")
 

codegen/tools/targets.bzl

@@ -17,10 +17,10 @@ def define_common_targets(is_fbcode = False):
         ],
         deps = [
             "//executorch/codegen:gen_lib",
-        ] + ([] if runtime.is_oss else select({
+        ] + select({
             "DEFAULT": [],
-            "ovr_config//os:linux": ["//executorch/codegen/tools:selective_build"],  # TODO(larryliu0820) :selective_build doesn't build in OSS yet
-        })),
+            "ovr_config//os:linux": [] if runtime.is_oss else ["//executorch/codegen/tools:selective_build"],  # TODO(larryliu0820) :selective_build doesn't build in OSS yet
+        }),
     )
 
     runtime.python_binary(

devtools/TARGETS

@@ -5,7 +5,6 @@ oncall("executorch")
 runtime.python_library(
     name = "lib",
     srcs = ["__init__.py"],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//executorch/devtools/bundled_program:core",
         "//executorch/devtools/etrecord:etrecord",

exir/TARGETS

@@ -7,7 +7,6 @@ runtime.python_library(
     srcs = [
         "tracer.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         ":common",
@@ -47,15 +46,13 @@ runtime.python_library(
     srcs = [
         "scalar_type.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
 )
 
 runtime.python_library(
     name = "schema",
     srcs = [
         "schema.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":scalar_type",
         "//executorch/exir/backend:compile_spec_schema",
@@ -74,7 +71,6 @@ runtime.python_library(
     srcs = [
         "tensor.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":error",
         ":schema",
@@ -88,7 +84,6 @@ runtime.python_library(
     srcs = [
         "memory.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         ":tensor",
@@ -116,7 +111,6 @@ runtime.python_library(
         "delegate.py",
         "delegate.pyi",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
     ],
@@ -146,7 +140,6 @@ runtime.python_library(
     srcs = [
         "__init__.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":tracer",
         "//caffe2:torch",
@@ -162,7 +155,6 @@ runtime.python_library(
     srcs = [
         "memory_planning.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":control_flow",
         ":delegate",
@@ -221,7 +213,6 @@ runtime.python_library(
     srcs = [
         "print_program.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":error",
         ":schema",
@@ -234,15 +225,13 @@ runtime.python_library(
     srcs = [
         "dynamic_shape.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
 )
 
 runtime.python_library(
     name = "pass_base",
     srcs = [
         "pass_base.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":delegate",
         ":error",
@@ -257,7 +246,6 @@ runtime.python_library(
     srcs = [
         "pass_manager.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         ":error",

exir/_serialize/TARGETS

@@ -1,10 +1,11 @@
+load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 oncall("executorch")
 
 # TODO(T157145817): Update other flatbuffer serializers to use flatc like
 # _flatbuffer.py does, and remove this.
-runtime.cxx_python_extension(
+cpp_python_extension(
     name = "_bindings",
     srcs = [
         "bindings.cpp",

exir/dialects/TARGETS

@@ -10,7 +10,6 @@ runtime.python_library(
     resources = {
         "//executorch/exir/dialects/edge:edge_yaml": "edge.yaml",
     },
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//caffe2/torchgen:torchgen",

exir/dialects/edge/TARGETS

@@ -11,7 +11,6 @@ runtime.python_library(
     resources = {
         ":edge_yaml": "edge.yaml",
     },
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/ruamel-yaml:ruamel-yaml",
         "fbsource//third-party/pypi/setuptools:setuptools",

exir/passes/TARGETS

@@ -7,7 +7,6 @@ runtime.python_library(
     srcs = [
         "__init__.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":const_prop_pass",
         ":debug_handle_generator_pass",
@@ -106,7 +105,6 @@ runtime.python_library(
     srcs = [
         "const_prop_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
@@ -119,7 +117,6 @@ runtime.python_library(
     srcs = [
         "scalar_to_tensor_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
@@ -131,7 +128,6 @@ runtime.python_library(
     srcs = [
         "constant_prop_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir/dialects:lib",
@@ -146,7 +142,6 @@ runtime.python_library(
     srcs = [
         "remove_graph_asserts_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
     ],
@@ -169,7 +164,6 @@ runtime.python_library(
         "_quant_patterns_and_replacements.py",
         "quant_fusion_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":replace_aten_with_edge_pass",
         "//caffe2:torch",
@@ -185,7 +179,6 @@ runtime.python_library(
     srcs = [
         "quantize_io_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/numpy:numpy",
         "//caffe2:torch",
@@ -239,7 +232,6 @@ runtime.python_library(
     srcs = [
         "remove_mixed_type_operators.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
@@ -251,7 +243,6 @@ runtime.python_library(
     srcs = [
         "spec_prop_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:delegate",
@@ -265,7 +256,6 @@ runtime.python_library(
     srcs = [
         "init_mutable_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//executorch/exir:delegate",
     ],
@@ -276,7 +266,6 @@ runtime.python_library(
     srcs = [
         "sym_shape_eval_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:_warnings",
@@ -351,7 +340,6 @@ runtime.python_library(
     srcs = [
         "debug_handle_generator_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:debug_handle_utils",

exir/tests/TARGETS

@@ -20,7 +20,6 @@ runtime.python_library(
     srcs = [
         "models.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:lib",

exir/verification/TARGETS

@@ -1,9 +1,10 @@
+load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
 
 oncall("executorch")
 
-runtime.cxx_python_extension(
+cpp_python_extension(
     name = "bindings",
     srcs = [
         "bindings.cpp",
@@ -47,7 +48,6 @@ runtime.python_library(
         "arg_validator.py",
         "verifier.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:error",

extension/pytree/TARGETS

@@ -1,14 +1,15 @@
 # Any targets that should be shared between fbcode and xplat must be defined in
 # targets.bzl. This file can contain fbcode-only targets.
 
+load("@fbcode_macros//build_defs:cpp_python_extension.bzl", "cpp_python_extension")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
 define_common_targets()
 
-runtime.cxx_python_extension(
+cpp_python_extension(
     name = "pybindings",
     srcs = [
         "pybindings.cpp",
@@ -20,7 +21,7 @@ runtime.cxx_python_extension(
     ],
 )
 
-runtime.cxx_python_extension(
+cpp_python_extension(
     name = "pybindings_debug",
     srcs = [
         "pybindings.cpp",
@@ -38,7 +39,6 @@ runtime.python_library(
         "__init__.py",
     ],
     base_module = "executorch.extension.pytree",
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":pybindings",
         "//caffe2:torch",