From e625b32e060753e2029d52bc0150637f2a14cb72 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 14 Aug 2015 15:45:52 +0000
Subject: [PATCH] Should fix for OpenCV 3.0
---
src/darknet.c | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/darknet.c b/src/darknet.c
index 321b5a9..0b69f40 100644
--- a/src/darknet.c
+++ b/src/darknet.c
@@ -6,14 +6,17 @@
#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_coco(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);
+extern void run_dice(int argc, char **argv);
void change_rate(char *filename, float scale, float add)
{
@@ -40,7 +43,24 @@
}
#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;
@@ -95,6 +115,10 @@
run_imagenet(argc, argv);
} else if (0 == strcmp(argv[1], "detection")){
run_detection(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")){
@@ -107,6 +131,8 @@
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