From 028696bf15efeca3acb3db8c42a96f7b9e0f55ff Mon Sep 17 00:00:00 2001
From: iovodov <b@ovdv.ru>
Date: Thu, 03 May 2018 13:33:46 +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/normalization_layer.h |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/normalization_layer.h b/src/normalization_layer.h
index 914fe7d..ab32776 100644
--- a/src/normalization_layer.h
+++ b/src/normalization_layer.h
@@ -2,25 +2,18 @@
 #define NORMALIZATION_LAYER_H
 
 #include "image.h"
+#include "layer.h"
+#include "network.h"
 
-typedef struct {
-    int batch;
-    int h,w,c;
-    int size;
-    float alpha;
-    float beta;
-    float kappa;
-    float *delta;
-    float *output;
-    float *sums;
-} normalization_layer;
+layer make_normalization_layer(int batch, int w, int h, int c, int size, float alpha, float beta, float kappa);
+void resize_normalization_layer(layer *layer, int h, int w);
+void forward_normalization_layer(const layer layer, network_state state);
+void backward_normalization_layer(const layer layer, network_state state);
+void visualize_normalization_layer(layer layer, char *window);
 
-image get_normalization_image(normalization_layer layer);
-normalization_layer *make_normalization_layer(int batch, int h, int w, int c, int size, float alpha, float beta, float kappa);
-void resize_normalization_layer(normalization_layer *layer, int h, int w);
-void forward_normalization_layer(const normalization_layer layer, float *in);
-void backward_normalization_layer(const normalization_layer layer, float *in, float *delta);
-void visualize_normalization_layer(normalization_layer layer, char *window);
-
+#ifdef GPU
+void forward_normalization_layer_gpu(const layer layer, network_state state);
+void backward_normalization_layer_gpu(const layer layer, network_state state);
 #endif
 
+#endif

--
Gitblit v1.10.0