From 68213b835b9f15cb449ad2037a8b51c17a3de07b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Mar 2016 22:10:14 +0000
Subject: [PATCH] Makefile

---
 src/dropout_layer.c |   82 ++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/dropout_layer.c b/src/dropout_layer.c
index ad13034..29b9193 100644
--- a/src/dropout_layer.c
+++ b/src/dropout_layer.c
@@ -1,66 +1,56 @@
 #include "dropout_layer.h"
 #include "utils.h"
+#include "cuda.h"
 #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;
+    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->rand = calloc(inputs*batch, sizeof(float));
-    layer->rand_cl = cl_make_array(layer->rand, inputs*batch);
+    l.rand_gpu = cuda_make_array(l.rand, inputs*batch);
     #endif
-    return layer;
+    return l;
 } 
 
-void forward_dropout_layer(dropout_layer layer, float *input)
+void resize_dropout_layer(dropout_layer *l, int inputs)
+{
+    l->rand = realloc(l->rand, l->inputs*l->batch*sizeof(float));
+    #ifdef GPU
+    cuda_free(l->rand_gpu);
+
+    l->rand_gpu = cuda_make_array(l->rand, inputs*l->batch);
+    #endif
+}
+
+void forward_dropout_layer(dropout_layer l, network_state state)
 {
     int i;
-    for(i = 0; i < layer.batch * layer.inputs; ++i){
-        if(rand_uniform() < layer.probability) input[i] = 0;
-        else input[i] /= (1-layer.probability);
+    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 *input, float *delta)
-{
-    // Don't do shit LULZ
-}
 
-#ifdef GPU
-cl_kernel get_dropout_kernel()
+void backward_dropout_layer(dropout_layer l, network_state state)
 {
-    static int init = 0;
-    static cl_kernel kernel;
-    if(!init){
-        kernel = get_kernel("src/dropout_layer.cl", "forward", 0);
-        init = 1;
+    int i;
+    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;
     }
-    return kernel;
 }
 
-void forward_dropout_layer_gpu(dropout_layer layer, cl_mem input)
-{
-    int j;
-    int size = layer.inputs*layer.batch;
-    for(j = 0; j < size; ++j) layer.rand[j] = rand_uniform();
-    cl_write_array(layer.rand_cl, layer.rand, layer.inputs*layer.batch);
-
-    cl_kernel kernel = get_dropout_kernel();
-    cl_command_queue queue = cl.queue;
-
-    cl_uint i = 0;
-    cl.error = clSetKernelArg(kernel, i++, sizeof(input), (void*) &input);
-    cl.error = clSetKernelArg(kernel, i++, sizeof(layer.rand_cl), (void*) &layer.rand_cl);
-    cl.error = clSetKernelArg(kernel, i++, sizeof(layer.probability), (void*) &layer.probability);
-    check_error(cl);
-
-    const size_t global_size[] = {size};
-
-    cl.error = clEnqueueNDRangeKernel(queue, kernel, 1, 0, global_size, 0, 0, 0, 0);
-    check_error(cl);
-}
-#endif

--
Gitblit v1.10.0