diff --git a/Makefile b/Makefile index 63cb621bd633ee019211c9df9546e5403ee8f5ea..0e185f75e570559a926add2975d08d9161985e95 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GPU=1 +GPU=0 DEBUG=0 ARCH= -arch=sm_52 diff --git a/src/activations.h b/src/activations.h index 07c5b5edb00f997271ccf9c5ad41c85031e2dbfb..0aa61c2ad08d12d6c51ceea5f2f55e34ffdf5bba 100644 --- a/src/activations.h +++ b/src/activations.h @@ -1,6 +1,7 @@ -#include "cuda.h" #ifndef ACTIVATIONS_H #define ACTIVATIONS_H +#include "cuda.h" +#include "math.h" typedef enum{ LOGISTIC, RELU, RELIE, LINEAR, RAMP, TANH, PLSE diff --git a/src/cost_layer.c b/src/cost_layer.c index d2c616ff0f0255ca45ebb9ec7f65fee4898b546b..1ea03bb8fa38fb3092525e7bd85cfda3d7ba08c4 100644 --- a/src/cost_layer.c +++ b/src/cost_layer.c @@ -38,15 +38,6 @@ cost_layer *make_cost_layer(int batch, int inputs, COST_TYPE type) return layer; } -void pull_cost_layer(cost_layer layer) -{ - cuda_pull_array(layer.delta_gpu, layer.delta, layer.batch*layer.inputs); -} -void push_cost_layer(cost_layer layer) -{ - cuda_push_array(layer.delta_gpu, layer.delta, layer.batch*layer.inputs); -} - void forward_cost_layer(cost_layer layer, network_state state) { if (!state.truth) return; @@ -63,6 +54,16 @@ void backward_cost_layer(const cost_layer layer, network_state state) #ifdef GPU +void pull_cost_layer(cost_layer layer) +{ + cuda_pull_array(layer.delta_gpu, layer.delta, layer.batch*layer.inputs); +} + +void push_cost_layer(cost_layer layer) +{ + cuda_push_array(layer.delta_gpu, layer.delta, layer.batch*layer.inputs); +} + void forward_cost_layer_gpu(cost_layer layer, network_state state) { if (!state.truth) return; diff --git a/src/crop_layer.c b/src/crop_layer.c index bc131514c001fca573dad1244c80f8561baf89e1..e83aea249951585112c31be6a0801564bc09c976 100644 --- a/src/crop_layer.c +++ b/src/crop_layer.c @@ -37,6 +37,8 @@ void forward_crop_layer(const crop_layer layer, network_state state) int flip = (layer.flip && rand()%2); int dh = rand()%(layer.h - layer.crop_height + 1); int dw = rand()%(layer.w - layer.crop_width + 1); + float scale = 2; + float trans = -1; if(!state.train){ flip = 0; dh = (layer.h - layer.crop_height)/2; @@ -53,7 +55,7 @@ void forward_crop_layer(const crop_layer layer, network_state state) } row = i + dh; index = col+layer.w*(row+layer.h*(c + layer.c*b)); - layer.output[count++] = state.input[index]; + layer.output[count++] = state.input[index]*scale + trans; } } } diff --git a/src/detection.c b/src/detection.c index eea61366b698c672f51515b95818e323fbf74830..024c0e96eacf34c0f2abac38f58b0062c9cf65f7 100644 --- a/src/detection.c +++ b/src/detection.c @@ -203,8 +203,6 @@ void test_detection(char *cfgfile, char *weightfile) fgets(filename, 256, stdin); strtok(filename, "\n"); image im = load_image_color(filename, im_size, im_size); - translate_image(im, -128); - scale_image(im, 1/128.); printf("%d %d %d\n", im.h, im.w, im.c); float *X = im.data; time=clock();