Merge branch 'master' of https://github.com/pjreddie/darknet

Joseph Redmon

2016-06-23 d7fd2acf0582020de87f49d8863d39d1744a858c

 src/maxpool_layer_kernels.cu

@@ -1,3 +1,7 @@
#include "cuda_runtime.h"
#include "curand.h"
#include "cublas_v2.h"

extern "C" {
#include "maxpool_layer.h"
#include "cuda.h"
@@ -77,7 +81,7 @@
            d += (valid && indexes[out_index] == index) ? delta[out_index] : 0;
        }
    }
    prev_delta[index] = d;
    prev_delta[index] += d;
}

extern "C" void forward_maxpool_layer_gpu(maxpool_layer layer, network_state state)