From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp
---
src/maxpool_layer_kernels.cu | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/maxpool_layer_kernels.cu b/src/maxpool_layer_kernels.cu
index 331a5e2..6381cc1 100644
--- a/src/maxpool_layer_kernels.cu
+++ b/src/maxpool_layer_kernels.cu
@@ -7,10 +7,10 @@
#include "cuda.h"
}
-__global__ void forward_maxpool_layer_kernel(int n, int in_h, int in_w, int in_c, int stride, int size, float *input, float *output, int *indexes)
+__global__ void forward_maxpool_layer_kernel(int n, int in_h, int in_w, int in_c, int stride, int size, int pad, float *input, float *output, int *indexes)
{
- int h = (in_h-1)/stride + 1;
- int w = (in_w-1)/stride + 1;
+ int h = (in_h + 2*pad)/stride;
+ int w = (in_w + 2*pad)/stride;
int c = in_c;
int id = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;
@@ -24,8 +24,8 @@
id /= c;
int b = id;
- int w_offset = (-size-1)/2 + 1;
- int h_offset = (-size-1)/2 + 1;
+ int w_offset = -pad;
+ int h_offset = -pad;
int out_index = j + w*(i + h*(k + c*b));
float max = -INFINITY;
@@ -47,10 +47,10 @@
indexes[out_index] = max_i;
}
-__global__ void backward_maxpool_layer_kernel(int n, int in_h, int in_w, int in_c, int stride, int size, float *delta, float *prev_delta, int *indexes)
+__global__ void backward_maxpool_layer_kernel(int n, int in_h, int in_w, int in_c, int stride, int size, int pad, float *delta, float *prev_delta, int *indexes)
{
- int h = (in_h-1)/stride + 1;
- int w = (in_w-1)/stride + 1;
+ int h = (in_h + 2*pad)/stride;
+ int w = (in_w + 2*pad)/stride;
int c = in_c;
int area = (size-1)/stride;
@@ -66,8 +66,8 @@
id /= in_c;
int b = id;
- int w_offset = (-size-1)/2 + 1;
- int h_offset = (-size-1)/2 + 1;
+ int w_offset = -pad;
+ int h_offset = -pad;
float d = 0;
int l, m;
@@ -86,13 +86,13 @@
extern "C" void forward_maxpool_layer_gpu(maxpool_layer layer, network_state state)
{
- int h = (layer.h-1)/layer.stride + 1;
- int w = (layer.w-1)/layer.stride + 1;
+ int h = layer.out_h;
+ int w = layer.out_w;
int c = layer.c;
size_t n = h*w*c*layer.batch;
- forward_maxpool_layer_kernel<<<cuda_gridsize(n), BLOCK>>>(n, layer.h, layer.w, layer.c, layer.stride, layer.size, state.input, layer.output_gpu, layer.indexes_gpu);
+ forward_maxpool_layer_kernel<<<cuda_gridsize(n), BLOCK>>>(n, layer.h, layer.w, layer.c, layer.stride, layer.size, layer.pad, state.input, layer.output_gpu, layer.indexes_gpu);
check_error(cudaPeekAtLastError());
}
@@ -100,7 +100,7 @@
{
size_t n = layer.h*layer.w*layer.c*layer.batch;
- backward_maxpool_layer_kernel<<<cuda_gridsize(n), BLOCK>>>(n, layer.h, layer.w, layer.c, layer.stride, layer.size, layer.delta_gpu, state.delta, layer.indexes_gpu);
+ backward_maxpool_layer_kernel<<<cuda_gridsize(n), BLOCK>>>(n, layer.h, layer.w, layer.c, layer.stride, layer.size, layer.pad, layer.delta_gpu, state.delta, layer.indexes_gpu);
check_error(cudaPeekAtLastError());
}
--
Gitblit v1.10.0