From 12e00827be40576b686ea4438a6e6ef85208743d Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 30 Sep 2016 23:55:39 +0300 Subject: [PATCH] cuda: fix fp16 compilation --- modules/core/include/opencv2/core/cvdef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index b48dcdd7fa..dc4b0e490f 100644 --- 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