Remove internal dependencies for cadence ops.

Differential Revision: D88964340

Pull Request resolved: #16207

Author: hsharma35

backends/cadence/hifi/operators/op_quantized_conv2d_nchw_out.cpp

@@ -6,10 +6,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <executorch/backends/cadence/generic/operators/op_quantized_conv2d.h>
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>
 #include <executorch/backends/cadence/hifi/operators/operators.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
-#include <on_device_ai/Assistant/Jarvis/min_runtime/operators/generic/op_quantized_conv2d.h>
 
 #define ALIGN_PTR(x, bytes) ((((unsigned)(x)) + (bytes - 1)) & (~(bytes - 1)))
 

backends/cadence/hifi/operators/op_quantized_conv2d_nhwc_out.cpp

@@ -6,10 +6,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <executorch/backends/cadence/generic/operators/op_quantized_conv2d.h>
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>
 #include <executorch/backends/cadence/hifi/operators/operators.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
-#include <on_device_ai/Assistant/Jarvis/min_runtime/operators/generic/op_quantized_conv2d.h>
 
 #define ALIGN_PTR(x, bytes) ((((unsigned)(x)) + (bytes - 1)) & (~(bytes - 1)))
 

backends/cadence/hifi/operators/op_quantized_linear_out.cpp

@@ -6,19 +6,20 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/backends/cadence/hifi/kernels/kernels.h>
 #include <executorch/backends/cadence/hifi/operators/operators.h>
-#include <executorch/runtime/kernel/kernel_includes.h>
-#include <on_device_ai/Assistant/Jarvis/min_runtime/operators/generic/op_quantized_linear.h>
-#include <xa_nnlib_kernels_api.h>
-#include <xtensa/tie/xt_datacache.h>
+
 #include <algorithm>
 #include <cmath>
 #include <optional>
 
-namespace impl {
-namespace HiFi {
-namespace native {
+#include <xa_nnlib_api.h>
+#include <xtensa/tie/xt_datacache.h>
+
+#include <executorch/backends/cadence/generic/operators/op_quantized_linear.h>
+#include <executorch/backends/cadence/hifi/kernels/kernels.h>
+#include <executorch/runtime/kernel/kernel_includes.h>
+
+namespace impl::HiFi::native {
 
 using ::executorch::aten::ScalarType;
 using ::executorch::aten::Tensor;
@@ -265,16 +266,16 @@ void quantized_linear_out(
 }
 
 void quantized_linear_per_tensor_out(
-    __ET_UNUSED KernelRuntimeContext& ctx,
+    KernelRuntimeContext& ctx,
     const Tensor& in,
     const Tensor& weight,
     const Tensor& bias,
-    int64_t in_zero_point,
-    int64_t weight_zero_point,
-    int64_t out_multiplier,
-    int64_t out_shift,
-    int64_t out_zero_point,
-    __ET_UNUSED const optional<Tensor>& offset,
+    const int64_t in_zero_point,
+    const int64_t weight_zero_point,
+    const int64_t out_multiplier,
+    const int64_t out_shift,
+    const int64_t out_zero_point,
+    const optional<Tensor>& offset,
     Tensor& out) {
   if (out.scalar_type() == ::executorch::aten::ScalarType::Short &&
       in.scalar_type() == ::executorch::aten::ScalarType::Short &&
@@ -321,6 +322,4 @@ void quantized_linear_per_tensor_out(
   }
 }
 
-} // namespace native
-} // namespace HiFi
-} // namespace impl
+} // namespace impl::HiFi::native

backends/cadence/hifi/operators/op_quantized_matmul_out.cpp

@@ -6,19 +6,18 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <stdlib.h>
+
+#include <executorch/backends/cadence/generic/operators/op_quantized_matmul.h>
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
-#include <on_device_ai/Assistant/Jarvis/min_runtime/operators/generic/op_quantized_matmul.h>
-#include <stdlib.h>
 
-using executorch::aten::ScalarType;
-using executorch::aten::Tensor;
-using executorch::runtime::getLeadingDims;
-using torch::executor::RuntimeContext;
+namespace impl::HiFi::native {
 
-namespace impl {
-namespace HiFi {
-namespace native {
+using ::executorch::aten::ScalarType;
+using ::executorch::aten::Tensor;
+using ::executorch::runtime::getLeadingDims;
+using ::torch::executor::RuntimeContext;
 
 // The quantized matmul. The quantized matmul accumulates in a wider register,
 // whose type is TA.
@@ -241,6 +240,4 @@ void quantized_matmul_out(
   }
 }
 
-} // namespace native
-} // namespace HiFi
-} // namespace impl
+} // namespace impl::HiFi::native

backends/cadence/hifi/operators/targets.bzl

@@ -122,12 +122,12 @@ def define_common_targets():
         define_operator(op)
 
     # quantized_linear_out and quantized_linear_per_tensor_out needs additional dependency for int16 support
-    define_operator("quantized_linear_out", deps=["fbcode//on_device_ai/Assistant/Jarvis/min_runtime/operators/generic:op_quantized_linear"])
-    define_operator("quantized_linear_per_tensor_out", deps=["fbcode//on_device_ai/Assistant/Jarvis/min_runtime/operators/generic:op_quantized_linear"])
+    define_operator("quantized_linear_out", deps=["//executorch/backends/cadence/generic/operators:op_quantized_linear"])
+    define_operator("quantized_linear_per_tensor_out", deps=["//executorch/backends/cadence/generic/operators:op_quantized_linear"])
 
     # quantized_conv2d_nchw_out and quantized_conv2d_nhwc_out need additional dependency for int16 support
-    define_operator("quantized_conv2d_nchw_out", deps=["fbcode//on_device_ai/Assistant/Jarvis/min_runtime/operators/generic:op_quantized_conv2d"])
-    define_operator("quantized_conv2d_nhwc_out", deps=["fbcode//on_device_ai/Assistant/Jarvis/min_runtime/operators/generic:op_quantized_conv2d"])
+    define_operator("quantized_conv2d_nchw_out", deps=["//executorch/backends/cadence/generic/operators:op_quantized_conv2d"])
+    define_operator("quantized_conv2d_nhwc_out", deps=["//executorch/backends/cadence/generic/operators:op_quantized_conv2d"])
 
     # quantized_matmul_out needs additional dependency for int16 support
-    define_operator("quantized_matmul_out", deps=["fbcode//on_device_ai/Assistant/Jarvis/min_runtime/operators/generic:op_quantized_matmul"], exported_headers=["op_quantized_matmul_out.h"])
+    define_operator("quantized_matmul_out", deps=["//executorch/backends/cadence/generic/operators:op_quantized_matmul"], exported_headers=["op_quantized_matmul_out.h"])