From b8e6e80c6d411d05a9e09f1e3676eb9a7f3ea0e8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 03 Aug 2018 11:35:03 +0000
Subject: [PATCH] Added spatial Yolo v3 yolov3-spp.cfg
---
src/box.c | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/src/box.c b/src/box.c
index a2c676f..718215f 100644
--- a/src/box.c
+++ b/src/box.c
@@ -278,88 +278,88 @@
int nms_comparator_v3(const void *pa, const void *pb)
{
- detection a = *(detection *)pa;
- detection b = *(detection *)pb;
- float diff = 0;
- if (b.sort_class >= 0) {
- diff = a.prob[b.sort_class] - b.prob[b.sort_class];
- }
- else {
- diff = a.objectness - b.objectness;
- }
- if (diff < 0) return 1;
- else if (diff > 0) return -1;
- return 0;
+ detection a = *(detection *)pa;
+ detection b = *(detection *)pb;
+ float diff = 0;
+ if (b.sort_class >= 0) {
+ diff = a.prob[b.sort_class] - b.prob[b.sort_class];
+ }
+ else {
+ diff = a.objectness - b.objectness;
+ }
+ if (diff < 0) return 1;
+ else if (diff > 0) return -1;
+ return 0;
}
void do_nms_obj(detection *dets, int total, int classes, float thresh)
{
- int i, j, k;
- k = total - 1;
- for (i = 0; i <= k; ++i) {
- if (dets[i].objectness == 0) {
- detection swap = dets[i];
- dets[i] = dets[k];
- dets[k] = swap;
- --k;
- --i;
- }
- }
- total = k + 1;
+ int i, j, k;
+ k = total - 1;
+ for (i = 0; i <= k; ++i) {
+ if (dets[i].objectness == 0) {
+ detection swap = dets[i];
+ dets[i] = dets[k];
+ dets[k] = swap;
+ --k;
+ --i;
+ }
+ }
+ total = k + 1;
- for (i = 0; i < total; ++i) {
- dets[i].sort_class = -1;
- }
+ for (i = 0; i < total; ++i) {
+ dets[i].sort_class = -1;
+ }
- qsort(dets, total, sizeof(detection), nms_comparator_v3);
- for (i = 0; i < total; ++i) {
- if (dets[i].objectness == 0) continue;
- box a = dets[i].bbox;
- for (j = i + 1; j < total; ++j) {
- if (dets[j].objectness == 0) continue;
- box b = dets[j].bbox;
- if (box_iou(a, b) > thresh) {
- dets[j].objectness = 0;
- for (k = 0; k < classes; ++k) {
- dets[j].prob[k] = 0;
- }
- }
- }
- }
+ qsort(dets, total, sizeof(detection), nms_comparator_v3);
+ for (i = 0; i < total; ++i) {
+ if (dets[i].objectness == 0) continue;
+ box a = dets[i].bbox;
+ for (j = i + 1; j < total; ++j) {
+ if (dets[j].objectness == 0) continue;
+ box b = dets[j].bbox;
+ if (box_iou(a, b) > thresh) {
+ dets[j].objectness = 0;
+ for (k = 0; k < classes; ++k) {
+ dets[j].prob[k] = 0;
+ }
+ }
+ }
+ }
}
void do_nms_sort(detection *dets, int total, int classes, float thresh)
{
- int i, j, k;
- k = total - 1;
- for (i = 0; i <= k; ++i) {
- if (dets[i].objectness == 0) {
- detection swap = dets[i];
- dets[i] = dets[k];
- dets[k] = swap;
- --k;
- --i;
- }
- }
- total = k + 1;
+ int i, j, k;
+ k = total - 1;
+ for (i = 0; i <= k; ++i) {
+ if (dets[i].objectness == 0) {
+ detection swap = dets[i];
+ dets[i] = dets[k];
+ dets[k] = swap;
+ --k;
+ --i;
+ }
+ }
+ total = k + 1;
- for (k = 0; k < classes; ++k) {
- for (i = 0; i < total; ++i) {
- dets[i].sort_class = k;
- }
- qsort(dets, total, sizeof(detection), nms_comparator_v3);
- for (i = 0; i < total; ++i) {
- //printf(" k = %d, \t i = %d \n", k, i);
- if (dets[i].prob[k] == 0) continue;
- box a = dets[i].bbox;
- for (j = i + 1; j < total; ++j) {
- box b = dets[j].bbox;
- if (box_iou(a, b) > thresh) {
- dets[j].prob[k] = 0;
- }
- }
- }
- }
+ for (k = 0; k < classes; ++k) {
+ for (i = 0; i < total; ++i) {
+ dets[i].sort_class = k;
+ }
+ qsort(dets, total, sizeof(detection), nms_comparator_v3);
+ for (i = 0; i < total; ++i) {
+ //printf(" k = %d, \t i = %d \n", k, i);
+ if (dets[i].prob[k] == 0) continue;
+ box a = dets[i].bbox;
+ for (j = i + 1; j < total; ++j) {
+ box b = dets[j].bbox;
+ if (box_iou(a, b) > thresh) {
+ dets[j].prob[k] = 0;
+ }
+ }
+ }
+ }
}
void do_nms(box *boxes, float **probs, int total, int classes, float thresh)
--
Gitblit v1.10.0