From 7fe80a2bb56ee3eaa95d3e3e3ee7a4129e58e4b7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 09 Jun 2015 20:56:33 +0000
Subject: [PATCH] sync issues
---
src/darknet.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 0cd6153..779d620 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -11,6 +11,7 @@
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);
void del_arg(int argc, char **argv, int index)
@@ -68,19 +69,10 @@
if(weightfile){
load_weights_upto(&net, weightfile, max);
}
- //net.seen = 0;
+ net.seen = 0;
save_weights(net, outfile);
}
-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 visualize(char *cfgfile, char *weightfile)
{
network net = parse_network_cfg(cfgfile);
@@ -93,7 +85,7 @@
int main(int argc, char **argv)
{
- //test_resize(argv[1]);
+ //test_box();
//test_convolutional_layer();
if(argc < 2){
fprintf(stderr, "usage: %s <function>\n", argv[0]);
@@ -114,12 +106,14 @@
run_imagenet(argc, argv);
} else if (0 == strcmp(argv[1], "detection")){
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);
} 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], "convert")){
- convert(argv[2], argv[3], (argc > 4) ? argv[4] : 0);
} 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