From 481b57a96a9ef29b112caec1bb3e17ffb043ceae Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 25 Sep 2016 06:12:54 +0000
Subject: [PATCH] So I have this new programming paradigm.......
---
src/detection_layer.h | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/detection_layer.h b/src/detection_layer.h
index e7e9e20..e847a09 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -1,28 +1,19 @@
#ifndef DETECTION_LAYER_H
#define DETECTION_LAYER_H
-typedef struct {
- int batch;
- int inputs;
- int classes;
- int coords;
- int rescore;
- float *output;
- float *delta;
- #ifdef GPU
- float * output_gpu;
- float * delta_gpu;
- #endif
-} detection_layer;
+#include "layer.h"
+#include "network.h"
-detection_layer *make_detection_layer(int batch, int inputs, int classes, int coords, int rescore);
-void forward_detection_layer(const detection_layer layer, float *in, float *truth);
-void backward_detection_layer(const detection_layer layer, float *in, float *delta);
-int get_detection_layer_output_size(detection_layer layer);
+typedef layer detection_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);
#ifdef GPU
-void forward_detection_layer_gpu(const detection_layer layer, float *in, float *truth);
-void backward_detection_layer_gpu(detection_layer layer, float *in, float *delta);
+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