fix unlocked pool allocator destroyed too early issue in gpu convdw a…

…nd deconvdw inference
PolarisQAQ · Mar 3, 2022 · b053a8c · b053a8c
1 parent 30e106b
commit b053a8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/layer/vulkan/convolutiondepthwise_vulkan.cpp b/src/layer/vulkan/convolutiondepthwise_vulkan.cpp
@@ -422,9 +422,14 @@ int ConvolutionDepthWise_vulkan::upload_model(VkTransfer& cmd, const Option& opt
         Mat weight_data_r2 = weight_data.reshape(maxk, group);
         convert_packing(weight_data_r2, weight_data_packed, elempack, opt);
 
-        cmd.record_upload(weight_data_packed, weight_data_gpu, opt);
-
-        cmd.record_upload(weight_data_packed, weight_data_gpu_image, opt);
+        if (support_image_storage && opt.use_image_storage)
+        {
+            cmd.record_upload(weight_data_packed, weight_data_gpu_image, opt);
+        }
+        else
+        {
+            cmd.record_upload(weight_data_packed, weight_data_gpu, opt);
+        }
 
         if (bias_term)
         {

diff --git a/src/layer/vulkan/deconvolutiondepthwise_vulkan.cpp b/src/layer/vulkan/deconvolutiondepthwise_vulkan.cpp
@@ -451,9 +451,14 @@ int DeconvolutionDepthWise_vulkan::upload_model(VkTransfer& cmd, const Option& o
         Mat weight_data_r2_packed;
         convert_packing(weight_data_r2, weight_data_r2_packed, elempack, opt);
 
-        cmd.record_upload(weight_data_r2_packed, weight_data_gpu, opt);
-
-        cmd.record_upload(weight_data_r2_packed, weight_data_gpu_image, opt);
+        if (support_image_storage && opt.use_image_storage)
+        {
+            cmd.record_upload(weight_data_r2_packed, weight_data_gpu_image, opt);
+        }
+        else
+        {
+            cmd.record_upload(weight_data_r2_packed, weight_data_gpu, opt);
+        }
 
         if (bias_term)
         {