Migrate backends/apple/mps to the new namespace (#5883)

Summary:
Pull Request resolved: #5883

Move the MPS backend out of the `torch::` namespace, and update to avoid using the `torch::` or `exec_aten::` namespaces.

Reviewed By: cccclai

Differential Revision: D63908530

fbshipit-source-id: 80ae5001ae950eaa16197e11923d7a4ccf76f7c0

Author: dbort

backends/apple/mps/runtime/MPSBackend.mm

@@ -16,8 +16,20 @@
 #include <string>
 #include <iostream>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
+
+using executorch::aten::Tensor;
+using executorch::runtime::ArrayRef;
+using executorch::runtime::Backend;
+using executorch::runtime::BackendExecutionContext;
+using executorch::runtime::BackendInitContext;
+using executorch::runtime::CompileSpec;
+using executorch::runtime::DelegateHandle;
+using executorch::runtime::EValue;
+using executorch::runtime::Error;
+using executorch::runtime::FreeableBuffer;
+using executorch::runtime::Result;
 
 class MPSBackend final : public ::executorch::runtime::BackendInterface {
  public:
@@ -81,7 +93,7 @@ Error execute(
           output_pointers.push_back(&args[i]->toTensor());
         }
       } else if (args[i]->isTensorList()) {
-        const exec_aten::ArrayRef<exec_aten::Tensor>& tensorList = args[i]->toTensorList();
+        const executorch::aten::ArrayRef<executorch::aten::Tensor>& tensorList = args[i]->toTensorList();
         for (auto& tensor_ : tensorList) {
           if (input_pointers.size() < executor->getNumInputs()) {
             input_pointers.push_back(&tensor_);
@@ -122,5 +134,5 @@ void destroy(DelegateHandle* handle) const override {
 static auto success_with_compiler = register_backend(backend);
 } // namespace
 
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSCompiler.h

@@ -14,8 +14,8 @@
 #include <memory>
 #include <vector>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
@@ -24,15 +24,16 @@ class MPSCompiler {
   // Takes Flatbuffer Serialized MPS Model and rebuilds the MPSGraphExecutable
   // returns an executor object that holds the MPS runtime object which we
   // can then use to set inputs and run inference using the MPSGraphExecutable.
-  ET_NODISCARD static Error compileModel(
+  ET_NODISCARD static executorch::runtime::Error compileModel(
       const void* buffer_pointer,
       size_t num_bytes,
       MPSExecutor* executor,
-      MemoryAllocator* runtime_allocator,
-      ArrayRef<CompileSpec> compile_specs);
+      executorch::runtime::MemoryAllocator* runtime_allocator,
+      executorch::runtime::ArrayRef<executorch::runtime::CompileSpec>
+          compile_specs);
 };
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSCompiler.mm

@@ -23,11 +23,16 @@
 
 #define MPS_UNUSED(x) ( (void)(x) )
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
+using executorch::runtime::ArrayRef;
+using executorch::runtime::CompileSpec;
+using executorch::runtime::Error;
+using executorch::runtime::MemoryAllocator;
+
 /*
 Builds the mps runtime object using the buffer pointer. The buffer pointer
 must be a valid pointer to the serialized mps object.
@@ -66,5 +71,5 @@
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSDelegateHeader.h

@@ -7,8 +7,8 @@
 
 #include <executorch/runtime/core/result.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
@@ -87,7 +87,9 @@ struct MPSDelegateHeader {
    *     error if size was too short, if the header was not found, or if the
    *     header appeared to be corrupt.
    */
-  static Result<MPSDelegateHeader> Parse(const void* data, size_t size);
+  static executorch::runtime::Result<MPSDelegateHeader> Parse(
+      const void* data,
+      size_t size);
 
   /**
    * The offset in bytes to the beginning of the constant data.
@@ -109,5 +111,5 @@ struct MPSDelegateHeader {
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSDelegateHeader.mm

@@ -10,11 +10,14 @@
 #include <executorch/runtime/core/error.h>
 #include <executorch/runtime/core/result.h>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
+using executorch::runtime::Error;
+using executorch::runtime::Result;
+
 /// Interprets the 8 bytes at `data` as a little-endian uint64_t.
 uint64_t getUInt64LE(const uint8_t* data) {
   return (uint64_t)data[0] | ((uint64_t)data[1] << 8) |
@@ -49,5 +52,5 @@ uint64_t getUInt64LE(const uint8_t* data) {
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSDevice.h

@@ -20,8 +20,8 @@
 
 #define MB(x) (x * 1048576UL)
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
@@ -72,8 +72,10 @@ class MPSDevice {
    * Compile a PSO for a given library type.
    * Once compiled, the library and PSOs are cached.
    */
-  Error compilePSO(LibraryType libraryType, const char* kernelName);
-  Error compileLibrary(LibraryType);
+  executorch::runtime::Error compilePSO(
+      LibraryType libraryType,
+      const char* kernelName);
+  executorch::runtime::Error compileLibrary(LibraryType);
 
  private:
   static MPSDevice* _device;
@@ -88,5 +90,5 @@ bool is_macos_13_or_newer(
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSDevice.mm

@@ -8,11 +8,13 @@
 #include <memory>
 #include <mutex>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
+using executorch::runtime::Error;
+
 static std::unique_ptr<MPSDevice> mps_device;
 static std::once_flag mpsdev_init;
 
@@ -152,5 +154,5 @@ bool is_macos_13_or_newer(MacOSVersion version) {
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSExecutor.h

@@ -16,8 +16,8 @@
 #include <memory>
 #include <vector>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
@@ -73,20 +73,20 @@ class MPSExecutor {
     return _executable;
   }
 
-  ET_NODISCARD Error forward(std::vector<const Tensor*>& outputs);
+  ET_NODISCARD executorch::runtime::Error forward(std::vector<const executorch::aten::Tensor*>& outputs);
 
-  ET_NODISCARD Error
-  set_inputs_outputs(std::vector<const Tensor*>& inputs, std::vector<const Tensor*>& outputs);
+  ET_NODISCARD executorch::runtime::Error
+  set_inputs_outputs(std::vector<const executorch::aten::Tensor*>& inputs, std::vector<const executorch::aten::Tensor*>& outputs);
 
-  Error initDataBuffers();
-  Error updateDataBuffers(std::vector<const Tensor*>& inputs, std::vector<const Tensor*>& outputs);
-  Error syncOutputBuffers(std::vector<const Tensor*>& outputs);
+  executorch::runtime::Error initDataBuffers();
+  executorch::runtime::Error updateDataBuffers(std::vector<const executorch::aten::Tensor*>& inputs, std::vector<const executorch::aten::Tensor*>& outputs);
+  executorch::runtime::Error syncOutputBuffers(std::vector<const executorch::aten::Tensor*>& outputs);
 
   friend class MPSCompiler;
 };
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch
 // clang-format on

backends/apple/mps/runtime/MPSExecutor.mm

@@ -17,11 +17,14 @@ @interface MPSGraphExecutable()
 @end
 
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
+using executorch::runtime::Error;
+using executorch::aten::Tensor;
+
 MPSExecutor::MPSExecutor() {
   _use_shared_mem = true;
   _buffers_initialized = false;
@@ -239,5 +242,5 @@ @interface MPSGraphExecutable()
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch

backends/apple/mps/runtime/MPSGraphBuilder.h

@@ -24,11 +24,12 @@
 #include <unordered_map>
 #include <vector>
 
-namespace torch {
-namespace executor {
+namespace executorch {
+namespace backends {
 namespace mps {
 namespace delegate {
 
+using Error = executorch::runtime::Error;
 using DataType = mpsgraph::MPSDataType;
 using TensorPtr = const mpsgraph::MPSTensor *;
 using NodePtr = const mpsgraph::MPSNode *;
@@ -197,5 +198,5 @@ class MPSGraphBuilder {
 
 } // namespace delegate
 } // namespace mps
-} // namespace executor
-} // namespace torch
+} // namespace backends
+} // namespace executorch