From a47874a7e8ee2f0b22b59132e8e807468233dff0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 14 Jul 2015 06:25:08 +0000
Subject: [PATCH] nochange option in crop
---
src/parser.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 6d9116f..9670715 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -14,6 +14,7 @@
#include "softmax_layer.h"
#include "dropout_layer.h"
#include "detection_layer.h"
+#include "avgpool_layer.h"
#include "route_layer.h"
#include "list.h"
#include "option_list.h"
@@ -29,6 +30,7 @@
int is_deconvolutional(section *s);
int is_connected(section *s);
int is_maxpool(section *s);
+int is_avgpool(section *s);
int is_dropout(section *s);
int is_softmax(section *s);
int is_normalization(section *s);
@@ -194,7 +196,10 @@
batch=params.batch;
if(!(h && w && c)) error("Layer before crop layer must output image.");
+ int noadjust = option_find_int_quiet(options, "noadjust",0);
+
crop_layer l = make_crop_layer(batch,h,w,c,crop_height,crop_width,flip, angle, saturation, exposure);
+ l.noadjust = noadjust;
return l;
}
@@ -214,6 +219,19 @@
return layer;
}
+avgpool_layer parse_avgpool(list *options, size_params params)
+{
+ int batch,w,h,c;
+ w = params.w;
+ h = params.h;
+ c = params.c;
+ batch=params.batch;
+ if(!(h && w && c)) error("Layer before avgpool layer must output image.");
+
+ avgpool_layer layer = make_avgpool_layer(batch,w,h,c);
+ return layer;
+}
+
dropout_layer parse_dropout(list *options, size_params params)
{
float probability = option_find_float(options, "probability", .5);
@@ -333,6 +351,8 @@
l = parse_normalization(options, params);
}else if(is_maxpool(s)){
l = parse_maxpool(options, params);
+ }else if(is_avgpool(s)){
+ l = parse_avgpool(options, params);
}else if(is_route(s)){
l = parse_route(options, params, net);
}else if(is_dropout(s)){
@@ -402,6 +422,11 @@
return (strcmp(s->type, "[max]")==0
|| strcmp(s->type, "[maxpool]")==0);
}
+int is_avgpool(section *s)
+{
+ return (strcmp(s->type, "[avg]")==0
+ || strcmp(s->type, "[avgpool]")==0);
+}
int is_dropout(section *s)
{
return (strcmp(s->type, "[dropout]")==0);
--
Gitblit v1.10.0