blob: 507d7968a0d9c5f41eeb3cebf9a990692aad3c38 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
From 69f9707678190f6a0948a547dce948251f972676 Mon Sep 17 00:00:00 2001
From: Randy MacLeod <Randy.MacLeod@windriver.com>
Date: Wed, 26 Apr 2017 14:57:30 -0400
Subject: [PATCH 1/2] Revert "cuda: fix fp16 compilation"
This reverts commit 12e00827be40576b686ea4438a6e6ef85208743d.
---
modules/core/include/opencv2/core/cvdef.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
index 699b166..efc24ca 100644
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -303,8 +303,7 @@ enum CpuFeatures {
#define CV_2PI 6.283185307179586476925286766559
#define CV_LOG2 0.69314718055994530941723212145818
-#if defined __ARM_FP16_FORMAT_IEEE \
- && !defined __CUDACC__
+#if defined (__ARM_FP16_FORMAT_IEEE)
# define CV_FP16_TYPE 1
#else
# define CV_FP16_TYPE 0
--
2.9.3
|
