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/dropout_layer.h |   28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/dropout_layer.h b/src/dropout_layer.h
index 051ce47..691cfc5 100644
--- a/src/dropout_layer.h
+++ b/src/dropout_layer.h
@@ -1,28 +1,20 @@
 #ifndef DROPOUT_LAYER_H
 #define DROPOUT_LAYER_H
 
-typedef struct{
-    int batch;
-    int inputs;
-    float probability;
-    float scale;
-    float *rand;
-    float *output;
-    #ifdef GPU
-    float * rand_gpu;
-    float * output_gpu;
-    #endif
-} dropout_layer;
+#include "layer.h"
+#include "network.h"
 
-dropout_layer *make_dropout_layer(int batch, int inputs, float probability);
+typedef layer dropout_layer;
 
-void forward_dropout_layer(dropout_layer layer, float *input);
-void backward_dropout_layer(dropout_layer layer, float *delta);
-void resize_dropout_layer(dropout_layer *layer, int inputs);
+dropout_layer make_dropout_layer(int batch, int inputs, float probability);
+
+void forward_dropout_layer(dropout_layer l, network_state state);
+void backward_dropout_layer(dropout_layer l, network_state state);
+void resize_dropout_layer(dropout_layer *l, int inputs);
 
 #ifdef GPU
-void forward_dropout_layer_gpu(dropout_layer layer, float * input);
-void backward_dropout_layer_gpu(dropout_layer layer, float * delta);
+void forward_dropout_layer_gpu(dropout_layer l, network_state state);
+void backward_dropout_layer_gpu(dropout_layer l, network_state state);
 
 #endif
 #endif

--
Gitblit v1.10.0