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/cost_layer.h | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/src/cost_layer.h b/src/cost_layer.h
index 2f1cd55..a692831 100644
--- a/src/cost_layer.h
+++ b/src/cost_layer.h
@@ -1,31 +1,20 @@
#ifndef COST_LAYER_H
#define COST_LAYER_H
-#include "opencl.h"
+#include "layer.h"
+#include "network.h"
-typedef enum{
- SSE, DETECTION
-} COST_TYPE;
-
-typedef struct {
- int inputs;
- int batch;
- float *delta;
- float *output;
- COST_TYPE type;
- #ifdef GPU
- cl_mem delta_cl;
- #endif
-} cost_layer;
+typedef layer cost_layer;
COST_TYPE get_cost_type(char *s);
char *get_cost_string(COST_TYPE a);
-cost_layer *make_cost_layer(int batch, int inputs, COST_TYPE type);
-void forward_cost_layer(const cost_layer layer, float *input, float *truth);
-void backward_cost_layer(const cost_layer layer, float *input, float *delta);
+cost_layer make_cost_layer(int batch, int inputs, COST_TYPE type, float scale);
+void forward_cost_layer(const cost_layer l, network_state state);
+void backward_cost_layer(const cost_layer l, network_state state);
+void resize_cost_layer(cost_layer *l, int inputs);
#ifdef GPU
-void forward_cost_layer_gpu(cost_layer layer, cl_mem input, cl_mem truth);
-void backward_cost_layer_gpu(const cost_layer layer, cl_mem input, cl_mem delta);
+void forward_cost_layer_gpu(cost_layer l, network_state state);
+void backward_cost_layer_gpu(const cost_layer l, network_state state);
#endif
#endif
--
Gitblit v1.10.0