Execute on exec_aten namespace deprecation from #5296 (#7950)

fastmod 'exec_aten::' 'executorch::aten::'
Manually fix op_sdpa.cpp to use ::executorch::aten, run lintrunner.

(FWIW, I disagree with our use of nested namespaces for the reasons outlined in https://abseil.io/tips/130, but we can always find/replace back and leaving the migration unfinished seems worse.)

Author: swolchok

backends/cadence/hifi/operators/op_add.cpp

@@ -16,9 +16,9 @@
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <executorch/runtime/platform/assert.h>
 
-using exec_aten::Scalar;
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
+using executorch::aten::Scalar;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using executorch::runtime::can_cast;
 using executorch::runtime::CppTypeToScalarType;
 using executorch::runtime::KernelRuntimeContext;

backends/cadence/hifi/operators/op_cat.cpp

@@ -30,7 +30,7 @@ namespace native {
 
 Tensor& cat_out(
     RuntimeContext& ctx,
-    exec_aten::ArrayRef<Tensor> tensors,
+    executorch::aten::ArrayRef<Tensor> tensors,
     int64_t dim,
     Tensor& out) {
   if (dim < 0) {

backends/cadence/hifi/operators/op_clamp.cpp

@@ -51,8 +51,8 @@ namespace native {
 Tensor& clamp_tensor_out(
     RuntimeContext& ctx,
     const Tensor& in,
-    const exec_aten::optional<Tensor>& min_opt,
-    const exec_aten::optional<Tensor>& max_opt,
+    const executorch::aten::optional<Tensor>& min_opt,
+    const executorch::aten::optional<Tensor>& max_opt,
     Tensor& out) {
   (void)ctx;
 

backends/cadence/hifi/operators/op_div.cpp

@@ -17,10 +17,10 @@
 #include <executorch/runtime/platform/assert.h>
 #include <cmath>
 
-using exec_aten::Scalar;
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::Scalar;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using torch::executor::Error;
 
 namespace cadence {
@@ -165,7 +165,7 @@ Tensor& div_out_mode(
     RuntimeContext& ctx,
     const Tensor& a,
     const Tensor& b,
-    exec_aten::optional<exec_aten::string_view> mode,
+    executorch::aten::optional<executorch::aten::string_view> mode,
     Tensor& out) {
   ET_KERNEL_CHECK(
       ctx,

backends/cadence/hifi/operators/op_maximum.cpp

@@ -12,9 +12,9 @@
 #include <executorch/kernels/portable/cpu/util/math_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using executorch::runtime::can_cast;
 using executorch::runtime::canCast;
 using executorch::runtime::CppTypeToScalarType;

backends/cadence/hifi/operators/op_minimum.cpp

@@ -12,9 +12,9 @@
 #include <executorch/kernels/portable/cpu/util/math_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using executorch::runtime::can_cast;
 using executorch::runtime::canCast;
 using executorch::runtime::CppTypeToScalarType;

backends/cadence/hifi/operators/op_mul.cpp

@@ -15,10 +15,10 @@
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <executorch/runtime/platform/assert.h>
 
-using exec_aten::Scalar;
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::Scalar;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using executorch::runtime::can_cast;
 using executorch::runtime::CppTypeToScalarType;
 using torch::executor::Error;

backends/cadence/hifi/operators/op_rsqrt.cpp

@@ -11,9 +11,9 @@
 
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>
 
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 
 namespace cadence {
 namespace impl {

backends/cadence/hifi/operators/op_sigmoid.cpp

@@ -14,17 +14,17 @@
 #include <executorch/kernels/portable/cpu/util/functional_util.h>
 #include <executorch/runtime/kernel/kernel_includes.h>
 
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using torch::executor::Error;
 
 namespace cadence {
 namespace impl {
 namespace HiFi {
 namespace native {
 
-using Tensor = exec_aten::Tensor;
+using Tensor = executorch::aten::Tensor;
 
 Tensor& sigmoid_out(RuntimeContext& ctx, const Tensor& in, Tensor& out) {
   (void)ctx;

backends/cadence/hifi/operators/op_softmax.cpp

@@ -50,7 +50,7 @@ Tensor& softmax_out(
   // Adjust for negative dim
   dim = dim < 0 ? dim + executorch::runtime::nonzero_dim(in) : dim;
 
-  const exec_aten::optional<int64_t>& dim_t = dim;
+  const executorch::aten::optional<int64_t>& dim_t = dim;
   const size_t d = ET_NORMALIZE_IX(dim_t.value(), in.dim());
   const size_t size = in.size(d);
 

backends/cadence/hifi/operators/op_sub.cpp

@@ -16,10 +16,10 @@
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <executorch/runtime/platform/assert.h>
 
-using exec_aten::Scalar;
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::Scalar;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using executorch::runtime::can_cast;
 using executorch::runtime::CppTypeToScalarType;
 using torch::executor::Error;

backends/cadence/hifi/operators/op_tanh.cpp

@@ -11,9 +11,9 @@
 #include <executorch/runtime/kernel/kernel_includes.h>
 #include <cmath>
 
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
 using executorch::aten::RuntimeContext;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using torch::executor::Error;
 
 namespace cadence {

backends/cadence/hifi/operators/quantized_linear_out.cpp

@@ -219,7 +219,7 @@ void quantized_linear_out(
     int64_t out_zero_point,
     __ET_UNUSED const optional<Tensor>& offset,
     Tensor& out) {
-  if (out.scalar_type() == exec_aten::ScalarType::Byte) {
+  if (out.scalar_type() == executorch::aten::ScalarType::Byte) {
     _quantized_linear_asym8u(
         in,
         weight,
@@ -231,7 +231,7 @@ void quantized_linear_out(
         out_zero_point,
         offset,
         out);
-  } else if (out.scalar_type() == exec_aten::ScalarType::Char) {
+  } else if (out.scalar_type() == executorch::aten::ScalarType::Char) {
     _quantized_linear_asym8s(
         in,
         weight,
@@ -261,7 +261,7 @@ void quantized_linear_per_tensor_out(
     int64_t out_zero_point,
     __ET_UNUSED const optional<Tensor>& offset,
     Tensor& out) {
-  if (out.scalar_type() == exec_aten::ScalarType::Byte) {
+  if (out.scalar_type() == executorch::aten::ScalarType::Byte) {
     _quantized_linear_per_tensor_asym8u(
         in,
         weight,
@@ -273,7 +273,7 @@ void quantized_linear_per_tensor_out(
         out_zero_point,
         offset,
         out);
-  } else if (out.scalar_type() == exec_aten::ScalarType::Char) {
+  } else if (out.scalar_type() == executorch::aten::ScalarType::Char) {
     _quantized_linear_per_tensor_asym8s(
         in,
         weight,

backends/vulkan/runtime/VulkanBackend.cpp

@@ -417,10 +417,10 @@ bool maybe_update_scalar_tensor(
     executorch::aten::Tensor& scalar_tensor_src) {
   const int32_t cur_val = graph->read_symint(ref);
   int32_t scalar_tensor_val = 0;
-  exec_aten::ScalarType dtype = scalar_tensor_src.scalar_type();
-  if (dtype == exec_aten::ScalarType::Int) {
+  executorch::aten::ScalarType dtype = scalar_tensor_src.scalar_type();
+  if (dtype == executorch::aten::ScalarType::Int) {
     scalar_tensor_val = *scalar_tensor_src.const_data_ptr<int32_t>();
-  } else if (dtype == exec_aten::ScalarType::Long) {
+  } else if (dtype == executorch::aten::ScalarType::Long) {
     scalar_tensor_val = int32_t(*scalar_tensor_src.const_data_ptr<int64_t>());
   }
   bool was_updated = false;

codegen/tools/gen_selected_op_variants.py

@@ -17,7 +17,7 @@
 from torchgen.code_template import CodeTemplate
 
 
-ops_and_dtypes_template_str = """((exec_aten::string_view(operator_name).compare("$operator_name") == 0)\n        && ($dtype_checks))"""
+ops_and_dtypes_template_str = """((executorch::aten::string_view(operator_name).compare("$operator_name") == 0)\n        && ($dtype_checks))"""
 ops_and_dtypes_template = CodeTemplate(ops_and_dtypes_template_str)
 
 selected_kernel_dtypes_h_template_str = """#pragma once
@@ -27,7 +27,7 @@
 
 inline constexpr bool should_include_kernel_dtype(
   const char *operator_name,
-  exec_aten::ScalarType scalar_type
+  executorch::aten::ScalarType scalar_type
 ) {
   return $body;
 }
@@ -91,7 +91,8 @@ def write_selected_op_variants(yaml_file_path: str, output_dir: str) -> None:
                 dtype_set = set([x.split(";")[0] for x in tensor_meta])
                 dtype_list = sorted([dtype_enum_to_type[x] for x in dtype_set])
                 conditions = [
-                    "scalar_type == exec_aten::ScalarType::" + x for x in dtype_list
+                    "scalar_type == executorch::aten::ScalarType::" + x
+                    for x in dtype_list
                 ]
             body_parts.append(
                 ops_and_dtypes_template.substitute(

codegen/tools/test/test_gen_selected_op_variants.py

@@ -71,13 +71,13 @@ def test_generates_correct_header(self) -> None:
 
 inline constexpr bool should_include_kernel_dtype(
   const char *operator_name,
-  exec_aten::ScalarType scalar_type
+  executorch::aten::ScalarType scalar_type
 ) {
-  return ((exec_aten::string_view(operator_name).compare("add.out") == 0)
-        && (scalar_type == exec_aten::ScalarType::Float || scalar_type == exec_aten::ScalarType::Int))
- || ((exec_aten::string_view(operator_name).compare("mul.out") == 0)
-        && (scalar_type == exec_aten::ScalarType::Float))
- || ((exec_aten::string_view(operator_name).compare("sub.out") == 0)
+  return ((executorch::aten::string_view(operator_name).compare("add.out") == 0)
+        && (scalar_type == executorch::aten::ScalarType::Float || scalar_type == executorch::aten::ScalarType::Int))
+ || ((executorch::aten::string_view(operator_name).compare("mul.out") == 0)
+        && (scalar_type == executorch::aten::ScalarType::Float))
+ || ((executorch::aten::string_view(operator_name).compare("sub.out") == 0)
         && (true));
 }
 """,
@@ -124,7 +124,7 @@ def test_generates_correct_header(self) -> None:
 
 inline constexpr bool should_include_kernel_dtype(
   const char *operator_name,
-  exec_aten::ScalarType scalar_type
+  executorch::aten::ScalarType scalar_type
 ) {
   return true;
 }

devtools/bundled_program/bundled_program.cpp

@@ -23,10 +23,10 @@
 #include <executorch/runtime/executor/method.h>
 #include <executorch/runtime/platform/log.h>
 
-using exec_aten::ArrayRef;
-using exec_aten::Half;
-using exec_aten::ScalarType;
-using exec_aten::Tensor;
+using executorch::aten::ArrayRef;
+using executorch::aten::Half;
+using executorch::aten::ScalarType;
+using executorch::aten::Tensor;
 using ::executorch::runtime::Error;
 using ::executorch::runtime::EValue;
 using ::executorch::runtime::Method;
@@ -67,16 +67,16 @@ TensorImpl impl_like(bundled_program_flatbuffer::Tensor* bundled_tensor) {
   ScalarType scalar_type =
       static_cast<ScalarType>(bundled_tensor->scalar_type());
   ssize_t dim = bundled_tensor->sizes()->size();
-  exec_aten::SizesType* sizes = bundled_tensor->mutable_sizes()->data();
+  executorch::aten::SizesType* sizes = bundled_tensor->mutable_sizes()->data();
   void* data = bundled_tensor->mutable_data()->data();
-  exec_aten::DimOrderType* dim_order =
+  executorch::aten::DimOrderType* dim_order =
       bundled_tensor->mutable_dim_order()->data();
 
   // The strides of created tensorimpl will only be actually used when
   // comparsion (`tensor_are_close` below). To eliminate the usage of memory
   // allocator, here we set the initial strides as null and reconstruct the
   // stride array as temporary varible when comparsion.
-  exec_aten::StridesType* strides = nullptr;
+  executorch::aten::StridesType* strides = nullptr;
   return TensorImpl(scalar_type, dim, sizes, data, dim_order, strides);
 }
 #endif
@@ -165,7 +165,7 @@ bool tensors_are_close(
 
   // Contruct stride array for bundled tensor based on its dim order since
   // strides of bundled_tensor in lean mode is null.
-  exec_aten::StridesType strides[kMaxDim] = {0};
+  executorch::aten::StridesType strides[kMaxDim] = {0};
   auto status = torch::executor::dim_order_to_stride(
       bundled_tensor.sizes().data(),
       bundled_tensor.dim_order().data(),
@@ -176,7 +176,7 @@ bool tensors_are_close(
 
   // TODO(T132992348): support comparison between tensors of different strides
   ET_CHECK_MSG(
-      ArrayRef<exec_aten::StridesType>(strides, bundled_tensor.dim()) ==
+      ArrayRef<executorch::aten::StridesType>(strides, bundled_tensor.dim()) ==
           method_output_tensor.strides(),
       "The two inputs of `tensors_are_close` function shall have same strides");
 #endif