From c53e03348c65462bcba33f6352087dd6b9268e8f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 16 Sep 2015 21:12:10 +0000
Subject: [PATCH] yolo working w/ regions
---
src/darknet.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 0928f28..9632f91 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -13,11 +13,13 @@
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);
extern void run_nightmare(int argc, char **argv);
extern void run_dice(int argc, char **argv);
+extern void run_compare(int argc, char **argv);
void change_rate(char *filename, float scale, float add)
{
@@ -86,10 +88,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)
{
@@ -155,7 +168,8 @@
gpu_index = -1;
#else
if(gpu_index >= 0){
- cudaSetDevice(gpu_index);
+ cudaError_t status = cudaSetDevice(gpu_index);
+ check_error(status);
}
#endif
@@ -165,8 +179,12 @@
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], "coco")){
run_coco(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")){
@@ -185,6 +203,8 @@
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