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/cuda.h |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/cuda.h b/src/cuda.h
index 9d949b0..cdd6db9 100644
--- a/src/cuda.h
+++ b/src/cuda.h
@@ -11,16 +11,24 @@
 #include "curand.h"
 #include "cublas_v2.h"
 
+#ifdef CUDNN
+#include "cudnn.h"
+#endif
+
 void check_error(cudaError_t status);
 cublasHandle_t blas_handle();
-float *cuda_make_array(float *x, int n);
-int *cuda_make_int_array(int n);
-void cuda_push_array(float *x_gpu, float *x, int n);
-void cuda_pull_array(float *x_gpu, float *x, int n);
+float *cuda_make_array(float *x, size_t n);
+int *cuda_make_int_array(size_t n);
+void cuda_push_array(float *x_gpu, float *x, size_t n);
+void cuda_pull_array(float *x_gpu, float *x, size_t n);
 void cuda_free(float *x_gpu);
-void cuda_random(float *x_gpu, int n);
-float cuda_compare(float *x_gpu, float *x, int n, char *s);
+void cuda_random(float *x_gpu, size_t n);
+float cuda_compare(float *x_gpu, float *x, size_t n, char *s);
 dim3 cuda_gridsize(size_t n);
 
+#ifdef CUDNN
+cudnnHandle_t cudnn_handle();
+#endif
+
 #endif
 #endif

--
Gitblit v1.10.0