From b5936b499abc94c0efffbcc99b5698574b59d860 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 05 Sep 2015 00:52:44 +0000
Subject: [PATCH] lots of stuff
---
src/detection_layer.h | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/detection_layer.h b/src/detection_layer.h
index e7e9e20..38d96ee 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -1,28 +1,20 @@
#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 "params.h"
+#include "layer.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 classes, int coords, int joint, int rescore, int background, int objectness);
+void forward_detection_layer(const detection_layer l, network_state state);
+void backward_detection_layer(const detection_layer l, network_state state);
+int get_detection_layer_output_size(detection_layer l);
+int get_detection_layer_locations(detection_layer l);
#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