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

another compile fix

Browse Source
This commit is contained in:
AlexeyAB
2019-10-25 22:14:27 +03:00
parent 24788b8061
commit 72f6de30b2
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gaussian_yolo_layer.c
View File

@ -23,7 +23,7 @@
layer make_gaussian_yolo_layer(int batch, int w, int h, int n, int total, int *mask, int classes) layer make_gaussian_yolo_layer(int batch, int w, int h, int n, int total, int *mask, int classes)
{ {
int i; int i;
layer l = {0}; layer l = { (LAYER_TYPE)0 };
l.type = GAUSSIAN_YOLO; l.type = GAUSSIAN_YOLO;
l.n = n; l.n = n;

12
src/parser.c
View File

@ -159,9 +159,15 @@ convolutional_layer parse_convolutional(list *options, size_params params, netwo
int n = option_find_int(options, "filters",1); int n = option_find_int(options, "filters",1);
int groups = option_find_int_quiet(options, "groups", 1); int groups = option_find_int_quiet(options, "groups", 1);
int size = option_find_int(options, "size",1); int size = option_find_int(options, "size",1);
int stride = option_find_int(options, "stride",1); int stride = -1;
int stride_x = option_find_int_quiet(options, "stride_x", stride); //int stride = option_find_int(options, "stride",1);
int stride_y = option_find_int_quiet(options, "stride_y", stride); int stride_x = option_find_int_quiet(options, "stride_x", -1);
int stride_y = option_find_int_quiet(options, "stride_y", -1);
if (stride_x < 1 || stride_y < 1) {
stride = option_find_int(options, "stride", 1);
if (stride_x < 1) stride_x = stride;
if (stride_y < 1) stride_y = stride;
}
int dilation = option_find_int_quiet(options, "dilation", 1); int dilation = option_find_int_quiet(options, "dilation", 1);
int antialiasing = option_find_int_quiet(options, "antialiasing", 0); int antialiasing = option_find_int_quiet(options, "antialiasing", 0);
if (size == 1) dilation = 1; if (size == 1) dilation = 1;