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/rnn_layer.h | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/rnn_layer.h b/src/rnn_layer.h index 9e19cee..bb9478b 100644 --- a/src/rnn_layer.h +++ b/src/rnn_layer.h @@ -1,23 +1,24 @@ -#ifndef GRU_LAYER_H -#define GRU_LAYER_H +#ifndef RNN_LAYER_H +#define RNN_LAYER_H #include "activations.h" #include "layer.h" #include "network.h" +#define USET -layer make_gru_layer(int batch, int inputs, int outputs, int steps, int batch_normalize); +layer make_rnn_layer(int batch, int inputs, int hidden, int outputs, int steps, ACTIVATION activation, int batch_normalize, int log); -void forward_gru_layer(layer l, network_state state); -void backward_gru_layer(layer l, network_state state); -void update_gru_layer(layer l, int batch, float learning_rate, float momentum, float decay); +void forward_rnn_layer(layer l, network_state state); +void backward_rnn_layer(layer l, network_state state); +void update_rnn_layer(layer l, int batch, float learning_rate, float momentum, float decay); #ifdef GPU -void forward_gru_layer_gpu(layer l, network_state state); -void backward_gru_layer_gpu(layer l, network_state state); -void update_gru_layer_gpu(layer l, int batch, float learning_rate, float momentum, float decay); -void push_gru_layer(layer l); -void pull_gru_layer(layer l); +void forward_rnn_layer_gpu(layer l, network_state state); +void backward_rnn_layer_gpu(layer l, network_state state); +void update_rnn_layer_gpu(layer l, int batch, float learning_rate, float momentum, float decay); +void push_rnn_layer(layer l); +void pull_rnn_layer(layer l); #endif #endif -- Gitblit v1.10.0