From 89aa45c72396ea28e4a1b60adb911cc890995936 Mon Sep 17 00:00:00 2001 From: "zhou.weiguo" Date: Thu, 23 May 2024 21:37:10 +0800 Subject: [PATCH 1/2] fix build issue: no member named create_gpu_instance in namespace ncnn --- src/gpu.cpp | 23 +++++++++++++++++++++++ src/gpu.h | 10 ++++++++++ src/net.cpp | 7 +++++++ src/net.h | 2 ++ 4 files changed, 42 insertions(+) diff --git a/src/gpu.cpp b/src/gpu.cpp index 77a63f4b3..770630283 100644 --- a/src/gpu.cpp +++ b/src/gpu.cpp @@ -4549,4 +4549,27 @@ int resolve_shader_info(const uint32_t* spv_data, size_t spv_data_size, ShaderIn } // namespace ncnn +#else + +namespace ncnn { + +int create_gpu_instance(const char * driver_path) +{ + return 0; +} + + +void destroy_gpu_instance() +{ +} + + +int get_gpu_count() +{ + return 0; +} + +} // namespace ncnn + + #endif // NCNN_VULKAN diff --git a/src/gpu.h b/src/gpu.h index 4d131f71c..82a9b988e 100644 --- a/src/gpu.h +++ b/src/gpu.h @@ -474,6 +474,16 @@ public: NCNN_EXPORT int resolve_shader_info(const uint32_t* spv_data, size_t spv_data_size, ShaderInfo& shader_info); +} // namespace ncnn +#else +namespace ncnn { + +NCNN_EXPORT int create_gpu_instance(const char * driver_path = 0); + +NCNN_EXPORT void destroy_gpu_instance(void); + +NCNN_EXPORT int get_gpu_count(void); + } // namespace ncnn #endif // NCNN_VULKAN diff --git a/src/net.cpp b/src/net.cpp index cb6dea8a4..4d5c93daa 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2517,6 +2517,13 @@ void Extractor::set_staging_vkallocator(VkAllocator* allocator) { d->opt.staging_vkallocator = allocator; } + +#else + +void Extractor::set_vulkan_compute(bool enable) +{ +} + #endif // NCNN_VULKAN #if NCNN_STRING diff --git a/src/net.h b/src/net.h index d69443bbd..148bf8a41 100644 --- a/src/net.h +++ b/src/net.h @@ -202,6 +202,8 @@ public: void set_workspace_vkallocator(VkAllocator* allocator); void set_staging_vkallocator(VkAllocator* allocator); +#else + void set_vulkan_compute(bool enable); #endif // NCNN_VULKAN #if NCNN_STRING From fbfa1190e1e7e05ba8db0189c91e956e3036c072 Mon Sep 17 00:00:00 2001 From: zhouwg Date: Tue, 28 May 2024 09:06:28 +0000 Subject: [PATCH 2/2] apply code-format changes --- src/gpu.cpp | 5 +---- src/gpu.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gpu.cpp b/src/gpu.cpp index 770630283..ef1b5a981 100644 --- a/src/gpu.cpp +++ b/src/gpu.cpp @@ -4553,17 +4553,15 @@ int resolve_shader_info(const uint32_t* spv_data, size_t spv_data_size, ShaderIn namespace ncnn { -int create_gpu_instance(const char * driver_path) +int create_gpu_instance(const char* driver_path) { return 0; } - void destroy_gpu_instance() { } - int get_gpu_count() { return 0; @@ -4571,5 +4569,4 @@ int get_gpu_count() } // namespace ncnn - #endif // NCNN_VULKAN diff --git a/src/gpu.h b/src/gpu.h index 82a9b988e..d15054846 100644 --- a/src/gpu.h +++ b/src/gpu.h @@ -478,7 +478,7 @@ NCNN_EXPORT int resolve_shader_info(const uint32_t* spv_data, size_t spv_data_si #else namespace ncnn { -NCNN_EXPORT int create_gpu_instance(const char * driver_path = 0); +NCNN_EXPORT int create_gpu_instance(const char* driver_path = 0); NCNN_EXPORT void destroy_gpu_instance(void);