From 1c05ebf522f0bb5776ba51a46d94aa101220fea1 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 07 Jun 2018 00:39:30 +0000
Subject: [PATCH] Minor fix
---
src/detection_layer.h | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/detection_layer.h b/src/detection_layer.h
index a56cb25..9d2da92 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -1,33 +1,20 @@
#ifndef DETECTION_LAYER_H
#define DETECTION_LAYER_H
-#include "params.h"
+#include "layer.h"
+#include "network.h"
-typedef struct {
- int batch;
- int inputs;
- int classes;
- int coords;
- int background;
- int rescore;
- int nuisance;
- float *output;
- float *delta;
- #ifdef GPU
- float * output_gpu;
- float * delta_gpu;
- #endif
-} detection_layer;
+typedef layer detection_layer;
-detection_layer *make_detection_layer(int batch, int inputs, int classes, int coords, int rescore, int background, int nuisance);
-void forward_detection_layer(const detection_layer layer, network_state state);
-void backward_detection_layer(const detection_layer layer, network_state state);
-int get_detection_layer_output_size(detection_layer layer);
-int get_detection_layer_locations(detection_layer layer);
+detection_layer make_detection_layer(int batch, int inputs, int n, int size, int classes, int coords, int rescore);
+void forward_detection_layer(const detection_layer l, network_state state);
+void backward_detection_layer(const detection_layer l, network_state state);
+void get_detection_boxes(layer l, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
+void get_detection_detections(layer l, int w, int h, float thresh, detection *dets);
#ifdef GPU
-void forward_detection_layer_gpu(const detection_layer layer, network_state state);
-void backward_detection_layer_gpu(detection_layer layer, network_state state);
+void forward_detection_layer_gpu(const detection_layer l, network_state state);
+void backward_detection_layer_gpu(detection_layer l, network_state state);
#endif
#endif
--
Gitblit v1.10.0