From e56d1eff13bf8b6863cd213db157b9544cb9e3a7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 21 Jul 2015 18:46:24 +0000
Subject: [PATCH] Switch to fast resize
---
src/darknet.c | 45 ++++++++-------------------------------------
1 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 0679ffe..321b5a9 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -13,41 +13,7 @@
extern void run_detection(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);
void change_rate(char *filename, float scale, float add)
{
@@ -70,13 +36,14 @@
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 rgbgr_net(char *cfgfile, char *weightfile, char *outfile)
{
+ gpu_index = -1;
network net = parse_network_cfg(cfgfile);
if(weightfile){
load_weights(&net, weightfile);
@@ -106,7 +73,7 @@
int main(int argc, char **argv)
{
- //test_resize("data/cat.png");
+ //test_resize("data/bad.jpg");
//test_box();
//test_convolutional_layer();
if(argc < 2){
@@ -134,6 +101,8 @@
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")){
@@ -142,6 +111,8 @@
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]);
}
--
Gitblit v1.10.0