From 1b5afb45838e603fa6780762eb8cc59246dc2d81 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Tue, 08 May 2018 11:09:35 +0000
Subject: [PATCH] Output improvements for detector results: When printing detector results, output was done in random order, obfuscating results for interpreting. Now: 1. Text output includes coordinates of rects in (left,right,top,bottom in pixels) along with label and score 2. Text output is sorted by rect lefts to simplify finding appropriate rects on image 3. If several class probs are > thresh for some detection, the most probable is written first and coordinates for others are not repeated 4. Rects are imprinted in image in order by their best class prob, so most probable rects are always on top and not overlayed by less probable ones 5. Most probable label for rect is always written first Also: 6. Message about low GPU memory include required amount
---
src/box.h | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/box.h b/src/box.h
index e45dd89..6063a48 100644
--- a/src/box.h
+++ b/src/box.h
@@ -1,6 +1,20 @@
#ifndef BOX_H
#define BOX_H
+#ifdef YOLODLL_EXPORTS
+#if defined(_MSC_VER)
+#define YOLODLL_API __declspec(dllexport)
+#else
+#define YOLODLL_API __attribute__((visibility("default")))
+#endif
+#else
+#if defined(_MSC_VER)
+#define YOLODLL_API
+#else
+#define YOLODLL_API
+#endif
+#endif
+
typedef struct{
float x, y, w, h;
} box;
@@ -9,10 +23,35 @@
float dx, dy, dw, dh;
} dbox;
+typedef struct detection {
+ box bbox;
+ int classes;
+ float *prob;
+ float *mask;
+ float objectness;
+ int sort_class;
+} detection;
+
+typedef struct detection_with_class {
+ detection det;
+ // The most probable class id: the best class index in this->prob.
+ // Is filled temporary when processing results, otherwise not initialized
+ int best_class;
+} detection_with_class;
+
+box float_to_box(float *f);
float box_iou(box a, box b);
+float box_rmse(box a, box b);
dbox diou(box a, box b);
-void do_nms(box *boxes, float **probs, int num_boxes, int classes, float thresh);
+void do_nms(box *boxes, float **probs, int total, int classes, float thresh);
+void do_nms_sort_v2(box *boxes, float **probs, int total, int classes, float thresh);
+YOLODLL_API void do_nms_sort(detection *dets, int total, int classes, float thresh);
+YOLODLL_API void do_nms_obj(detection *dets, int total, int classes, float thresh);
box decode_box(box b, box anchor);
box encode_box(box b, box anchor);
+// Creates array of detections with prob > thresh and fills best_class for them
+// Return number of selected detections in *selected_detections_num
+detection_with_class* get_actual_detections(detection *dets, int dets_num, float thresh, int* selected_detections_num);
+
#endif
--
Gitblit v1.10.0