Browse Source

fix ci test

tags/20200616
nihui 6 years ago
parent
commit
8fec0038ba
3 changed files with 18 additions and 18 deletions
  1. +3
    -3
      src/gpu.cpp
  2. +6
    -6
      tests/test_cast.cpp
  3. +9
    -9
      tests/test_packing.cpp

+ 3
- 3
src/gpu.cpp View File

@@ -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;
}



+ 6
- 6
tests/test_cast.cpp View File

@@ -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;


+ 9
- 9
tests/test_packing.cpp View File

@@ -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;


Loading…
Cancel
Save