From 38bd6ae6ba24fc8c14fd61d1238ae94a983434b3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 20 Jul 2015 23:16:26 +0000
Subject: [PATCH] Better partial function
---
src/darknet.c | 120 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 70 insertions(+), 50 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 3794f79..321b5a9 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -11,68 +11,70 @@
extern void run_imagenet(int argc, char **argv);
extern void run_detection(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);
-void convert(char *cfgfile, char *outfile, char *weightfile)
-{
- network net = parse_network_cfg(cfgfile);
- if(weightfile){
- load_weights(&net, weightfile);
- }
- save_network(net, outfile);
-}
-
-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;
-}
-
-void scale_rate(char *filename, float scale)
+void change_rate(char *filename, float scale, float add)
{
// Ready for some weird shit??
FILE *fp = fopen(filename, "r+b");
if(!fp) file_error(filename);
float rate = 0;
fread(&rate, sizeof(float), 1, fp);
- printf("Scaling learning rate from %f to %f\n", rate, rate*scale);
- rate = rate*scale;
+ printf("Scaling learning rate from %f to %f\n", rate, rate*scale+add);
+ rate = rate*scale + add;
fseek(fp, 0, SEEK_SET);
fwrite(&rate, sizeof(float), 1, fp);
fclose(fp);
}
+void partial(char *cfgfile, char *weightfile, char *outfile, int max)
+{
+ network net = parse_network_cfg(cfgfile);
+ if(weightfile){
+ load_weights_upto(&net, weightfile, max);
+ }
+ net.seen = 0;
+ save_weights_upto(net, outfile, max);
+}
+
+#include "convolutional_layer.h"
+void rgbgr_filters(convolutional_layer l);
+void rgbgr_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){
+ rgbgr_filters(l);
+ break;
+ }
+ }
+ save_weights(net, outfile);
+}
+
+void visualize(char *cfgfile, char *weightfile)
+{
+ network net = parse_network_cfg(cfgfile);
+ if(weightfile){
+ load_weights(&net, weightfile);
+ }
+ visualize_network(net);
+ #ifdef OPENCV
+ cvWaitKey(0);
+ #endif
+}
+
int main(int argc, char **argv)
{
+ //test_resize("data/bad.jpg");
+ //test_box();
//test_convolutional_layer();
if(argc < 2){
fprintf(stderr, "usage: %s <function>\n", argv[0]);
@@ -90,11 +92,29 @@
#endif
if(0==strcmp(argv[1], "imagenet")){
- run_imagenet(argc, argv);
+ run_imagenet(argc, argv);
} else if (0 == strcmp(argv[1], "detection")){
- run_detection(argc, argv);
+ run_detection(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);
+ 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], "partial")){
+ partial(argv[2], argv[3], argv[4], atoi(argv[5]));
+ } else if (0 == strcmp(argv[1], "visualize")){
+ visualize(argv[2], (argc > 3) ? argv[3] : 0);
+ } else if (0 == strcmp(argv[1], "imtest")){
+ test_resize(argv[2]);
+ } else {
+ fprintf(stderr, "Not an option: %s\n", argv[1]);
}
return 0;
}
--
Gitblit v1.10.0