[executorch] Migrate most of extension/... to new namespace

backends/apple/coreml/runtime/sdk/model_event_logger_impl.h

@@ -10,7 +10,7 @@
 #import <CoreML/CoreML.h>
 #import <model_event_logger.h>
 
-namespace torch::executor {
+namespace executorch::runtime {
 class EventTracer;
 }
 
@@ -21,7 +21,7 @@ namespace executorchcoreml {
 class ModelEventLoggerImpl final : public ModelEventLogger {
 public:
     /// Construct a `ModelEventLoggerImpl` from the `EventTracer`.
-    explicit ModelEventLoggerImpl(torch::executor::EventTracer* tracer) : tracer_(tracer) { }
+    explicit ModelEventLoggerImpl(::executorch::runtime::EventTracer* tracer) : tracer_(tracer) { }
 
     /// Logs profiling infos.
     ///
@@ -44,6 +44,6 @@ class ModelEventLoggerImpl final : public ModelEventLogger {
         NSDictionary<ETCoreMLModelStructurePath*, NSString*>* op_path_to_debug_symbol_name_map) const noexcept override;
 
 private:
-    torch::executor::EventTracer* tracer_;
+    ::executorch::runtime::EventTracer* tracer_;
 };
 } // namespace executorchcoreml

extension/aten_util/make_aten_functor_from_et_functor.h

@@ -27,9 +27,6 @@
 namespace torch {
 namespace executor {
 
-class KernelRuntimeContext; // Forward declaration
-using RuntimeContext = KernelRuntimeContext; // TODO(T147221312): Remove
-
 // Map types from ETen to ATen.
 // This is used to convert ETen arguments into ATen.
 template <typename T>

extension/evalue_util/print_evalue.cpp

@@ -16,8 +16,10 @@
 #include <ostream>
 #include <sstream>
 
-namespace torch {
-namespace executor {
+using exec_aten::ScalarType;
+
+namespace executorch {
+namespace extension {
 
 namespace {
 
@@ -102,7 +104,7 @@ void print_scalar_list(
       // We've printed a full line, so wrap and begin a new one.
       os << "\n  ";
     }
-    os << EValue(exec_aten::Scalar(list[i]));
+    os << executorch::runtime::EValue(exec_aten::Scalar(list[i]));
     if (wrapping || i < list.size() - 1) {
       // No trailing comma when not wrapping. Always a trailing comma when
       // wrapping. This will leave a trailing space at the end of every wrapped
@@ -149,12 +151,13 @@ void print_tensor(std::ostream& os, exec_aten::Tensor tensor) {
   //
   // TODO(T159700776): Format multidimensional data like numpy/PyTorch does.
   // https://github.com/pytorch/pytorch/blob/main/torch/_tensor_str.py
-#define PRINT_TENSOR_DATA(ctype, dtype)                                  \
-  case ScalarType::dtype:                                                \
-    print_scalar_list(                                                   \
-        os,                                                              \
-        ArrayRef<ctype>(tensor.const_data_ptr<ctype>(), tensor.numel()), \
-        /*print_length=*/false);                                         \
+#define PRINT_TENSOR_DATA(ctype, dtype)                      \
+  case ScalarType::dtype:                                    \
+    print_scalar_list(                                       \
+        os,                                                  \
+        exec_aten::ArrayRef<ctype>(                          \
+            tensor.const_data_ptr<ctype>(), tensor.numel()), \
+        /*print_length=*/false);                             \
     break;
 
   switch (tensor.scalar_type()) {
@@ -211,7 +214,20 @@ void print_list_optional_tensor(
 
 } // namespace
 
+void evalue_edge_items::set_edge_items(std::ostream& os, long edge_items) {
+  os.iword(get_edge_items_xalloc()) = edge_items;
+}
+
+} // namespace extension
+} // namespace executorch
+
+namespace executorch {
+namespace runtime {
+
+// This needs to live in the same namespace as EValue.
 std::ostream& operator<<(std::ostream& os, const EValue& value) {
+  using namespace executorch::extension;
+
   switch (value.tag) {
     case Tag::None:
       os << "None";
@@ -258,13 +274,5 @@ std::ostream& operator<<(std::ostream& os, const EValue& value) {
   return os;
 }
 
-namespace util {
-
-void evalue_edge_items::set_edge_items(std::ostream& os, long edge_items) {
-  os.iword(get_edge_items_xalloc()) = edge_items;
-}
-
-} // namespace util
-
-} // namespace executor
-} // namespace torch
+} // namespace runtime
+} // namespace executorch

extension/evalue_util/print_evalue.h

@@ -12,16 +12,18 @@
 
 #include <executorch/runtime/core/evalue.h>
 
-namespace torch {
-namespace executor {
-
+namespace executorch {
+namespace runtime {
 /**
  * Prints an Evalue to a stream.
  */
 std::ostream& operator<<(std::ostream& os, const EValue& value);
 // Note that this must be declared in the same namespace as EValue.
+} // namespace runtime
+} // namespace executorch
 
-namespace util {
+namespace executorch {
+namespace extension {
 
 /**
  * Sets the number of "edge items" when printing EValue lists to a stream.
@@ -67,6 +69,15 @@ class evalue_edge_items final {
   const long edge_items_;
 };
 
+} // namespace extension
+} // namespace executorch
+
+namespace torch {
+namespace executor {
+namespace util {
+// TODO(T197294990): Remove these deprecated aliases once all users have moved
+// to the new `::executorch` namespaces.
+using ::executorch::extension::evalue_edge_items;
 } // namespace util
 } // namespace executor
 } // namespace torch

extension/kernel_util/make_boxed_from_unboxed_functor.h

@@ -13,8 +13,9 @@
 /// Example usage:
 /// ```
 /// Tensor&
-/// my_op(RuntimeContext& ctx, const Tensor& self, const Tensor& other, Tensor&
-/// out) {
+/// my_op(KernelRuntimeContext& ctx, const Tensor& self, const Tensor& other,
+///       Tensor& out)
+/// {
 ///   // ...
 ///   return out;
 /// }
@@ -47,12 +48,15 @@
 #include <type_traits>
 #include <typeinfo>
 
+namespace executorch {
+namespace runtime {
+class KernelRuntimeContext; // Forward declaration
+} // namespace runtime
+} // namespace executorch
+
 namespace torch {
 namespace executor {
 
-class KernelRuntimeContext; // Forward declaration
-using RuntimeContext = KernelRuntimeContext; // TODO(T147221312): Remove
-
 // evalue_to_arg
 template <class T>
 struct decay_if_not_tensor final {
@@ -106,7 +110,7 @@ struct evalue_to_arg<exec_aten::ArrayRef<exec_aten::optional<T>>> final {
 
 template <class Functor, size_t... evalue_arg_indices, typename... ArgTypes>
 void call_functor_with_args_from_stack_(
-    RuntimeContext& ctx,
+    ::executorch::runtime::KernelRuntimeContext& ctx,
     EValue** stack,
     std::index_sequence<evalue_arg_indices...>,
     typelist<ArgTypes...>*) {
@@ -129,16 +133,18 @@ struct WrapUnboxedIntoFunctor {
   using TrueType = typename FuncType::FuncType;
   using ReturnType = typename infer_function_traits_t<TrueType>::return_type;
   using ArgsType = typename infer_function_traits_t<TrueType>::parameter_types;
-  // check if the first argument is RuntimeContext, if so, remove it
+  // check if the first argument is KernelRuntimeContext, if so, remove it
   static constexpr bool first_arg_is_context = std::is_same<
-      RuntimeContext,
+      ::executorch::runtime::KernelRuntimeContext,
       std::remove_reference_t<head_with_default_t<void, ArgsType>>>::value;
   using ContextRemovedArgsType = std::conditional_t<
       first_arg_is_context,
       drop_if_nonempty_t<ArgsType, 1>,
       ArgsType>;
 
-  static void call(RuntimeContext& ctx, EValue** stack) {
+  static void call(
+      ::executorch::runtime::KernelRuntimeContext& ctx,
+      EValue** stack) {
     constexpr size_t num_inputs = size<ContextRemovedArgsType>::value;
     return call_functor_with_args_from_stack_<FuncType>(
         ctx,

extension/testing_util/temp_file.h

@@ -18,9 +18,9 @@
 
 #include <gtest/gtest.h>
 
-namespace torch {
-namespace executor {
-namespace testing {
+namespace executorch {
+namespace extension {
+namespace testing { // Test-only helpers belong in a "testing" sub-namespace.
 
 /**
  * Creates and manages a named temporary file in the file system. Deletes the
@@ -98,6 +98,16 @@ class TempFile {
   std::string path_;
 };
 
+} // namespace testing
+} // namespace extension
+} // namespace executorch
+
+namespace torch {
+namespace executor {
+namespace testing {
+// TODO(T197294990): Remove these deprecated aliases once all users have moved
+// to the new `::executorch` namespaces.
+using ::executorch::extension::testing::TempFile;
 } // namespace testing
 } // namespace executor
 } // namespace torch

extension/testing_util/test/temp_file_test.cpp

@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 using namespace ::testing;
-using torch::executor::testing::TempFile;
+using executorch::extension::testing::TempFile;
 
 TEST(TempFileTest, Smoke) {
   std::string path;

runtime/backend/backend_execution_context.h

@@ -11,8 +11,8 @@
 #include <executorch/runtime/core/event_tracer.h>
 #include <executorch/runtime/core/memory_allocator.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace runtime {
 
 /**
  * BackendExecutionContext will be used to inject run time context.
@@ -57,5 +57,13 @@ class BackendExecutionContext final {
   MemoryAllocator* temp_allocator_ = nullptr;
 };
 
+} // namespace runtime
+} // namespace executorch
+
+namespace torch {
+namespace executor {
+// TODO(T197294990): Remove these deprecated aliases once all users have moved
+// to the new `::executorch` namespaces.
+using ::executorch::runtime::BackendExecutionContext;
 } // namespace executor
 } // namespace torch

runtime/backend/backend_init_context.h

@@ -9,8 +9,8 @@
 #pragma once
 #include <executorch/runtime/core/memory_allocator.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace runtime {
 
 /**
  * BackendInitContext will be used to inject runtime info for to initialize
@@ -33,5 +33,13 @@ class BackendInitContext final {
   MemoryAllocator* runtime_allocator_ = nullptr;
 };
 
+} // namespace runtime
+} // namespace executorch
+
+namespace torch {
+namespace executor {
+// TODO(T197294990): Remove these deprecated aliases once all users have moved
+// to the new `::executorch` namespaces.
+using ::executorch::runtime::BackendInitContext;
 } // namespace executor
 } // namespace torch

runtime/backend/interface.cpp

@@ -9,12 +9,12 @@
 #include <executorch/runtime/backend/interface.h>
 #include <executorch/runtime/platform/assert.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace runtime {
 
 PyTorchBackendInterface::~PyTorchBackendInterface() {}
 
-// Task t128866626: Remove global static variables.
+// TODO(T128866626): Remove global static variables.
 // We want to be able to run multiple Executor instances
 // and having a global registration isn't a viable solution
 // in the long term.
@@ -56,5 +56,5 @@ Error BackendRegistry::register_backend(const Backend& backend) {
   return Error::Ok;
 }
 
-} // namespace executor
-} // namespace torch
+} // namespace runtime
+} // namespace executorch

runtime/backend/interface.h

@@ -20,8 +20,8 @@
 #include <executorch/runtime/core/result.h>
 #include <executorch/runtime/platform/compiler.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace runtime {
 
 struct SizedBuffer {
   void* buffer;
@@ -170,5 +170,21 @@ PyTorchBackendInterface* get_backend_class(const char* name);
  */
 __ET_NODISCARD Error register_backend(const Backend& backend);
 
+} // namespace runtime
+} // namespace executorch
+
+namespace torch {
+namespace executor {
+// TODO(T197294990): Remove these deprecated aliases once all users have moved
+// to the new `::executorch` namespaces.
+using ::executorch::runtime::Backend;
+using ::executorch::runtime::BackendRegistry;
+using ::executorch::runtime::CompileSpec;
+using ::executorch::runtime::DelegateHandle;
+using ::executorch::runtime::get_backend_class;
+// using ::executorch::runtime::kRegistrationTableMaxSize;
+using ::executorch::runtime::PyTorchBackendInterface;
+using ::executorch::runtime::register_backend;
+using ::executorch::runtime::SizedBuffer;
 } // namespace executor
 } // namespace torch

runtime/core/array_ref.h

@@ -31,8 +31,8 @@
 
 #include <executorch/runtime/platform/assert.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace runtime {
 
 /**
  * Represents a constant reference to an array (0 or more elements
@@ -236,5 +236,15 @@ bool operator!=(ArrayRef<T> a1, ArrayRef<T> a2) {
 
 using IntArrayRef = ArrayRef<int64_t>;
 
+} // namespace runtime
+} // namespace executorch
+
+namespace torch {
+namespace executor {
+// TODO(T197294990): Remove these deprecated aliases once all users have moved
+// to the new `::executorch` namespaces.
+using ::executorch::runtime::ArrayRef;
+using ::executorch::runtime::IntArrayRef;
+using ::executorch::runtime::makeArrayRef;
 } // namespace executor
 } // namespace torch