From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi

---
 src/dropout_layer.c |   58 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/dropout_layer.c b/src/dropout_layer.c
index 32a3408..29b9193 100644
--- a/src/dropout_layer.c
+++ b/src/dropout_layer.c
@@ -4,55 +4,53 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-dropout_layer *make_dropout_layer(int batch, int inputs, float probability)
+dropout_layer make_dropout_layer(int batch, int inputs, float probability)
 {
     fprintf(stderr, "Dropout Layer: %d inputs, %f probability\n", inputs, probability);
-    dropout_layer *layer = calloc(1, sizeof(dropout_layer));
-    layer->probability = probability;
-    layer->inputs = inputs;
-    layer->batch = batch;
-    layer->output = calloc(inputs*batch, sizeof(float));
-    layer->rand = calloc(inputs*batch, sizeof(float));
-    layer->scale = 1./(1.-probability);
+    dropout_layer l = {0};
+    l.type = DROPOUT;
+    l.probability = probability;
+    l.inputs = inputs;
+    l.outputs = inputs;
+    l.batch = batch;
+    l.rand = calloc(inputs*batch, sizeof(float));
+    l.scale = 1./(1.-probability);
     #ifdef GPU
-    layer->output_gpu = cuda_make_array(layer->output, inputs*batch);
-    layer->rand_gpu = cuda_make_array(layer->rand, inputs*batch);
+    l.rand_gpu = cuda_make_array(l.rand, inputs*batch);
     #endif
-    return layer;
+    return l;
 } 
 
-void resize_dropout_layer(dropout_layer *layer, int inputs)
+void resize_dropout_layer(dropout_layer *l, int inputs)
 {
-    layer->output = realloc(layer->output, layer->inputs*layer->batch*sizeof(float));
-    layer->rand = realloc(layer->rand, layer->inputs*layer->batch*sizeof(float));
+    l->rand = realloc(l->rand, l->inputs*l->batch*sizeof(float));
     #ifdef GPU
-    cuda_free(layer->output_gpu);
-    cuda_free(layer->rand_gpu);
+    cuda_free(l->rand_gpu);
 
-    layer->output_gpu = cuda_make_array(layer->output, inputs*layer->batch);
-    layer->rand_gpu = cuda_make_array(layer->rand, inputs*layer->batch);
+    l->rand_gpu = cuda_make_array(l->rand, inputs*l->batch);
     #endif
 }
 
-void forward_dropout_layer(dropout_layer layer, float *input)
+void forward_dropout_layer(dropout_layer l, network_state state)
 {
     int i;
-    for(i = 0; i < layer.batch * layer.inputs; ++i){
-        float r = rand_uniform();
-        layer.rand[i] = r;
-        if(r < layer.probability) layer.output[i] = 0;
-        else layer.output[i] = input[i]*layer.scale;
+    if (!state.train) return;
+    for(i = 0; i < l.batch * l.inputs; ++i){
+        float r = rand_uniform(0, 1);
+        l.rand[i] = r;
+        if(r < l.probability) state.input[i] = 0;
+        else state.input[i] *= l.scale;
     }
 }
 
-void backward_dropout_layer(dropout_layer layer, float *delta)
+void backward_dropout_layer(dropout_layer l, network_state state)
 {
     int i;
-    if(!delta) return;
-    for(i = 0; i < layer.batch * layer.inputs; ++i){
-        float r = layer.rand[i];
-        if(r < layer.probability) delta[i] = 0;
-        else delta[i] *= layer.scale;
+    if(!state.delta) return;
+    for(i = 0; i < l.batch * l.inputs; ++i){
+        float r = l.rand[i];
+        if(r < l.probability) state.delta[i] = 0;
+        else state.delta[i] *= l.scale;
     }
 }
 

--
Gitblit v1.10.0