Merge pull request #7377 from alalek:fix_cuda_fp16

9 years ago · 16b4ccb846
parent 63280767f1 12e00827be
commit 16b4ccb846
1 changed files with 2 additions and 1 deletions
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@ -307,7 +307,8 @@ enum CpuFeatures {
 #define CV_2PI 6.283185307179586476925286766559
 #define CV_LOG2 0.69314718055994530941723212145818

-#if defined (__ARM_FP16_FORMAT_IEEE)
+#if defined __ARM_FP16_FORMAT_IEEE \
+    && !defined __CUDACC__
 #  define CV_FP16_TYPE 1
 #else
 #  define CV_FP16_TYPE 0