From eb46166f1130d6c6fb5d41d6090a86b35d1542fc Mon Sep 17 00:00:00 2001 From: Edmond Yoo <hj3yoo@uwaterloo.ca> Date: Thu, 06 Sep 2018 17:31:12 +0000 Subject: [PATCH] merge resolution --- src/region_layer.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/region_layer.h b/src/region_layer.h index 00fbeba..16af6d6 100644 --- a/src/region_layer.h +++ b/src/region_layer.h @@ -1,14 +1,18 @@ #ifndef REGION_LAYER_H #define REGION_LAYER_H -#include "params.h" #include "layer.h" +#include "network.h" typedef layer region_layer; -region_layer make_region_layer(int batch, int inputs, int n, int classes, int coords, int rescore); +region_layer make_region_layer(int batch, int h, int w, int n, int classes, int coords, int max_boxes); void forward_region_layer(const region_layer l, network_state state); void backward_region_layer(const region_layer l, network_state state); +void get_region_boxes(layer l, int w, int h, float thresh, float **probs, box *boxes, int only_objectness, int *map); +void resize_region_layer(layer *l, int w, int h); +void get_region_detections(layer l, int w, int h, int netw, int neth, float thresh, int *map, float tree_thresh, int relative, detection *dets); +void correct_region_boxes(detection *dets, int n, int w, int h, int netw, int neth, int relative); #ifdef GPU void forward_region_layer_gpu(const region_layer l, network_state state); -- Gitblit v1.10.0