Revert D76405701

extension/module/bundled_module.cpp

@@ -27,8 +27,6 @@ std::unique_ptr<BufferDataLoader> program_data_loader(
 }
 } // namespace
 
-namespace ET_BUNDLED_MODULE_NAMESPACE {
-
 BundledModule::BundledModule(
     const void* bundled_program_ptr,
     std::unique_ptr<runtime::MemoryAllocator> memory_allocator,
@@ -109,6 +107,6 @@ runtime::Error BundledModule::verify_method_outputs(
   return executorch::BUNDLED_PROGRAM_NAMESPACE::verify_method_outputs(
       *method, bundled_program_ptr_, testset_idx, rtol, atol);
 }
-} // namespace ET_BUNDLED_MODULE_NAMESPACE
+
 } // namespace extension
 } // namespace executorch

extension/module/bundled_module.h

@@ -10,19 +10,9 @@
 
 #include <executorch/extension/module/module.h>
 
-#ifdef USE_ATEN_LIB
-#define ET_BUNDLED_MODULE_NAMESPACE bundled_module::aten
-#else // !USE_ATEN_LIB
-#define ET_BUNDLED_MODULE_NAMESPACE bundled_module
-#endif // USE_ATEN_LIB
-
 namespace executorch {
 namespace extension {
 
-using ET_MODULE_NAMESPACE::Module;
-
-namespace ET_BUNDLED_MODULE_NAMESPACE {
-
 /**
  * A facade class for loading bundled programs and executing methods within
  * them.
@@ -129,6 +119,5 @@ class BundledModule : public Module {
   bool is_loaded_from_file_ = false;
 };
 
-} // namespace ET_BUNDLED_MODULE_NAMESPACE
 } // namespace extension
 } // namespace executorch

extension/module/module.cpp

@@ -36,7 +36,6 @@
 
 namespace executorch {
 namespace extension {
-namespace ET_MODULE_NAMESPACE {
 
 using ET_RUNTIME_NAMESPACE::MethodMeta;
 using ET_RUNTIME_NAMESPACE::Program;
@@ -309,6 +308,5 @@ runtime::Error Module::set_output(
       output_tensor.mutable_data_ptr(), output_tensor.nbytes(), output_index);
 }
 
-} // namespace ET_MODULE_NAMESPACE
 } // namespace extension
 } // namespace executorch

extension/module/module.h

@@ -16,12 +16,6 @@
 
 #include <executorch/runtime/executor/program.h>
 
-#ifdef USE_ATEN_LIB
-#define ET_MODULE_NAMESPACE module::aten
-#else // !USE_ATEN_LIB
-#define ET_MODULE_NAMESPACE module
-#endif // USE_ATEN_LIB
-
 namespace executorch {
 namespace extension {
 
@@ -30,9 +24,6 @@ using ET_RUNTIME_NAMESPACE::MethodMeta;
 using ET_RUNTIME_NAMESPACE::NamedDataMap;
 using ET_RUNTIME_NAMESPACE::Program;
 
-class ExecuTorchJni;
-
-namespace ET_MODULE_NAMESPACE {
 /**
  * A facade class for loading programs and executing methods within them.
  */
@@ -502,24 +493,16 @@ class Module {
  protected:
   std::unordered_map<std::string, MethodHolder> methods_;
 
-  friend class executorch::extension::ExecuTorchJni;
+  friend class ExecuTorchJni;
 };
 
-} // namespace ET_MODULE_NAMESPACE
 } // namespace extension
 } // namespace executorch
 
 namespace torch {
 namespace executor {
 // TODO(T197294990): Remove these deprecated aliases once all users have moved
 // to the new `::executorch` namespaces.
-using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
+using ::executorch::extension::Module;
 } // namespace executor
 } // namespace torch
-
-namespace executorch {
-namespace extension {
-// backward compatible namespace alias
-using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
-} // namespace extension
-} // namespace executorch

extension/module/test/bundled_module_test.cpp

@@ -9,7 +9,7 @@
 #include <executorch/extension/module/bundled_module.h>
 #include <gtest/gtest.h>
 
-using namespace ::executorch::extension::ET_BUNDLED_MODULE_NAMESPACE;
+using namespace ::executorch::extension;
 using namespace ::executorch::runtime;
 
 class BundledModuleTest : public ::testing::Test {