From eb98da5000f4d347ee8563467dffa4541e7faa7a Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:54 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet
---
src/detection_layer.c | 229 ++-------------------------------------------------------
1 files changed, 9 insertions(+), 220 deletions(-)
diff --git a/src/detection_layer.c b/src/detection_layer.c
index 3ab793a..e48b8b3 100644
--- a/src/detection_layer.c
+++ b/src/detection_layer.c
@@ -2,6 +2,7 @@
#include "activations.h"
#include "softmax_layer.h"
#include "blas.h"
+#include "box.h"
#include "cuda.h"
#include "utils.h"
#include <stdio.h>
@@ -48,220 +49,6 @@
return l;
}
-typedef struct{
- float dx, dy, dw, dh;
-} dbox;
-
-dbox derivative(box a, box b)
-{
- dbox d;
- d.dx = 0;
- d.dw = 0;
- float l1 = a.x - a.w/2;
- float l2 = b.x - b.w/2;
- if (l1 > l2){
- d.dx -= 1;
- d.dw += .5;
- }
- float r1 = a.x + a.w/2;
- float r2 = b.x + b.w/2;
- if(r1 < r2){
- d.dx += 1;
- d.dw += .5;
- }
- if (l1 > r2) {
- d.dx = -1;
- d.dw = 0;
- }
- if (r1 < l2){
- d.dx = 1;
- d.dw = 0;
- }
-
- d.dy = 0;
- d.dh = 0;
- float t1 = a.y - a.h/2;
- float t2 = b.y - b.h/2;
- if (t1 > t2){
- d.dy -= 1;
- d.dh += .5;
- }
- float b1 = a.y + a.h/2;
- float b2 = b.y + b.h/2;
- if(b1 < b2){
- d.dy += 1;
- d.dh += .5;
- }
- if (t1 > b2) {
- d.dy = -1;
- d.dh = 0;
- }
- if (b1 < t2){
- d.dy = 1;
- d.dh = 0;
- }
- return d;
-}
-
-float overlap(float x1, float w1, float x2, float w2)
-{
- float l1 = x1 - w1/2;
- float l2 = x2 - w2/2;
- float left = l1 > l2 ? l1 : l2;
- float r1 = x1 + w1/2;
- float r2 = x2 + w2/2;
- float right = r1 < r2 ? r1 : r2;
- return right - left;
-}
-
-float box_intersection(box a, box b)
-{
- float w = overlap(a.x, a.w, b.x, b.w);
- float h = overlap(a.y, a.h, b.y, b.h);
- if(w < 0 || h < 0) return 0;
- float area = w*h;
- return area;
-}
-
-float box_union(box a, box b)
-{
- float i = box_intersection(a, b);
- float u = a.w*a.h + b.w*b.h - i;
- return u;
-}
-
-float box_iou(box a, box b)
-{
- return box_intersection(a, b)/box_union(a, b);
-}
-
-dbox dintersect(box a, box b)
-{
- float w = overlap(a.x, a.w, b.x, b.w);
- float h = overlap(a.y, a.h, b.y, b.h);
- dbox dover = derivative(a, b);
- dbox di;
-
- di.dw = dover.dw*h;
- di.dx = dover.dx*h;
- di.dh = dover.dh*w;
- di.dy = dover.dy*w;
-
- return di;
-}
-
-dbox dunion(box a, box b)
-{
- dbox du;
-
- dbox di = dintersect(a, b);
- du.dw = a.h - di.dw;
- du.dh = a.w - di.dh;
- du.dx = -di.dx;
- du.dy = -di.dy;
-
- return du;
-}
-
-dbox diou(box a, box b);
-
-void test_dunion()
-{
- box a = {0, 0, 1, 1};
- box dxa= {0+.0001, 0, 1, 1};
- box dya= {0, 0+.0001, 1, 1};
- box dwa= {0, 0, 1+.0001, 1};
- box dha= {0, 0, 1, 1+.0001};
-
- box b = {.5, .5, .2, .2};
- dbox di = dunion(a,b);
- printf("Union: %f %f %f %f\n", di.dx, di.dy, di.dw, di.dh);
- float inter = box_union(a, b);
- float xinter = box_union(dxa, b);
- float yinter = box_union(dya, b);
- float winter = box_union(dwa, b);
- float hinter = box_union(dha, b);
- xinter = (xinter - inter)/(.0001);
- yinter = (yinter - inter)/(.0001);
- winter = (winter - inter)/(.0001);
- hinter = (hinter - inter)/(.0001);
- printf("Union Manual %f %f %f %f\n", xinter, yinter, winter, hinter);
-}
-void test_dintersect()
-{
- box a = {0, 0, 1, 1};
- box dxa= {0+.0001, 0, 1, 1};
- box dya= {0, 0+.0001, 1, 1};
- box dwa= {0, 0, 1+.0001, 1};
- box dha= {0, 0, 1, 1+.0001};
-
- box b = {.5, .5, .2, .2};
- dbox di = dintersect(a,b);
- printf("Inter: %f %f %f %f\n", di.dx, di.dy, di.dw, di.dh);
- float inter = box_intersection(a, b);
- float xinter = box_intersection(dxa, b);
- float yinter = box_intersection(dya, b);
- float winter = box_intersection(dwa, b);
- float hinter = box_intersection(dha, b);
- xinter = (xinter - inter)/(.0001);
- yinter = (yinter - inter)/(.0001);
- winter = (winter - inter)/(.0001);
- hinter = (hinter - inter)/(.0001);
- printf("Inter Manual %f %f %f %f\n", xinter, yinter, winter, hinter);
-}
-
-void test_box()
-{
- test_dintersect();
- test_dunion();
- box a = {0, 0, 1, 1};
- box dxa= {0+.00001, 0, 1, 1};
- box dya= {0, 0+.00001, 1, 1};
- box dwa= {0, 0, 1+.00001, 1};
- box dha= {0, 0, 1, 1+.00001};
-
- box b = {.5, 0, .2, .2};
-
- float iou = box_iou(a,b);
- iou = (1-iou)*(1-iou);
- printf("%f\n", iou);
- dbox d = diou(a, b);
- printf("%f %f %f %f\n", d.dx, d.dy, d.dw, d.dh);
-
- float xiou = box_iou(dxa, b);
- float yiou = box_iou(dya, b);
- float wiou = box_iou(dwa, b);
- float hiou = box_iou(dha, b);
- xiou = ((1-xiou)*(1-xiou) - iou)/(.00001);
- yiou = ((1-yiou)*(1-yiou) - iou)/(.00001);
- wiou = ((1-wiou)*(1-wiou) - iou)/(.00001);
- hiou = ((1-hiou)*(1-hiou) - iou)/(.00001);
- printf("manual %f %f %f %f\n", xiou, yiou, wiou, hiou);
-}
-
-dbox diou(box a, box b)
-{
- float u = box_union(a,b);
- float i = box_intersection(a,b);
- dbox di = dintersect(a,b);
- dbox du = dunion(a,b);
- dbox dd = {0,0,0,0};
-
- if(i <= 0 || 1) {
- dd.dx = b.x - a.x;
- dd.dy = b.y - a.y;
- dd.dw = b.w - a.w;
- dd.dh = b.h - a.h;
- return dd;
- }
-
- dd.dx = 2*pow((1-(i/u)),1)*(di.dx*u - du.dx*i)/(u*u);
- dd.dy = 2*pow((1-(i/u)),1)*(di.dy*u - du.dy*i)/(u*u);
- dd.dw = 2*pow((1-(i/u)),1)*(di.dw*u - du.dw*i)/(u*u);
- dd.dh = 2*pow((1-(i/u)),1)*(di.dh*u - du.dh*i)/(u*u);
- return dd;
-}
-
void forward_detection_layer(const detection_layer l, network_state state)
{
int in_i = 0;
@@ -354,20 +141,20 @@
float scale = 1;
float latent_delta = 0;
if(l.joint) scale = state.input[in_i++];
- else if (l.objectness) state.delta[in_i++] = -l.delta[out_i++];
- else if (l.background) state.delta[in_i++] = scale*l.delta[out_i++];
+ else if (l.objectness) state.delta[in_i++] += -l.delta[out_i++];
+ else if (l.background) state.delta[in_i++] += scale*l.delta[out_i++];
for(j = 0; j < l.classes; ++j){
latent_delta += state.input[in_i]*l.delta[out_i];
- state.delta[in_i++] = scale*l.delta[out_i++];
+ state.delta[in_i++] += scale*l.delta[out_i++];
}
if (l.objectness) {
}else if (l.background) gradient_array(l.output + out_i, l.coords, LOGISTIC, l.delta + out_i);
for(j = 0; j < l.coords; ++j){
- state.delta[in_i++] = l.delta[out_i++];
+ state.delta[in_i++] += l.delta[out_i++];
}
- if(l.joint) state.delta[in_i-l.coords-l.classes-l.joint] = latent_delta;
+ if(l.joint) state.delta[in_i-l.coords-l.classes-l.joint] += latent_delta;
}
}
@@ -411,11 +198,13 @@
cpu_state.truth = truth_cpu;
cpu_state.delta = delta_cpu;
- cuda_pull_array(state.input, in_cpu, l.batch*l.inputs);
+ cuda_pull_array(state.input, in_cpu, l.batch*l.inputs);
+ cuda_pull_array(state.delta, delta_cpu, l.batch*l.inputs);
cuda_pull_array(l.delta_gpu, l.delta, l.batch*outputs);
backward_detection_layer(l, cpu_state);
cuda_push_array(state.delta, delta_cpu, l.batch*l.inputs);
+ if (truth_cpu) free(truth_cpu);
free(in_cpu);
free(delta_cpu);
}
--
Gitblit v1.10.0