From 37d02d0538f5dfb7189eeb2878da0b60f5785d5b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 21 Nov 2016 17:12:58 +0000
Subject: [PATCH] less memory
---
src/parser.c | 69 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 26f45d3..84733d7 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -2,32 +2,32 @@
#include <string.h>
#include <stdlib.h>
-#include "blas.h"
-#include "parser.h"
-#include "assert.h"
-#include "activations.h"
-#include "crop_layer.h"
-#include "cost_layer.h"
-#include "convolutional_layer.h"
#include "activation_layer.h"
-#include "normalization_layer.h"
-#include "batchnorm_layer.h"
-#include "connected_layer.h"
-#include "rnn_layer.h"
-#include "gru_layer.h"
-#include "crnn_layer.h"
-#include "maxpool_layer.h"
-#include "reorg_layer.h"
-#include "softmax_layer.h"
-#include "dropout_layer.h"
-#include "detection_layer.h"
-#include "region_layer.h"
+#include "activations.h"
+#include "assert.h"
#include "avgpool_layer.h"
+#include "batchnorm_layer.h"
+#include "blas.h"
+#include "connected_layer.h"
+#include "convolutional_layer.h"
+#include "cost_layer.h"
+#include "crnn_layer.h"
+#include "crop_layer.h"
+#include "detection_layer.h"
+#include "dropout_layer.h"
+#include "gru_layer.h"
+#include "list.h"
#include "local_layer.h"
+#include "maxpool_layer.h"
+#include "normalization_layer.h"
+#include "option_list.h"
+#include "parser.h"
+#include "region_layer.h"
+#include "reorg_layer.h"
+#include "rnn_layer.h"
#include "route_layer.h"
#include "shortcut_layer.h"
-#include "list.h"
-#include "option_list.h"
+#include "softmax_layer.h"
#include "utils.h"
typedef struct{
@@ -232,30 +232,12 @@
return layer;
}
-int *read_map(char *filename)
-{
- int n = 0;
- int *map = 0;
- char *str;
- FILE *file = fopen(filename, "r");
- if(!file) file_error(filename);
- while((str=fgetl(file))){
- ++n;
- map = realloc(map, n*sizeof(int));
- map[n-1] = atoi(str);
- }
- return map;
-}
-
layer parse_region(list *options, size_params params)
{
int coords = option_find_int(options, "coords", 4);
int classes = option_find_int(options, "classes", 20);
int num = option_find_int(options, "num", 1);
- params.w = option_find_int(options, "side", params.w);
- params.h = option_find_int(options, "side", params.h);
-
layer l = make_region_layer(params.batch, params.w, params.h, num, classes, coords);
assert(l.outputs == params.inputs);
@@ -268,6 +250,9 @@
l.rescore = option_find_int_quiet(options, "rescore",0);
l.thresh = option_find_float(options, "thresh", .5);
+ l.classfix = option_find_int_quiet(options, "classfix", 0);
+ l.absolute = option_find_int_quiet(options, "absolute", 0);
+ l.random = option_find_int_quiet(options, "random", 0);
l.coord_scale = option_find_float(options, "coord_scale", 1);
l.object_scale = option_find_float(options, "object_scale", 1);
@@ -357,6 +342,7 @@
layer parse_reorg(list *options, size_params params)
{
int stride = option_find_int(options, "stride",1);
+ int reverse = option_find_int_quiet(options, "reverse",0);
int batch,h,w,c;
h = params.h;
@@ -365,7 +351,7 @@
batch=params.batch;
if(!(h && w && c)) error("Layer before reorg layer must output image.");
- layer layer = make_reorg_layer(batch,w,h,c,stride);
+ layer layer = make_reorg_layer(batch,w,h,c,stride,reverse);
return layer;
}
@@ -621,9 +607,10 @@
n = n->next;
int count = 0;
free_section(s);
+ fprintf(stderr, "layer filters size input output\n");
while(n){
params.index = count;
- fprintf(stderr, "%d: ", count);
+ fprintf(stderr, "%5d ", count);
s = (section *)n->val;
options = s->options;
layer l = {0};
--
Gitblit v1.10.0