From 68213b835b9f15cb449ad2037a8b51c17a3de07b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Mar 2016 22:10:14 +0000
Subject: [PATCH] Makefile
---
src/darknet.c | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 9b6eadb..0865c61 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -12,13 +12,19 @@
#endif
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);
extern void run_nightmare(int argc, char **argv);
extern void run_dice(int argc, char **argv);
+extern void run_compare(int argc, char **argv);
+extern void run_classifier(int argc, char **argv);
+extern void run_char_rnn(int argc, char **argv);
+extern void run_vid_rnn(int argc, char **argv);
+extern void run_tag(int argc, char **argv);
+extern void run_cifar(int argc, char **argv);
+extern void run_go(int argc, char **argv);
void change_rate(char *filename, float scale, float add)
{
@@ -87,10 +93,21 @@
if(weightfile){
load_weights_upto(&net, weightfile, max);
}
- net.seen = 0;
+ *net.seen = 0;
save_weights_upto(net, outfile, max);
}
+void stacked(char *cfgfile, char *weightfile, char *outfile)
+{
+ gpu_index = -1;
+ network net = parse_network_cfg(cfgfile);
+ if(weightfile){
+ load_weights(&net, weightfile);
+ }
+ net.seen = 0;
+ save_weights_double(net, outfile);
+}
+
#include "convolutional_layer.h"
void rescale_net(char *cfgfile, char *weightfile, char *outfile)
{
@@ -128,6 +145,47 @@
save_weights(net, outfile);
}
+void normalize_net(char *cfgfile, char *weightfile, char *outfile)
+{
+ gpu_index = -1;
+ network net = parse_network_cfg(cfgfile);
+ if(weightfile){
+ load_weights(&net, weightfile);
+ }
+ int i, j;
+ for(i = 0; i < net.n; ++i){
+ layer l = net.layers[i];
+ if(l.type == CONVOLUTIONAL){
+ net.layers[i].batch_normalize=1;
+ net.layers[i].scales = calloc(l.n, sizeof(float));
+ for(j = 0; j < l.n; ++j){
+ net.layers[i].scales[i] = 1;
+ }
+ net.layers[i].rolling_mean = calloc(l.n, sizeof(float));
+ net.layers[i].rolling_variance = calloc(l.n, sizeof(float));
+ }
+ }
+ save_weights(net, outfile);
+}
+
+void denormalize_net(char *cfgfile, char *weightfile, char *outfile)
+{
+ gpu_index = -1;
+ network net = parse_network_cfg(cfgfile);
+ if (weightfile) {
+ load_weights(&net, weightfile);
+ }
+ int i;
+ for (i = 0; i < net.n; ++i) {
+ layer l = net.layers[i];
+ if (l.type == CONVOLUTIONAL && l.batch_normalize) {
+ denormalize_convolutional_layer(l);
+ net.layers[i].batch_normalize=0;
+ }
+ }
+ save_weights(net, outfile);
+}
+
void visualize(char *cfgfile, char *weightfile)
{
network net = parse_network_cfg(cfgfile);
@@ -150,13 +208,16 @@
return 0;
}
gpu_index = find_int_arg(argc, argv, "-i", 0);
- if(find_arg(argc, argv, "-nogpu")) gpu_index = -1;
+ if(find_arg(argc, argv, "-nogpu")) {
+ gpu_index = -1;
+ }
#ifndef GPU
gpu_index = -1;
#else
if(gpu_index >= 0){
- cudaSetDevice(gpu_index);
+ cudaError_t status = cudaSetDevice(gpu_index);
+ check_error(status);
}
#endif
@@ -164,12 +225,24 @@
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], "cifar")){
+ run_cifar(argc, argv);
+ } else if (0 == strcmp(argv[1], "go")){
+ run_go(argc, argv);
+ } else if (0 == strcmp(argv[1], "rnn")){
+ run_char_rnn(argc, argv);
+ } else if (0 == strcmp(argv[1], "vid")){
+ run_vid_rnn(argc, argv);
} else if (0 == strcmp(argv[1], "coco")){
run_coco(argc, argv);
+ } else if (0 == strcmp(argv[1], "classifier")){
+ run_classifier(argc, argv);
+ } else if (0 == strcmp(argv[1], "tag")){
+ run_tag(argc, argv);
+ } else if (0 == strcmp(argv[1], "compare")){
+ run_compare(argc, argv);
} else if (0 == strcmp(argv[1], "dice")){
run_dice(argc, argv);
} else if (0 == strcmp(argv[1], "writing")){
@@ -184,10 +257,16 @@
change_rate(argv[2], atof(argv[3]), (argc > 4) ? atof(argv[4]) : 0);
} else if (0 == strcmp(argv[1], "rgbgr")){
rgbgr_net(argv[2], argv[3], argv[4]);
+ } else if (0 == strcmp(argv[1], "denormalize")){
+ denormalize_net(argv[2], argv[3], argv[4]);
+ } else if (0 == strcmp(argv[1], "normalize")){
+ normalize_net(argv[2], argv[3], argv[4]);
} else if (0 == strcmp(argv[1], "rescale")){
rescale_net(argv[2], argv[3], argv[4]);
} else if (0 == strcmp(argv[1], "partial")){
partial(argv[2], argv[3], argv[4], atoi(argv[5]));
+ } else if (0 == strcmp(argv[1], "stacked")){
+ stacked(argv[2], argv[3], argv[4]);
} else if (0 == strcmp(argv[1], "visualize")){
visualize(argv[2], (argc > 3) ? argv[3] : 0);
} else if (0 == strcmp(argv[1], "imtest")){
--
Gitblit v1.10.0