mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

changing data loading

Browse Source
This commit is contained in:
Joseph Redmon
2015-08-24 18:27:42 -07:00
parent 3a99b8151f
commit 9d42f49a24
21 changed files with 1104 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/parser.c
View File

@ -14,6 +14,7 @@
#include "softmax_layer.h"
#include "dropout_layer.h"
#include "detection_layer.h"
#include "region_layer.h"
#include "avgpool_layer.h"
#include "route_layer.h"
#include "list.h"
@ -37,6 +38,7 @@ int is_normalization(section *s);
int is_crop(section *s);
int is_cost(section *s);
int is_detection(section *s);
int is_region(section *s);
int is_route(section *s);
list *read_cfg(char *filename);
@ -172,6 +174,16 @@ detection_layer parse_detection(list *options, size_params params)
return layer;
}
region_layer parse_region(list *options, size_params params)
{
int coords = option_find_int(options, "coords", 1);
int classes = option_find_int(options, "classes", 1);
int rescore = option_find_int(options, "rescore", 0);
int num = option_find_int(options, "num", 1);
region_layer layer = make_region_layer(params.batch, params.inputs, num, classes, coords, rescore);
return layer;
}
cost_layer parse_cost(list *options, size_params params)
{
char *type_s = option_find_str(options, "type", "sse");
@ -347,6 +359,8 @@ network parse_network_cfg(char *filename)
l = parse_cost(options, params);
}else if(is_detection(s)){
l = parse_detection(options, params);
}else if(is_region(s)){
l = parse_region(options, params);
}else if(is_softmax(s)){
l = parse_softmax(options, params);
}else if(is_normalization(s)){
@ -399,6 +413,10 @@ int is_detection(section *s)
{
return (strcmp(s->type, "[detection]")==0);
}
int is_region(section *s)
{
return (strcmp(s->type, "[region]")==0);
}
int is_deconvolutional(section *s)
{
return (strcmp(s->type, "[deconv]")==0