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 | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 7814611..0865c61 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -13,7 +13,6 @@
extern void run_imagenet(int argc, char **argv);
extern void run_yolo(int argc, char **argv);
-extern void run_swag(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);
@@ -21,6 +20,11 @@
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)
{
@@ -168,13 +172,13 @@
{
gpu_index = -1;
network net = parse_network_cfg(cfgfile);
- if(weightfile){
+ if (weightfile) {
load_weights(&net, weightfile);
}
int i;
- for(i = 0; i < net.n; ++i){
+ for (i = 0; i < net.n; ++i) {
layer l = net.layers[i];
- if(l.type == CONVOLUTIONAL){
+ if (l.type == CONVOLUTIONAL && l.batch_normalize) {
denormalize_convolutional_layer(l);
net.layers[i].batch_normalize=0;
}
@@ -204,7 +208,9 @@
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;
@@ -221,12 +227,20 @@
average(argc, argv);
} else if (0 == strcmp(argv[1], "yolo")){
run_yolo(argc, argv);
- } else if (0 == strcmp(argv[1], "swag")){
- run_swag(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")){
--
Gitblit v1.10.0