Skip to content

O
opencv
Commit 0db4b7ce authored by Tomoaki Teshima's avatar Tomoaki Teshima
Browse files
Options

fix build error on CUDA + Aarch64 

  * __fp16 doesn't exist on nvcc, but it slips through ifdef guard
parent c8d77fd9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/core/include/opencv2/core/cvdef.h
View file @ 0db4b7ce
...@@ -310,7 +310,7 @@ enum CpuFeatures { ...@@ -310,7 +310,7 @@ enum CpuFeatures {
typedef union Cv16suf typedef union Cv16suf
{ {
short i; short i;
#if ( defined (__arm__) || defined (__aarch64__) ) && ( defined (__GNUC__) && ( ( ( 4 <= __GNUC__ ) && ( 7 <= __GNUC__ ) ) || ( 5 <= __GNUC__ ) ) ) #if ( defined (__arm__) || defined (__aarch64__) ) && !defined (__CUDACC__) && ( defined (__GNUC__) && ( ( ( 4 <= __GNUC__ ) && ( 7 <= __GNUC__ ) ) || ( 5 <= __GNUC__ ) ) )
__fp16 h; __fp16 h;
#endif #endif
struct _fp16Format struct _fp16Format
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment