From 8bcdee86585f496afe1a8a38d608ea0504a11243 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 01 Sep 2015 18:22:03 +0000
Subject: [PATCH] Some bug fixes, random stuff
---
src/darknet.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 9b6eadb..f87afc6 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -12,7 +12,6 @@
#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);
@@ -91,6 +90,17 @@
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)
{
@@ -156,7 +166,8 @@
gpu_index = -1;
#else
if(gpu_index >= 0){
- cudaSetDevice(gpu_index);
+ cudaError_t status = cudaSetDevice(gpu_index);
+ check_error(status);
}
#endif
@@ -164,8 +175,6 @@
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")){
@@ -188,6 +197,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