From 8fec0038ba6b023b838a3d540b973d9dadd5bc2e Mon Sep 17 00:00:00 2001 From: nihui Date: Mon, 1 Jun 2020 22:30:49 +0800 Subject: [PATCH] fix ci test --- src/gpu.cpp | 6 +++--- tests/test_cast.cpp | 12 ++++++------ tests/test_packing.cpp | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/gpu.cpp b/src/gpu.cpp index 46c745e29..9192182e6 100644 --- a/src/gpu.cpp +++ b/src/gpu.cpp @@ -1490,7 +1490,7 @@ VkQueue VulkanDevice::acquire_queue(uint32_t queue_family_index) const } } - // out of hardware queue + NCNN_LOGE("out of hardware queue %u", queue_family_index); return 0; } @@ -1534,7 +1534,7 @@ VkAllocator* VulkanDevice::acquire_blob_allocator() const } } - // out of blob allocator + NCNN_LOGE("out of blob allocator"); return 0; } @@ -1568,7 +1568,7 @@ VkAllocator* VulkanDevice::acquire_staging_allocator() const } } - // out of staging allocator + NCNN_LOGE("out of staging allocator"); return 0; } diff --git a/tests/test_cast.cpp b/tests/test_cast.cpp index 5f0bf0899..17d34f986 100644 --- a/tests/test_cast.cpp +++ b/tests/test_cast.cpp @@ -387,6 +387,9 @@ static int test_cast_gpu_image_fp16p(const ncnn::Mat& a, int type_from, int type ncnn::VulkanDevice* vkdev = ncnn::get_gpu_device(); + if (vkdev->info.bug_layout_binding_id_alias) + return 0; + ncnn::VkAllocator* blob_vkallocator = vkdev->acquire_blob_allocator(); ncnn::VkAllocator* staging_vkallocator = vkdev->acquire_staging_allocator(); @@ -397,9 +400,6 @@ static int test_cast_gpu_image_fp16p(const ncnn::Mat& a, int type_from, int type if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false; if (!vkdev->info.support_fp16_storage) opt.use_fp16_storage = false; - if (vkdev->info.bug_layout_binding_id_alias) - return 0; - ncnn::Layer* op = ncnn::create_layer("Cast"); op->vkdev = vkdev; @@ -504,6 +504,9 @@ static int test_cast_gpu_image_fp16p_pack8(const ncnn::Mat& a, int type_from, in ncnn::VulkanDevice* vkdev = ncnn::get_gpu_device(); + if (vkdev->info.bug_layout_binding_id_alias) + return 0; + ncnn::VkAllocator* blob_vkallocator = vkdev->acquire_blob_allocator(); ncnn::VkAllocator* staging_vkallocator = vkdev->acquire_staging_allocator(); @@ -514,9 +517,6 @@ static int test_cast_gpu_image_fp16p_pack8(const ncnn::Mat& a, int type_from, in if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false; if (!vkdev->info.support_fp16_storage) opt.use_fp16_storage = false; - if (vkdev->info.bug_layout_binding_id_alias) - return 0; - ncnn::Layer* op = ncnn::create_layer("Cast"); op->vkdev = vkdev; diff --git a/tests/test_packing.cpp b/tests/test_packing.cpp index d3133ac63..a0a0e8bfb 100644 --- a/tests/test_packing.cpp +++ b/tests/test_packing.cpp @@ -177,6 +177,9 @@ static int test_packing_gpu_image(const ncnn::Mat& a, int in_elempack, int out_e ncnn::VulkanDevice* vkdev = ncnn::get_gpu_device(); + if (vkdev->info.bug_layout_binding_id_alias) + return 0; + ncnn::VkAllocator* blob_vkallocator = vkdev->acquire_blob_allocator(); ncnn::VkAllocator* staging_vkallocator = vkdev->acquire_staging_allocator(); @@ -187,9 +190,6 @@ static int test_packing_gpu_image(const ncnn::Mat& a, int in_elempack, int out_e if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false; if (!vkdev->info.support_fp16_storage) opt.use_fp16_storage = false; - if (vkdev->info.bug_layout_binding_id_alias) - return 0; - ncnn::Layer* op = ncnn::create_layer("Packing"); op->vkdev = vkdev; @@ -267,6 +267,9 @@ static int test_packing_gpu_buffer2image(const ncnn::Mat& a, int in_elempack, in ncnn::VulkanDevice* vkdev = ncnn::get_gpu_device(); + if (vkdev->info.bug_layout_binding_id_alias) + return 0; + ncnn::VkAllocator* blob_vkallocator = vkdev->acquire_blob_allocator(); ncnn::VkAllocator* staging_vkallocator = vkdev->acquire_staging_allocator(); @@ -277,9 +280,6 @@ static int test_packing_gpu_buffer2image(const ncnn::Mat& a, int in_elempack, in if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false; if (!vkdev->info.support_fp16_storage) opt.use_fp16_storage = false; - if (vkdev->info.bug_layout_binding_id_alias) - return 0; - ncnn::Packing_vulkan* op = new ncnn::Packing_vulkan; op->vkdev = vkdev; @@ -357,6 +357,9 @@ static int test_packing_gpu_image2buffer(const ncnn::Mat& a, int in_elempack, in ncnn::VulkanDevice* vkdev = ncnn::get_gpu_device(); + if (vkdev->info.bug_layout_binding_id_alias) + return 0; + ncnn::VkAllocator* blob_vkallocator = vkdev->acquire_blob_allocator(); ncnn::VkAllocator* staging_vkallocator = vkdev->acquire_staging_allocator(); @@ -367,9 +370,6 @@ static int test_packing_gpu_image2buffer(const ncnn::Mat& a, int in_elempack, in if (!vkdev->info.support_fp16_packed) opt.use_fp16_packed = false; if (!vkdev->info.support_fp16_storage) opt.use_fp16_storage = false; - if (vkdev->info.bug_layout_binding_id_alias) - return 0; - ncnn::Packing_vulkan* op = new ncnn::Packing_vulkan; op->vkdev = vkdev;