Update namespace from at::native::vulkan to vkcompute (#2798)

Summary: Pull Request resolved: #2798 ## Context The previous change in the stack forks the Vulkan Compute API into the ExecuTorch directory. Now that there is no longer any dependency on ATen-Vulkan, the `at::native::vulkan` namespace is deprecated in favor of `vkcompute`. bypass-github-export-checks Reviewed By: jorgep31415 Differential Revision: D55608083 fbshipit-source-id: bfe7564359b19daf4356c54d9a2c0e967171d25f
pytorch · Apr 2, 2024 · c06c89f · c06c89f
1 parent a6e7317
commit c06c89f
Show file tree

Hide file tree

Showing 72 changed files with 176 additions and 564 deletions.
diff --git a/backends/vulkan/runtime/VulkanBackend.cpp b/backends/vulkan/runtime/VulkanBackend.cpp
@@ -32,7 +32,7 @@ namespace executor {
 namespace vulkan {
 namespace {
 
-using namespace at::native::vulkan;
+using namespace vkcompute;
 
 // Flatbuffer types
 using VkGraphPtr = const vkgraph::VkGraph*;

diff --git a/backends/vulkan/runtime/api/Adapter.cpp b/backends/vulkan/runtime/api/Adapter.cpp
@@ -14,9 +14,7 @@
 #include <sstream>
 #include <utility>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
@@ -444,6 +442,4 @@ std::ostream& operator<<(std::ostream& os, const Adapter& adapter) {
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Adapter.h b/backends/vulkan/runtime/api/Adapter.h
@@ -10,8 +10,6 @@
 
 // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName
 
-#ifdef USE_VULKAN_API
-
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
 #include <executorch/backends/vulkan/runtime/api/Pipeline.h>
@@ -22,9 +20,7 @@
 #include <mutex>
 #include <ostream>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 struct PhysicalDevice final {
@@ -218,8 +214,4 @@ class Adapter final {
 };
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
-
-#endif /* USE_VULKAN_API */
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Allocator.h b/backends/vulkan/runtime/api/Allocator.h
@@ -15,8 +15,6 @@
 
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
-#ifdef USE_VULKAN_API
-
 #define VMA_VULKAN_VERSION 1000000
 
 #ifdef USE_VULKAN_WRAPPER
@@ -60,5 +58,3 @@
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif /* __clang__ */
-
-#endif /* USE_VULKAN_API */
diff --git a/backends/vulkan/runtime/api/Command.cpp b/backends/vulkan/runtime/api/Command.cpp
@@ -11,9 +11,7 @@
 
 #include <mutex>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 //
@@ -448,6 +446,4 @@ void CommandPool::allocate_new_batch(const uint32_t count) {
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Command.h b/backends/vulkan/runtime/api/Command.h
@@ -10,8 +10,6 @@
 
 // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName
 
-#ifdef USE_VULKAN_API
-
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
 #include <executorch/backends/vulkan/runtime/api/Descriptor.h>
@@ -20,9 +18,7 @@
 #include <executorch/backends/vulkan/runtime/api/Shader.h>
 #include <executorch/backends/vulkan/runtime/api/Utils.h>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 class CommandBuffer final {
@@ -170,8 +166,4 @@ class CommandPool final {
 };
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
-
-#endif /* USE_VULKAN_API */
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Context.cpp b/backends/vulkan/runtime/api/Context.cpp
@@ -20,9 +20,7 @@
 #define VULKAN_QUERY_POOL_SIZE 4096u
 #endif
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 Context::Context(size_t adapter_i, const ContextConfig& config)
@@ -230,6 +228,4 @@ UniformParamsBuffer& UniformParamsBuffer::operator=(
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Context.h b/backends/vulkan/runtime/api/Context.h
@@ -10,8 +10,6 @@
 
 // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName
 
-#ifdef USE_VULKAN_API
-
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
 #include <executorch/backends/vulkan/runtime/api/Adapter.h>
@@ -24,9 +22,7 @@
 #include <executorch/backends/vulkan/runtime/api/Shader.h>
 #include <executorch/backends/vulkan/runtime/api/Utils.h>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 struct ContextConfig final {
@@ -560,8 +556,4 @@ inline bool Context::submit_compute_job(
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
-
-#endif /* USE_VULKAN_API */
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Descriptor.cpp b/backends/vulkan/runtime/api/Descriptor.cpp
@@ -12,9 +12,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 //
@@ -290,6 +288,4 @@ void DescriptorPool::flush() {
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Descriptor.h b/backends/vulkan/runtime/api/Descriptor.h
@@ -10,18 +10,14 @@
 
 // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName
 
-#ifdef USE_VULKAN_API
-
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
 #include <executorch/backends/vulkan/runtime/api/Resource.h>
 #include <executorch/backends/vulkan/runtime/api/Shader.h>
 
 #include <unordered_map>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 class DescriptorSet final {
@@ -141,8 +137,4 @@ class DescriptorPool final {
 };
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
-
-#endif /* USE_VULKAN_API */
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Exception.cpp b/backends/vulkan/runtime/api/Exception.cpp
@@ -10,9 +10,7 @@
 
 #include <sstream>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 #define VK_RESULT_CASE(code) \
@@ -80,6 +78,4 @@ Error::Error(SourceLocation source_location, const char* cond, std::string msg)
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Exception.h b/backends/vulkan/runtime/api/Exception.h
@@ -8,7 +8,6 @@
 
 #pragma once
 // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName
-#ifdef USE_VULKAN_API
 
 #include <exception>
 #include <ostream>
@@ -18,37 +17,34 @@
 #include <executorch/backends/vulkan/runtime/api/StringUtil.h>
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
-#define VK_CHECK(function)                                       \
-  do {                                                           \
-    const VkResult result = (function);                          \
-    if (VK_SUCCESS != result) {                                  \
-      throw ::at::native::vulkan::api::Error(                    \
-          {__func__, __FILE__, static_cast<uint32_t>(__LINE__)}, \
-          ::at::native::vulkan::api::concat_str(                 \
-              #function, " returned ", result));                 \
-    }                                                            \
+#define VK_CHECK(function)                                                \
+  do {                                                                    \
+    const VkResult result = (function);                                   \
+    if (VK_SUCCESS != result) {                                           \
+      throw ::vkcompute::api::Error(                                      \
+          {__func__, __FILE__, static_cast<uint32_t>(__LINE__)},          \
+          ::vkcompute::api::concat_str(#function, " returned ", result)); \
+    }                                                                     \
   } while (false)
 
 #define VK_CHECK_COND(cond, ...)                                 \
   do {                                                           \
     if (!(cond)) {                                               \
-      throw ::at::native::vulkan::api::Error(                    \
+      throw ::vkcompute::api::Error(                             \
           {__func__, __FILE__, static_cast<uint32_t>(__LINE__)}, \
           #cond,                                                 \
-          ::at::native::vulkan::api::concat_str(__VA_ARGS__));   \
+          ::vkcompute::api::concat_str(__VA_ARGS__));            \
     }                                                            \
   } while (false)
 
 #define VK_THROW(...)                                          \
   do {                                                         \
-    throw ::at::native::vulkan::api::Error(                    \
+    throw ::vkcompute::api::Error(                             \
         {__func__, __FILE__, static_cast<uint32_t>(__LINE__)}, \
-        ::at::native::vulkan::api::concat_str(__VA_ARGS__));   \
+        ::vkcompute::api::concat_str(__VA_ARGS__));            \
   } while (false)
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 std::ostream& operator<<(std::ostream& out, const VkResult loc);
@@ -82,8 +78,4 @@ class Error : public std::exception {
 };
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
-
-#endif /* USE_VULKAN_API */
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Pipeline.cpp b/backends/vulkan/runtime/api/Pipeline.cpp
@@ -8,9 +8,7 @@
 
 #include <executorch/backends/vulkan/runtime/api/Pipeline.h>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 //
@@ -343,6 +341,4 @@ void ComputePipelineCache::purge() {
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/Pipeline.h b/backends/vulkan/runtime/api/Pipeline.h
@@ -10,8 +10,6 @@
 
 // @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName
 
-#ifdef USE_VULKAN_API
-
 #include <executorch/backends/vulkan/runtime/api/vk_api.h>
 
 #include <executorch/backends/vulkan/runtime/api/Resource.h>
@@ -20,9 +18,7 @@
 #include <mutex>
 #include <unordered_map>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 struct PipelineBarrier final {
@@ -205,8 +201,4 @@ class ComputePipelineCache final {
 //
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
-
-#endif /* USE_VULKAN_API */
+} // namespace vkcompute
diff --git a/backends/vulkan/runtime/api/QueryPool.cpp b/backends/vulkan/runtime/api/QueryPool.cpp
@@ -18,9 +18,7 @@
 #include <iostream>
 #include <utility>
 
-namespace at {
-namespace native {
-namespace vulkan {
+namespace vkcompute {
 namespace api {
 
 namespace {
@@ -286,6 +284,4 @@ size_t QueryPool::shader_logs_entry_count() {
 }
 
 } // namespace api
-} // namespace vulkan
-} // namespace native
-} // namespace at
+} // namespace vkcompute