From 3a99b8151f6a002353691b1254b395eb52effefa Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 17 Aug 2015 17:25:43 +0000
Subject: [PATCH] Fair comparison
---
src/darknet.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 0b69f40..9b6eadb 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -5,6 +5,7 @@
#include "parser.h"
#include "utils.h"
#include "cuda.h"
+#include "blas.h"
#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
@@ -12,6 +13,7 @@
extern void run_imagenet(int argc, char **argv);
extern void run_detection(int argc, char **argv);
+extern void run_yolo(int argc, char **argv);
extern void run_coco(int argc, char **argv);
extern void run_writing(int argc, char **argv);
extern void run_captcha(int argc, char **argv);
@@ -32,8 +34,55 @@
fclose(fp);
}
+void average(int argc, char *argv[])
+{
+ char *cfgfile = argv[2];
+ char *outfile = argv[3];
+ gpu_index = -1;
+ network net = parse_network_cfg(cfgfile);
+ network sum = parse_network_cfg(cfgfile);
+
+ char *weightfile = argv[4];
+ load_weights(&sum, weightfile);
+
+ int i, j;
+ int n = argc - 5;
+ for(i = 0; i < n; ++i){
+ weightfile = argv[i+5];
+ load_weights(&net, weightfile);
+ for(j = 0; j < net.n; ++j){
+ layer l = net.layers[j];
+ layer out = sum.layers[j];
+ if(l.type == CONVOLUTIONAL){
+ int num = l.n*l.c*l.size*l.size;
+ axpy_cpu(l.n, 1, l.biases, 1, out.biases, 1);
+ axpy_cpu(num, 1, l.filters, 1, out.filters, 1);
+ }
+ if(l.type == CONNECTED){
+ axpy_cpu(l.outputs, 1, l.biases, 1, out.biases, 1);
+ axpy_cpu(l.outputs*l.inputs, 1, l.weights, 1, out.weights, 1);
+ }
+ }
+ }
+ n = n+1;
+ for(j = 0; j < net.n; ++j){
+ layer l = sum.layers[j];
+ if(l.type == CONVOLUTIONAL){
+ int num = l.n*l.c*l.size*l.size;
+ scal_cpu(l.n, 1./n, l.biases, 1);
+ scal_cpu(num, 1./n, l.filters, 1);
+ }
+ if(l.type == CONNECTED){
+ scal_cpu(l.outputs, 1./n, l.biases, 1);
+ scal_cpu(l.outputs*l.inputs, 1./n, l.weights, 1);
+ }
+ }
+ save_weights(sum, outfile);
+}
+
void partial(char *cfgfile, char *weightfile, char *outfile, int max)
{
+ gpu_index = -1;
network net = parse_network_cfg(cfgfile);
if(weightfile){
load_weights_upto(&net, weightfile, max);
@@ -86,9 +135,9 @@
load_weights(&net, weightfile);
}
visualize_network(net);
- #ifdef OPENCV
+#ifdef OPENCV
cvWaitKey(0);
- #endif
+#endif
}
int main(int argc, char **argv)
@@ -113,8 +162,12 @@
if(0==strcmp(argv[1], "imagenet")){
run_imagenet(argc, argv);
+ } else if (0 == strcmp(argv[1], "average")){
+ average(argc, argv);
} else if (0 == strcmp(argv[1], "detection")){
run_detection(argc, argv);
+ } else if (0 == strcmp(argv[1], "yolo")){
+ run_yolo(argc, argv);
} else if (0 == strcmp(argv[1], "coco")){
run_coco(argc, argv);
} else if (0 == strcmp(argv[1], "dice")){
--
Gitblit v1.10.0