From 9d42f49a240136a8cd643cdc1f98230d4f22b05e Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 25 Aug 2015 01:27:42 +0000
Subject: [PATCH] changing data loading
---
src/network.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/network.c b/src/network.c
index ff5cd61..de3e569 100644
--- a/src/network.c
+++ b/src/network.c
@@ -11,6 +11,7 @@
#include "convolutional_layer.h"
#include "deconvolutional_layer.h"
#include "detection_layer.h"
+#include "region_layer.h"
#include "normalization_layer.h"
#include "maxpool_layer.h"
#include "avgpool_layer.h"
@@ -36,6 +37,8 @@
return "softmax";
case DETECTION:
return "detection";
+ case REGION:
+ return "region";
case DROPOUT:
return "dropout";
case CROP:
@@ -80,6 +83,8 @@
forward_normalization_layer(l, state);
} else if(l.type == DETECTION){
forward_detection_layer(l, state);
+ } else if(l.type == REGION){
+ forward_region_layer(l, state);
} else if(l.type == CONNECTED){
forward_connected_layer(l, state);
} else if(l.type == CROP){
@@ -130,12 +135,16 @@
float sum = 0;
int count = 0;
for(i = 0; i < net.n; ++i){
- if(net.layers[net.n-1].type == COST){
- sum += net.layers[net.n-1].output[0];
+ if(net.layers[i].type == COST){
+ sum += net.layers[i].output[0];
++count;
}
- if(net.layers[net.n-1].type == DETECTION){
- sum += net.layers[net.n-1].cost[0];
+ if(net.layers[i].type == DETECTION){
+ sum += net.layers[i].cost[0];
+ ++count;
+ }
+ if(net.layers[i].type == REGION){
+ sum += net.layers[i].cost[0];
++count;
}
}
@@ -178,6 +187,8 @@
backward_dropout_layer(l, state);
} else if(l.type == DETECTION){
backward_detection_layer(l, state);
+ } else if(l.type == REGION){
+ backward_region_layer(l, state);
} else if(l.type == SOFTMAX){
if(i != 0) backward_softmax_layer(l, state);
} else if(l.type == CONNECTED){
--
Gitblit v1.10.0