From 8a6ba2fff3ee1c14bca0aa0e0a909aba7057cc94 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 9 Jun 2016 14:52:09 -0700
Subject: [PATCH] some changes, fix opencv
---
Makefile | 2 +-
src/coco_demo.c | 4 ++--
src/network.c | 1 +
src/rnn.c | 2 +-
src/yolo_demo.c | 4 ++--
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 366faef..f3e4b79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
GPU=1
-CUDNN=0
+CUDNN=1
OPENCV=1
DEBUG=0
diff --git a/src/coco_demo.c b/src/coco_demo.c
index c516f78..e5e9087 100644
--- a/src/coco_demo.c
+++ b/src/coco_demo.c
@@ -10,8 +10,8 @@
#define FRAMES 1
#ifdef OPENCV
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/imgproc/imgproc_c.h"
void convert_coco_detections(float *predictions, int classes, int num, int square, int side, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
extern char *coco_classes[];
diff --git a/src/network.c b/src/network.c
index 88b7085..b617f7e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -253,6 +253,7 @@ void backward_network(network net, network_state state)
int i;
float *original_input = state.input;
float *original_delta = state.delta;
+ state.workspace = net.workspace;
for(i = net.n-1; i >= 0; --i){
state.index = i;
if(i == 0){
diff --git a/src/rnn.c b/src/rnn.c
index 5e229ba..cda38ef 100644
--- a/src/rnn.c
+++ b/src/rnn.c
@@ -199,7 +199,7 @@ void train_char_rnn(char *cfgfile, char *weightfile, char *filename, int clear,
}
}
- if(i%100==0){
+ if(i%1000==0){
char buff[256];
sprintf(buff, "%s/%s_%d.weights", backup_directory, base, i);
save_weights(net, buff);
diff --git a/src/yolo_demo.c b/src/yolo_demo.c
index 194a236..ec29984 100644
--- a/src/yolo_demo.c
+++ b/src/yolo_demo.c
@@ -8,8 +8,8 @@
#include <sys/time.h>
#ifdef OPENCV
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/imgproc/imgproc_c.h"
image ipl_to_image(IplImage* src);
void convert_yolo_detections(float *predictions, int classes, int num, int square, int side, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
--
GitLab