From 6d56c38e8bcb9041335b03f27c192c24dfaedb1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 28 Mar 2018 23:39:28 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet
---
src/cuda.h | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/cuda.h b/src/cuda.h
index cdd6db9..c328fce 100644
--- a/src/cuda.h
+++ b/src/cuda.h
@@ -1,6 +1,10 @@
#ifndef CUDA_H
#define CUDA_H
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define inline __inline
+#endif
+
extern int gpu_index;
#ifdef GPU
@@ -15,19 +19,29 @@
#include "cudnn.h"
#endif
-void check_error(cudaError_t status);
-cublasHandle_t blas_handle();
-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, size_t n);
-float cuda_compare(float *x_gpu, float *x, size_t n, char *s);
-dim3 cuda_gridsize(size_t n);
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void check_error(cudaError_t status);
+ cublasHandle_t blas_handle();
+ 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);
+ int cuda_get_device();
+ void cuda_free(float *x_gpu);
+ 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);
+ cudaStream_t get_cuda_stream();
+#ifdef __cplusplus
+}
+#endif
#ifdef CUDNN
cudnnHandle_t cudnn_handle();
+enum {cudnn_fastest, cudnn_smallest};
#endif
#endif
--
Gitblit v1.10.0