From 8f1b4e0962857d402f9d017fcbf387ef0eceb7c4 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 01 Sep 2016 23:48:41 +0000
Subject: [PATCH] updates and things
---
src/detection_layer.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/detection_layer.c b/src/detection_layer.c
index 1b0f126..1fe6767 100644
--- a/src/detection_layer.c
+++ b/src/detection_layer.c
@@ -22,6 +22,8 @@
l.coords = coords;
l.rescore = rescore;
l.side = side;
+ l.w = side;
+ l.h = side;
assert(side*side*((1 + l.coords)*l.n + l.classes) == inputs);
l.cost = calloc(1, sizeof(float));
l.outputs = l.inputs;
@@ -44,6 +46,7 @@
int locations = l.side*l.side;
int i,j;
memcpy(l.output, state.input, l.outputs*l.batch*sizeof(float));
+ //if(l.reorg) reorg(l.output, l.w*l.h, size*l.n, l.batch, 1);
int b;
if (l.softmax){
for(b = 0; b < l.batch; ++b){
@@ -53,8 +56,6 @@
softmax_array(l.output + index + offset, l.classes, 1,
l.output + index + offset);
}
- int offset = locations*l.classes;
- activate_array(l.output + index + offset, locations*l.n*(1+l.coords), LOGISTIC);
}
}
if(state.train){
@@ -133,11 +134,9 @@
best_index = 0;
}
}
- /*
- if(1 && *(state.net.seen) < 100000){
+ if(l.random && *(state.net.seen) < 64000){
best_index = rand()%l.n;
}
- */
int box_index = index + locations*(l.classes + l.n) + (i*l.n + best_index) * l.coords;
int tbox_index = truth_index + 1 + l.classes;
@@ -175,10 +174,6 @@
avg_iou += iou;
++count;
}
- if(l.softmax){
- gradient_array(l.output + index + locations*l.classes, locations*l.n*(1+l.coords),
- LOGISTIC, l.delta + index + locations*l.classes);
- }
}
if(0){
@@ -208,9 +203,11 @@
}
+ *(l.cost) = pow(mag_array(l.delta, l.outputs * l.batch), 2);
printf("Detection Avg IOU: %f, Pos Cat: %f, All Cat: %f, Pos Obj: %f, Any Obj: %f, count: %d\n", avg_iou/count, avg_cat/count, avg_allcat/(count*l.classes), avg_obj/count, avg_anyobj/(l.batch*locations*l.n), count);
+ //if(l.reorg) reorg(l.delta, l.w*l.h, size*l.n, l.batch, 0);
}
}
--
Gitblit v1.10.0