From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp

---
 src/cuda.h |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/cuda.h b/src/cuda.h
index 08c0340..32aaabb 100644
--- a/src/cuda.h
+++ b/src/cuda.h
@@ -1,21 +1,39 @@
 #ifndef CUDA_H
 #define CUDA_H
 
-#define BLOCK 256
-
-#include "cuda_runtime.h"
-#include "cublas_v2.h"
+#if defined(_MSC_VER) && _MSC_VER < 1900
+	#define inline __inline
+#endif
 
 extern int gpu_index;
 
+#ifdef GPU
+
+#define BLOCK 512
+
+#include "cuda_runtime.h"
+#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_set_device(int n);
 void cuda_free(float *x_gpu);
-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