move pattern

backends/cadence/fusion_g3/operators/CMakeLists.txt

@@ -66,7 +66,7 @@ set(_aten_ops__srcs
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_where.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/dtype_util.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/normalization_ops_util.cpp"
-    "${EXECUTORCH_ROOT}/kernels/portable/cpu/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
+    "${EXECUTORCH_ROOT}/kernels/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
 )
 add_library(aten_ops_cadence ${_aten_ops__srcs})
 target_link_libraries(aten_ops_cadence PUBLIC executorch)

backends/cadence/fusion_g3/operators/op_exp.cpp

@@ -13,7 +13,7 @@
 #include <xa_nnlib_kernels_api.h>
 
 #include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
 using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_lt.cpp

@@ -11,7 +11,7 @@
 #include <xa_nnlib_kernels_api.h>
 
 #include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
-#include <executorch/kernels/portable/cpu/pattern/comparison_op.h>
+#include <executorch/kernels/pattern/comparison_op.h>
 
 using ::executorch::aten::Scalar;
 using ::executorch::aten::ScalarType;

backends/cadence/fusion_g3/operators/op_rsqrt.cpp

@@ -11,7 +11,7 @@
 #include <xa_nnlib_kernels_api.h>
 
 #include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
@@ -68,4 +68,4 @@ Tensor& rsqrt_out(KernelRuntimeContext& ctx, const Tensor& in, Tensor& out) {
 } // namespace native
 } // namespace G3
 } // namespace impl
-} // namespace cadence
+} // namespace cadence

backends/cadence/fusion_g3/operators/op_sqrt.cpp

@@ -13,7 +13,7 @@
 #include <xa_nnlib_kernels_api.h>
 
 #include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 

backends/cadence/fusion_g3/operators/op_tanh.cpp

@@ -13,7 +13,7 @@
 #include <xa_nnlib_kernels_api.h>
 
 #include <executorch/backends/cadence/fusion_g3/operators/xt_macros.h>
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 

backends/cadence/fusion_g3/operators/targets.bzl

@@ -7,7 +7,7 @@ def define_operator(name: str, deps: list[str] | None = None) -> None:
     # Deps used by all operators.
     common_deps = [
         "//executorch/kernels/portable/cpu/util:all_deps",
-        "//executorch/kernels/portable/cpu/pattern:all_deps",
+        "//executorch/kernels/pattern:all_deps",
         "//executorch/runtime/kernel:kernel_includes",
         "//executorch/kernels/portable/cpu:scalar_utils",
         "fbsource//third-party/nnlib-FusionG3/xa_nnlib:libxa_nnlib_common",

backends/cadence/hifi/operators/CMakeLists.txt

@@ -51,7 +51,7 @@ set(_aten_ops__srcs
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_hardtanh.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_max_pool2d_with_indices.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_to_copy.cpp"
-    "${EXECUTORCH_ROOT}/kernels/portable/cpu/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
+    "${EXECUTORCH_ROOT}/kernels/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/activation_ops_util.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/broadcast_util.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/copy_ops_util.cpp"

backends/cadence/hifi/operators/op_rsqrt.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>

backends/cadence/hifi/operators/op_tanh.cpp

@@ -7,7 +7,7 @@
  */
 
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 
@@ -41,4 +41,4 @@ Tensor& tanh_out(RuntimeContext& ctx, const Tensor& in, Tensor& out) {
 } // namespace native
 } // namespace HiFi
 } // namespace impl
-} // namespace cadence
+} // namespace cadence

backends/cadence/hifi/operators/targets.bzl

@@ -8,7 +8,7 @@ def define_operator(name: str, deps: list[str] | None = None) -> None:
     # Deps used by all operators.
     common_deps = [
         "//executorch/kernels/portable/cpu/util:all_deps",
-        "//executorch/kernels/portable/cpu/pattern:all_deps",
+        "//executorch/kernels/pattern:all_deps",
         "//executorch/runtime/kernel:kernel_includes",
         "//executorch/kernels/portable/cpu:scalar_utils",
         "//executorch/backends/cadence/hifi/kernels:kernels",

backends/cadence/reference/operators/CMakeLists.txt

@@ -34,7 +34,7 @@ set(_aten_ops__srcs
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/reduce_util.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/repeat_util.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/util/slice_util.cpp"
-    "${EXECUTORCH_ROOT}/kernels/portable/cpu/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
+    "${EXECUTORCH_ROOT}/kernels/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_bmm.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_cat.cpp"
     "${EXECUTORCH_ROOT}/kernels/portable/cpu/op_clone.cpp"

kernels/portable/cpu/pattern/targets.bzl → kernels/pattern/targets.bzl

@@ -12,10 +12,10 @@ def define_common_targets():
     runtime.cxx_library(
         name = "all_deps",
         deps = [
-            "//executorch/kernels/portable/cpu/pattern:pattern",
-            "//executorch/kernels/portable/cpu/pattern:bitwise_op",
-            "//executorch/kernels/portable/cpu/pattern:comparison_op",
-            "//executorch/kernels/portable/cpu/pattern:logical_op"
+            "//executorch/kernels/pattern:pattern",
+            "//executorch/kernels/pattern:bitwise_op",
+            "//executorch/kernels/pattern:comparison_op",
+            "//executorch/kernels/pattern:logical_op"
         ],
         visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"],
     )

kernels/portable/cpu/pattern/unary_ufunc_realhb_to_bool.cpp → kernels/pattern/unary_ufunc_realhb_to_bool.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 

kernels/portable/cpu/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp → kernels/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 

kernels/portable/cpu/pattern/unary_ufunc_realhbf16.cpp → kernels/pattern/unary_ufunc_realhbf16.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 

kernels/portable/cpu/op_acos.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_acosh.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_asin.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_asinh.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_atan.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_atanh.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_bitwise_and.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/bitwise_op.h>
+#include <executorch/kernels/pattern/bitwise_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_bitwise_or.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/bitwise_op.h>
+#include <executorch/kernels/pattern/bitwise_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_bitwise_xor.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/bitwise_op.h>
+#include <executorch/kernels/pattern/bitwise_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_ceil.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_cos.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_cosh.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_eq.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/comparison_op.h>
+#include <executorch/kernels/pattern/comparison_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_erf.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_exp.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_expm1.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_floor.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_ge.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/comparison_op.h>
+#include <executorch/kernels/pattern/comparison_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_gt.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/comparison_op.h>
+#include <executorch/kernels/pattern/comparison_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_isinf.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_isnan.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_le.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/comparison_op.h>
+#include <executorch/kernels/pattern/comparison_op.h>
 
 namespace torch {
 namespace executor {

kernels/portable/cpu/op_log.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_log10.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_log1p.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 

kernels/portable/cpu/op_log2.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/kernels/portable/cpu/pattern/pattern.h>
+#include <executorch/kernels/pattern/pattern.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>