From 1b5afb45838e603fa6780762eb8cc59246dc2d81 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Tue, 08 May 2018 11:09:35 +0000
Subject: [PATCH] Output improvements for detector results: When printing detector results, output was done in random order, obfuscating results for interpreting. Now: 1. Text output includes coordinates of rects in (left,right,top,bottom in pixels) along with label and score 2. Text output is sorted by rect lefts to simplify finding appropriate rects on image 3. If several class probs are > thresh for some detection, the most probable is written first and coordinates for others are not repeated 4. Rects are imprinted in image in order by their best class prob, so most probable rects are always on top and not overlayed by less probable ones 5. Most probable label for rect is always written first Also: 6. Message about low GPU memory include required amount
---
src/cuda.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/cuda.h b/src/cuda.h
index 9d949b0..e167d36 100644
--- a/src/cuda.h
+++ b/src/cuda.h
@@ -1,6 +1,24 @@
#ifndef CUDA_H
#define CUDA_H
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define inline __inline
+#endif
+
+#ifdef YOLODLL_EXPORTS
+#if defined(_MSC_VER)
+#define YOLODLL_API __declspec(dllexport)
+#else
+#define YOLODLL_API __attribute__((visibility("default")))
+#endif
+#else
+#if defined(_MSC_VER)
+#define YOLODLL_API
+#else
+#define YOLODLL_API
+#endif
+#endif
+
extern int gpu_index;
#ifdef GPU
@@ -11,16 +29,36 @@
#include "curand.h"
#include "cublas_v2.h"
-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);
-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);
-dim3 cuda_gridsize(size_t n);
+#ifdef CUDNN
+#include "cudnn.h"
+#endif // CUDNN
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+ 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);
+ YOLODLL_API 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 // __cplusplus
+
+#ifdef CUDNN
+cudnnHandle_t cudnn_handle();
+enum {cudnn_fastest, cudnn_smallest};
#endif
-#endif
+
+#else // GPU
+YOLODLL_API void cuda_set_device(int n);
+#endif // GPU
+#endif // CUDA_H
--
Gitblit v1.10.0