mirror of
https://github.com/lordmathis/CUDANet.git
synced 2025-11-05 17:34:21 +00:00
Add padding to avg pooling
This commit is contained in:
@@ -47,7 +47,8 @@ __global__ void Kernels::avg_pooling(
|
||||
const dim2d outputSize,
|
||||
const int nChannels,
|
||||
const dim2d poolingSize,
|
||||
const dim2d stride
|
||||
const dim2d stride,
|
||||
const dim2d padding
|
||||
) {
|
||||
int j = blockDim.x * blockIdx.x + threadIdx.x;
|
||||
int i = blockDim.y * blockIdx.y + threadIdx.y;
|
||||
@@ -61,11 +62,16 @@ __global__ void Kernels::avg_pooling(
|
||||
|
||||
for (int k = 0; k < poolingSize.first; k++) {
|
||||
for (int l = 0; l < poolingSize.second; l++) {
|
||||
int inputIndex = c * inputSize.first * inputSize.second +
|
||||
(i * stride.first + k) * inputSize.second +
|
||||
(j * stride.second + l);
|
||||
|
||||
sum += d_input[inputIndex];
|
||||
int inputRow = i * stride.first + k - padding.first;
|
||||
int inputCol = j * stride.second + l - padding.second;
|
||||
|
||||
if (inputRow >= 0 && inputRow < inputSize.first &&
|
||||
inputCol >= 0 && inputCol < inputSize.second) {
|
||||
int inputIndex = c * inputSize.first * inputSize.second +
|
||||
inputRow * inputSize.second + inputCol;
|
||||
sum += d_input[inputIndex];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,15 +9,17 @@ AvgPooling2d::AvgPooling2d(
|
||||
int nChannels,
|
||||
dim2d poolingSize,
|
||||
dim2d stride,
|
||||
dim2d padding,
|
||||
ActivationType activationType
|
||||
)
|
||||
: inputSize(inputSize),
|
||||
nChannels(nChannels),
|
||||
poolingSize(poolingSize),
|
||||
stride(stride) {
|
||||
stride(stride),
|
||||
padding(padding) {
|
||||
outputSize = {
|
||||
(inputSize.first - poolingSize.first) / stride.first + 1,
|
||||
(inputSize.second - poolingSize.second) / stride.second + 1
|
||||
(inputSize.first + 2 * padding.first - poolingSize.first) / stride.first + 1,
|
||||
(inputSize.second + 2 * padding.second - poolingSize.second) / stride.second + 1
|
||||
};
|
||||
|
||||
activation = new Activation(
|
||||
@@ -45,7 +47,8 @@ float* AvgPooling2d::forward(const float* d_input) {
|
||||
);
|
||||
|
||||
Kernels::avg_pooling<<<grid, block>>>(
|
||||
d_input, d_output, inputSize, outputSize, nChannels, poolingSize, stride
|
||||
d_input, d_output, inputSize, outputSize, nChannels, poolingSize,
|
||||
stride, padding
|
||||
);
|
||||
CUDA_CHECK(cudaGetLastError());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user