From d1d56a2a72247ef080eb124ce6605f3218ce4295 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 10 Jul 2015 23:38:07 +0000
Subject: [PATCH] Added alexnet cfg

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

diff --git a/src/parser.c b/src/parser.c
index 48567a1..2caf96e 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -164,10 +164,11 @@
 {
     int coords = option_find_int(options, "coords", 1);
     int classes = option_find_int(options, "classes", 1);
-    int rescore = option_find_int(options, "rescore", 1);
-    int nuisance = option_find_int(options, "nuisance", 0);
-    int background = option_find_int(options, "background", 1);
-    detection_layer layer = make_detection_layer(params.batch, params.inputs, classes, coords, rescore, background, nuisance);
+    int rescore = option_find_int(options, "rescore", 0);
+    int joint = option_find_int(options, "joint", 0);
+    int objectness = option_find_int(options, "objectness", 0);
+    int background = option_find_int(options, "background", 0);
+    detection_layer layer = make_detection_layer(params.batch, params.inputs, classes, coords, joint, rescore, background, objectness);
     option_unused(options);
     return layer;
 }
@@ -513,7 +514,8 @@
 
 void load_weights_upto(network *net, char *filename, int cutoff)
 {
-    fprintf(stderr, "Loading weights from %s\n", filename);
+    fprintf(stderr, "Loading weights from %s...", filename);
+    fflush(stdout);
     FILE *fp = fopen(filename, "r");
     if(!fp) file_error(filename);
 
@@ -521,7 +523,6 @@
     fread(&net->momentum, sizeof(float), 1, fp);
     fread(&net->decay, sizeof(float), 1, fp);
     fread(&net->seen, sizeof(int), 1, fp);
-    fprintf(stderr, "%f %f %f %d\n", net->learning_rate, net->momentum, net->decay, net->seen);
 
     int i;
     for(i = 0; i < net->n && i < cutoff; ++i){
@@ -556,6 +557,7 @@
 #endif
         }
     }
+    fprintf(stderr, "Done!\n");
     fclose(fp);
 }
 

--
Gitblit v1.10.0