From 0cd2379e2ccbad07bad3f88f8dc564776605802d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 14 Nov 2015 20:34:17 +0000
Subject: [PATCH] some changes
---
src/yolo_kernels.cu | 115 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 27 deletions(-)
diff --git a/src/yolo_kernels.cu b/src/yolo_kernels.cu
index f02b7a2..487e9bd 100644
--- a/src/yolo_kernels.cu
+++ b/src/yolo_kernels.cu
@@ -6,6 +6,7 @@
#include "parser.h"
#include "box.h"
#include "image.h"
+#include <sys/time.h>
}
#ifdef OPENCV
@@ -13,48 +14,108 @@
#include "opencv2/imgproc/imgproc.hpp"
extern "C" image ipl_to_image(IplImage* src);
extern "C" 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);
-extern "C" void draw_yolo(image im, int num, float thresh, box *boxes, float **probs, char *label);
+extern "C" void draw_yolo(image im, int num, float thresh, box *boxes, float **probs);
+
+static float **probs;
+static box *boxes;
+static network net;
+static image in ;
+static image in_s ;
+static image det ;
+static image det_s;
+static image disp ;
+static cv::VideoCapture cap;
+static float fps = 0;
+
+void *fetch_in_thread(void *ptr)
+{
+ cv::Mat frame_m;
+ cap >> frame_m;
+ IplImage frame = frame_m;
+ in = ipl_to_image(&frame);
+ rgbgr_image(in);
+ in_s = resize_image(in, net.w, net.h);
+ return 0;
+}
+
+void *detect_in_thread(void *ptr)
+{
+ float nms = .4;
+ float thresh = .2;
+
+ detection_layer l = net.layers[net.n-1];
+ float *X = det_s.data;
+ float *predictions = network_predict(net, X);
+ free_image(det_s);
+ convert_yolo_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, thresh, probs, boxes, 0);
+ if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
+ printf("\033[2J");
+ printf("\033[1;1H");
+ printf("\nFPS:%.0f\n",fps);
+ printf("Objects:\n\n");
+ draw_yolo(det, l.side*l.side*l.n, thresh, boxes, probs);
+ return 0;
+}
extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh)
{
- network net = parse_network_cfg(cfgfile);
+ printf("YOLO demo\n");
+ net = parse_network_cfg(cfgfile);
if(weightfile){
load_weights(&net, weightfile);
}
- detection_layer l = net.layers[net.n-1];
- cv::VideoCapture cap(0);
-
set_batch_network(&net, 1);
+
srand(2222222);
- float nms = .4;
+
+ cv::VideoCapture cam(0);
+ cap = cam;
+ if(!cap.isOpened()) error("Couldn't connect to webcam.\n");
+
+ detection_layer l = net.layers[net.n-1];
int j;
- box *boxes = (box *)calloc(l.side*l.side*l.n, sizeof(box));
- float **probs = (float **)calloc(l.side*l.side*l.n, sizeof(float *));
+
+ boxes = (box *)calloc(l.side*l.side*l.n, sizeof(box));
+ probs = (float **)calloc(l.side*l.side*l.n, sizeof(float *));
for(j = 0; j < l.side*l.side*l.n; ++j) probs[j] = (float *)calloc(l.classes, sizeof(float *));
+ pthread_t fetch_thread;
+ pthread_t detect_thread;
+
+ fetch_in_thread(0);
+ det = in;
+ det_s = in_s;
+
+ fetch_in_thread(0);
+ detect_in_thread(0);
+ disp = det;
+ det = in;
+ det_s = in_s;
+
while(1){
- cv::Mat frame_m;
- cap >> frame_m;
- IplImage frame = frame_m;
- image im = ipl_to_image(&frame);
- rgbgr_image(im);
-
- image sized = resize_image(im, net.w, net.h);
- float *X = sized.data;
- float *predictions = network_predict(net, X);
- convert_yolo_detections(predictions, l.classes, l.n, l.sqrt, l.side, 1, 1, thresh, probs, boxes, 0);
- if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
- printf("\033[2J");
- printf("\033[1;1H");
- printf("\nObjects:\n\n");
- draw_yolo(im, l.side*l.side*l.n, thresh, boxes, probs, "predictions");
-
- free_image(im);
- free_image(sized);
+ struct timeval tval_before, tval_after, tval_result;
+ gettimeofday(&tval_before, NULL);
+ if(pthread_create(&fetch_thread, 0, fetch_in_thread, 0)) error("Thread creation failed");
+ if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed");
+ show_image(disp, "YOLO");
+ free_image(disp);
cvWaitKey(1);
+ pthread_join(fetch_thread, 0);
+ pthread_join(detect_thread, 0);
+
+ disp = det;
+ det = in;
+ det_s = in_s;
+
+ gettimeofday(&tval_after, NULL);
+ timersub(&tval_after, &tval_before, &tval_result);
+ float curr = 1000000.f/((long int)tval_result.tv_usec);
+ fps = .9*fps + .1*curr;
}
}
#else
-extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh){}
+extern "C" void demo_yolo(char *cfgfile, char *weightfile, float thresh){
+ fprintf(stderr, "YOLO demo needs OpenCV for webcam images.\n");
+}
#endif
--
Gitblit v1.10.0