From d7fd2acf0582020de87f49d8863d39d1744a858c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:17 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/pjreddie/darknet
---
src/detection_layer.h | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/src/detection_layer.h b/src/detection_layer.h
index a56cb25..75d9b7f 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -1,33 +1,18 @@
-#ifndef DETECTION_LAYER_H
-#define DETECTION_LAYER_H
+#ifndef REGION_LAYER_H
+#define REGION_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);
#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