From 9493fa14c4515cc9773286003542b36c910c44ca Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Fri, 31 Mar 2017 18:56:27 +0000
Subject: [PATCH] Update Readme.md - required cuDNN v5.1
---
src/yolo_v2_class.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index c58ebda..8643a22 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -18,6 +18,7 @@
#include <vector>
#include <iostream>
+#include <algorithm>
#define FRAMES 3
@@ -78,9 +79,9 @@
for (int j = 0; j < FRAMES; ++j) free(detector_gpu.predictions[j]);
for (int j = 0; j < FRAMES; ++j) if(detector_gpu.images[j].data) free(detector_gpu.images[j].data);
+ for (int j = 0; j < l.w*l.h*l.n; ++j) free(detector_gpu.probs[j]);
free(detector_gpu.boxes);
free(detector_gpu.probs);
- for (int j = 0; j < l.w*l.h*l.n; ++j) free(detector_gpu.probs[j]);
int old_gpu_index;
cudaGetDevice(&old_gpu_index);
@@ -153,7 +154,7 @@
cudaSetDevice(net.gpu_index);
//std::cout << "net.gpu_index = " << net.gpu_index << std::endl;
- float nms = .4;
+ //float nms = .4;
image im;
im.c = img.c;
@@ -182,12 +183,13 @@
if (prob > thresh)
{
bbox_t bbox;
- bbox.x = (b.x - b.w / 2.)*im.w;
- bbox.y = (b.y - b.h / 2.)*im.h;
+ bbox.x = std::max((double)0, (b.x - b.w / 2.)*im.w);
+ bbox.y = std::max((double)0, (b.y - b.h / 2.)*im.h);
bbox.w = b.w*im.w;
bbox.h = b.h*im.h;
bbox.obj_id = obj_id;
bbox.prob = prob;
+ bbox.track_id = 0;
bbox_vec.push_back(bbox);
}
--
Gitblit v1.10.0