From 2afa376bb37b379f27954f74859fbfa63402ea46 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 14 Aug 2015 18:45:11 +0000
Subject: [PATCH] single shot yolo training, separate file
---
src/darknet.c | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 0a705da..bd56b80 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -6,48 +6,18 @@
#include "utils.h"
#include "cuda.h"
-#define _GNU_SOURCE
-#include <fenv.h>
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#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);
-
-void del_arg(int argc, char **argv, int index)
-{
- int i;
- for(i = index; i < argc-1; ++i) argv[i] = argv[i+1];
- argv[i] = 0;
-}
-
-int find_arg(int argc, char* argv[], char *arg)
-{
- int i;
- for(i = 0; i < argc; ++i) {
- if(!argv[i]) continue;
- if(0==strcmp(argv[i], arg)) {
- del_arg(argc, argv, i);
- return 1;
- }
- }
- return 0;
-}
-
-int find_int_arg(int argc, char **argv, char *arg, int def)
-{
- int i;
- for(i = 0; i < argc-1; ++i){
- if(!argv[i]) continue;
- if(0==strcmp(argv[i], arg)){
- def = atoi(argv[i+1]);
- del_arg(argc, argv, i);
- del_arg(argc, argv, i);
- break;
- }
- }
- return def;
-}
+extern void run_nightmare(int argc, char **argv);
+extern void run_dice(int argc, char **argv);
void change_rate(char *filename, float scale, float add)
{
@@ -70,11 +40,28 @@
load_weights_upto(&net, weightfile, max);
}
net.seen = 0;
- save_weights(net, outfile);
+ save_weights_upto(net, outfile, max);
}
#include "convolutional_layer.h"
-void rgbgr_filters(convolutional_layer l);
+void rescale_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){
+ rescale_filters(l, 2, -.5);
+ break;
+ }
+ }
+ save_weights(net, outfile);
+}
+
void rgbgr_net(char *cfgfile, char *weightfile, char *outfile)
{
gpu_index = -1;
@@ -129,16 +116,26 @@
run_imagenet(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")){
+ run_dice(argc, argv);
} else if (0 == strcmp(argv[1], "writing")){
run_writing(argc, argv);
} else if (0 == strcmp(argv[1], "test")){
test_resize(argv[2]);
} else if (0 == strcmp(argv[1], "captcha")){
run_captcha(argc, argv);
+ } else if (0 == strcmp(argv[1], "nightmare")){
+ run_nightmare(argc, argv);
} else if (0 == strcmp(argv[1], "change")){
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], "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], "visualize")){
--
Gitblit v1.10.0