From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/crop_layer_kernels.cu | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/crop_layer_kernels.cu b/src/crop_layer_kernels.cu
index d60cc0a..fc7fcbd 100644
--- a/src/crop_layer_kernels.cu
+++ b/src/crop_layer_kernels.cu
@@ -5,8 +5,6 @@
#include "image.h"
}
-#define BLOCK 256
-
__device__ float get_pixel_kernel(float *image, int w, int h, int x, int y, int c)
{
if(x < 0 || x >= w || y < 0 || y >= h) return 0;
@@ -78,7 +76,7 @@
return make_float3(r, g, b);
}
-__device__ float billinear_interpolate_kernel(float *image, int w, int h, float x, float y, int c)
+__device__ float bilinear_interpolate_kernel(float *image, int w, int h, float x, float y, int c)
{
int ix = (int) floorf(x);
int iy = (int) floorf(y);
@@ -170,7 +168,7 @@
float rx = cos(angle)*(x-cx) - sin(angle)*(y-cy) + cx;
float ry = sin(angle)*(x-cx) + cos(angle)*(y-cy) + cy;
- output[count] = billinear_interpolate_kernel(input, w, h, rx, ry, k);
+ output[count] = bilinear_interpolate_kernel(input, w, h, rx, ry, k);
}
extern "C" void forward_crop_layer_gpu(crop_layer layer, network_state state)
@@ -181,6 +179,10 @@
float scale = 2;
float translate = -1;
+ if(layer.noadjust){
+ scale = 1;
+ translate = 0;
+ }
int size = layer.batch * layer.w * layer.h;
--
Gitblit v1.10.0