From 989ab8c38a02fa7ea9c25108151736c62e81c972 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 24 Apr 2015 17:27:50 +0000
Subject: [PATCH] IOU loss function
---
src/crop_layer.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/crop_layer.c b/src/crop_layer.c
index 3f0011d..7ae4aa5 100644
--- a/src/crop_layer.c
+++ b/src/crop_layer.c
@@ -7,10 +7,10 @@
int h = layer.crop_height;
int w = layer.crop_width;
int c = layer.c;
- return float_to_image(h,w,c,layer.output);
+ return float_to_image(w,h,c,layer.output);
}
-crop_layer *make_crop_layer(int batch, int h, int w, int c, int crop_height, int crop_width, int flip)
+crop_layer *make_crop_layer(int batch, int h, int w, int c, int crop_height, int crop_width, int flip, float angle, float saturation, float exposure)
{
fprintf(stderr, "Crop Layer: %d x %d -> %d x %d x %d image\n", h,w,crop_height,crop_width,c);
crop_layer *layer = calloc(1, sizeof(crop_layer));
@@ -19,16 +19,20 @@
layer->w = w;
layer->c = c;
layer->flip = flip;
+ layer->angle = angle;
+ layer->saturation = saturation;
+ layer->exposure = exposure;
layer->crop_width = crop_width;
layer->crop_height = crop_height;
layer->output = calloc(crop_width*crop_height * c*batch, sizeof(float));
#ifdef GPU
layer->output_gpu = cuda_make_array(layer->output, crop_width*crop_height*c*batch);
+ layer->rand_gpu = cuda_make_array(0, layer->batch*8);
#endif
return layer;
}
-void forward_crop_layer(const crop_layer layer, int train, float *input)
+void forward_crop_layer(const crop_layer layer, network_state state)
{
int i,j,c,b,row,col;
int index;
@@ -36,7 +40,9 @@
int flip = (layer.flip && rand()%2);
int dh = rand()%(layer.h - layer.crop_height + 1);
int dw = rand()%(layer.w - layer.crop_width + 1);
- if(!train){
+ float scale = 2;
+ float trans = -1;
+ if(!state.train){
flip = 0;
dh = (layer.h - layer.crop_height)/2;
dw = (layer.w - layer.crop_width)/2;
@@ -52,7 +58,7 @@
}
row = i + dh;
index = col+layer.w*(row+layer.h*(c + layer.c*b));
- layer.output[count++] = input[index];
+ layer.output[count++] = state.input[index]*scale + trans;
}
}
}
--
Gitblit v1.10.0