From 1b5afb45838e603fa6780762eb8cc59246dc2d81 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Tue, 08 May 2018 11:09:35 +0000
Subject: [PATCH] Output improvements for detector results: When printing detector results, output was done in random order, obfuscating results for interpreting. Now: 1. Text output includes coordinates of rects in (left,right,top,bottom in pixels) along with label and score 2. Text output is sorted by rect lefts to simplify finding appropriate rects on image 3. If several class probs are > thresh for some detection, the most probable is written first and coordinates for others are not repeated 4. Rects are imprinted in image in order by their best class prob, so most probable rects are always on top and not overlayed by less probable ones 5. Most probable label for rect is always written first Also: 6. Message about low GPU memory include required amount
---
src/col2im.c | 78 ++-------------------------------------
1 files changed, 4 insertions(+), 74 deletions(-)
diff --git a/src/col2im.c b/src/col2im.c
index f986071..5c4605e 100644
--- a/src/col2im.c
+++ b/src/col2im.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <math.h>
-inline void col2im_add_pixel(float *im, int height, int width, int channels,
+void col2im_add_pixel(float *im, int height, int width, int channels,
int row, int col, int channel, int pad, float val)
{
row -= pad;
@@ -16,13 +16,9 @@
int ksize, int stride, int pad, float* data_im)
{
int c,h,w;
- int height_col = (height - ksize) / stride + 1;
- int width_col = (width - ksize) / stride + 1;
- if (pad){
- height_col = 1 + (height-1) / stride;
- width_col = 1 + (width-1) / stride;
- pad = ksize/2;
- }
+ int height_col = (height + 2*pad - ksize) / stride + 1;
+ int width_col = (width + 2*pad - ksize) / stride + 1;
+
int channels_col = channels * ksize * ksize;
for (c = 0; c < channels_col; ++c) {
int w_offset = c % ksize;
@@ -41,69 +37,3 @@
}
}
-
-#ifdef GPU
-
-#include "opencl.h"
-
-cl_kernel get_col2im_kernel()
-{
- static int init = 0;
- static cl_kernel im2col_kernel;
- if(!init){
- im2col_kernel = get_kernel("src/col2im.cl", "col2im", 0);
- init = 1;
- }
- return im2col_kernel;
-}
-
-void col2im_ongpu(cl_mem data_col, int offset,
- int channels, int height, int width,
- int ksize, int stride, int pad, cl_mem data_im)
-{
- cl_kernel kernel = get_col2im_kernel();
- cl_command_queue queue = cl.queue;
-
- cl_uint i = 0;
- cl.error = clSetKernelArg(kernel, i++, sizeof(data_col), (void*) &data_col);
- cl.error = clSetKernelArg(kernel, i++, sizeof(offset), (void*) &offset);
- cl.error = clSetKernelArg(kernel, i++, sizeof(channels), (void*) &channels);
- cl.error = clSetKernelArg(kernel, i++, sizeof(height), (void*) &height);
- cl.error = clSetKernelArg(kernel, i++, sizeof(width), (void*) &width);
- cl.error = clSetKernelArg(kernel, i++, sizeof(ksize), (void*) &ksize);
- cl.error = clSetKernelArg(kernel, i++, sizeof(stride), (void*) &stride);
- cl.error = clSetKernelArg(kernel, i++, sizeof(pad), (void*) &pad);
- cl.error = clSetKernelArg(kernel, i++, sizeof(data_im), (void*) &data_im);
- check_error(cl);
-
- size_t global_size = channels*height*width;
-
- cl.error = clEnqueueNDRangeKernel(queue, kernel, 1, 0,
- &global_size, 0, 0, 0, 0);
- check_error(cl);
-}
-
-/*
- void col2im_gpu(float *data_col, int batch,
- int channels, int height, int width,
- int ksize, int stride, int pad, float *data_im)
- {
- int height_col = (height - ksize) / stride + 1;
- int width_col = (width - ksize) / stride + 1;
- int channels_col = channels * ksize * ksize;
-
- size_t size = height_col*width_col*channels_col*batch;
- cl_mem col_gpu = cl_make_array(data_col, size);
- size = channels*height*width*batch;
- cl_mem im_gpu = cl_make_array(data_im, size);
-
- col2im_ongpu(col_gpu, batch, channels, height, width,
- ksize, stride, pad, im_gpu);
-
- cl_read_array(im_gpu, data_im, size);
- clReleaseMemObject(col_gpu);
- clReleaseMemObject(im_gpu);
- }
- */
-
-#endif
--
Gitblit v1.10.0