set vulkan device by gpu index

benchmark/benchncnn.cpp

@@ -219,7 +219,7 @@ int main(int argc, char** argv)
     {
         g_warmup_loop_count = 10;
 
-        g_vkdev = new ncnn::VulkanDevice(gpu_device);
+        g_vkdev = ncnn::get_gpu_device(gpu_device);
 
         g_blob_vkallocator = new ncnn::VkUnlockedBlobBufferAllocator(g_vkdev);
         g_staging_vkallocator = new ncnn::VkUnlockedStagingBufferAllocator(g_vkdev);
@@ -335,8 +335,6 @@ int main(int argc, char** argv)
 #if NCNN_VULKAN
     delete g_blob_vkallocator;
     delete g_staging_vkallocator;
-
-    delete g_vkdev;
 #endif // NCNN_VULKAN
 
     return 0;

src/gpu.cpp

@@ -42,11 +42,12 @@ static int g_gpu_count = 0;
 static int g_default_gpu_index = -1;
 
 // NOTE 8 is large enough i think ...
-static GpuInfo g_gpu_infos[8];
+#define NCNN_MAX_GPU_COUNT 8
+static GpuInfo g_gpu_infos[NCNN_MAX_GPU_COUNT];
 
 // default vulkan device
 static Mutex g_default_vkdev_lock;
-static VulkanDevice* g_default_vkdev = 0;
+static VulkanDevice* g_default_vkdev[NCNN_MAX_GPU_COUNT] = {0};
 
 int support_VK_KHR_get_physical_device_properties2 = 0;
 int support_VK_EXT_debug_utils = 0;
@@ -450,9 +451,8 @@ int create_gpu_instance()
         return -1;
     }
 
-    // NOTE 8 is large enough i think ...
-    if (physicalDeviceCount > 8)
-        physicalDeviceCount = 8;
+    if (physicalDeviceCount > NCNN_MAX_GPU_COUNT)
+        physicalDeviceCount = NCNN_MAX_GPU_COUNT;
 
     std::vector<VkPhysicalDevice> physicalDevices(physicalDeviceCount);
 
@@ -733,8 +733,11 @@ int create_gpu_instance()
 
 void destroy_gpu_instance()
 {
-    delete g_default_vkdev;
-    g_default_vkdev = 0;
+    for (int i=0; i<NCNN_MAX_GPU_COUNT; i++)
+    {
+        delete g_default_vkdev[i];
+        g_default_vkdev[i] = 0;
+    }
 
 #if ENABLE_VALIDATION_LAYER
     if (support_VK_EXT_debug_utils)
@@ -1113,14 +1116,17 @@ int VulkanDevice::init_device_extension()
     return 0;
 }
 
-VulkanDevice* get_default_gpu_device()
+VulkanDevice* get_gpu_device(int device_index)
 {
+    if (device_index < 0 || device_index >= g_gpu_count)
+        return 0;
+
     MutexLockGuard lock(g_default_vkdev_lock);
 
-    if (!g_default_vkdev)
-        g_default_vkdev = new VulkanDevice;
+    if (!g_default_vkdev[device_index])
+        g_default_vkdev[device_index] = new VulkanDevice(device_index);
 
-    return g_default_vkdev;
+    return g_default_vkdev[device_index];
 }
 
 } // namespace ncnn

src/gpu.h

@@ -164,7 +164,7 @@ private:
     VkAllocator* staging_buffer_allocator;
 };
 
-VulkanDevice* get_default_gpu_device();
+VulkanDevice* get_gpu_device(int device_index = get_default_gpu_index());
 
 } // namespace ncnn
 

src/net.cpp

@@ -152,7 +152,7 @@ int Net::load_param(FILE* fp)
 #if NCNN_VULKAN
     if (opt.use_vulkan_compute)
     {
-        if (!vkdev) vkdev = get_default_gpu_device();
+        if (!vkdev) vkdev = get_gpu_device();
 
         // sanitize use options
         if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false;
@@ -323,7 +323,7 @@ int Net::load_param_mem(const char* _mem)
 #if NCNN_VULKAN
     if (opt.use_vulkan_compute)
     {
-        if (!vkdev) vkdev = get_default_gpu_device();
+        if (!vkdev) vkdev = get_gpu_device();
 
         // sanitize use options
         if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false;
@@ -498,7 +498,7 @@ int Net::load_param_bin(FILE* fp)
 #if NCNN_VULKAN
     if (opt.use_vulkan_compute)
     {
-        if (!vkdev) vkdev = get_default_gpu_device();
+        if (!vkdev) vkdev = get_gpu_device();
 
         // sanitize use options
         if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false;
@@ -718,7 +718,7 @@ int Net::load_param(const unsigned char* _mem)
 #if NCNN_VULKAN
     if (opt.use_vulkan_compute)
     {
-        if (!vkdev) vkdev = get_default_gpu_device();
+        if (!vkdev) vkdev = get_gpu_device();
 
         // sanitize use options
         if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false;
@@ -1038,6 +1038,11 @@ Extractor Net::create_extractor() const
 }
 
 #if NCNN_VULKAN
+void Net::set_vulkan_device(int device_index)
+{
+    vkdev = get_gpu_device(device_index);
+}
+
 void Net::set_vulkan_device(const VulkanDevice* _vkdev)
 {
     vkdev = _vkdev;

src/net.h

@@ -43,6 +43,8 @@ public:
 
 #if NCNN_VULKAN
 
+    void set_vulkan_device(int device_index);
+
     void set_vulkan_device(const VulkanDevice* vkdev);
 
 #endif // NCNN_VULKAN