From 2a9f7e44ce1b73d3d56ef83f83e94f074ecac3f9 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 06 Apr 2018 17:34:38 +0000
Subject: [PATCH] Added automatic AVX support - speedup +20% on CPU x86_64 Intel Skylake

---
 src/parser.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/parser.c b/src/parser.c
index a37ef1c..651671b 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -268,11 +268,13 @@
 
 	char *a = option_find_str(options, "mask", 0);
 	int *mask = parse_yolo_mask(a, &num);
-	layer l = make_yolo_layer(params.batch, params.w, params.h, num, total, mask, classes);
+	int max_boxes = option_find_int_quiet(options, "max", 30);
+	layer l = make_yolo_layer(params.batch, params.w, params.h, num, total, mask, classes, max_boxes);
 	assert(l.outputs == params.inputs);
 
-	l.max_boxes = option_find_int_quiet(options, "max", 90);
+	//l.max_boxes = option_find_int_quiet(options, "max", 90);
 	l.jitter = option_find_float(options, "jitter", .2);
+	l.focal_loss = option_find_int_quiet(options, "focal_loss", 0);
 
 	l.ignore_thresh = option_find_float(options, "ignore_thresh", .5);
 	l.truth_thresh = option_find_float(options, "truth_thresh", 1);
@@ -311,7 +313,6 @@
     l.log = option_find_int_quiet(options, "log", 0);
     l.sqrt = option_find_int_quiet(options, "sqrt", 0);
 
-	l.small_object = option_find_int_quiet(options, "small_object", 0);
     l.softmax = option_find_int(options, "softmax", 0);
 	l.focal_loss = option_find_int_quiet(options, "focal_loss", 0);
     //l.max_boxes = option_find_int_quiet(options, "max",30);
@@ -326,6 +327,7 @@
     l.coord_scale = option_find_float(options, "coord_scale", 1);
     l.object_scale = option_find_float(options, "object_scale", 1);
     l.noobject_scale = option_find_float(options, "noobject_scale", 1);
+	l.mask_scale = option_find_float(options, "mask_scale", 1);
     l.class_scale = option_find_float(options, "class_scale", 1);
     l.bias_match = option_find_int_quiet(options, "bias_match",0);
 
@@ -621,6 +623,7 @@
     net->max_crop = option_find_int_quiet(options, "max_crop",net->w*2);
     net->min_crop = option_find_int_quiet(options, "min_crop",net->w);
 
+	net->small_object = option_find_int_quiet(options, "small_object", 0);
     net->angle = option_find_float_quiet(options, "angle", 0);
     net->aspect = option_find_float_quiet(options, "aspect", 1);
     net->saturation = option_find_float_quiet(options, "saturation", 1);

--
Gitblit v1.10.0