diff options
author | Randy MacLeod <randy.macleod@windriver.com> | 2017-05-02 14:46:55 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-05-09 16:00:31 +0200 |
commit | 5e82995148a2844c6f483ae5ddd1438d87ea9fb7 (patch) | |
tree | 28ca57ed714c996b5d1fab9914cd84fd35d7ebcb /meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch | |
parent | 7e4f7073d7f45791e97289f6a482adc51714d973 (diff) | |
download | meta-openembedded-pyro-nfvaccess.tar.gz |
opencv: disable broken Intel FP16 detectionpyro-nfvaccess
With opencv-3.2, the configuration detects if the target supports
half-precision floating-point format. This fails to compile for some
Intel targets such as skylake with an error such as:
error: '_mm_cvtph_ps' was not declared in this scope
The configuration used to work in opencv-3.1 so revert two commits to
drop the FP16 detection even though it may make opencv slower.
The only change in the configure log is:
- FP16: Compiler support is available
+ FP16: Compiler support is not available
The patch should be dropped when a newer version of opencv that includes commit:
https://github.com/opencv/opencv/commit/e5d9b608c47d54e43496041595025fa282fa9de5
is available. Backporting that fix was complicated.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch b/meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch new file mode 100644 index 000000000..507d7968a --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 69f9707678190f6a0948a547dce948251f972676 Mon Sep 17 00:00:00 2001 | ||
2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
3 | Date: Wed, 26 Apr 2017 14:57:30 -0400 | ||
4 | Subject: [PATCH 1/2] Revert "cuda: fix fp16 compilation" | ||
5 | |||
6 | This reverts commit 12e00827be40576b686ea4438a6e6ef85208743d. | ||
7 | --- | ||
8 | modules/core/include/opencv2/core/cvdef.h | 3 +-- | ||
9 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h | ||
12 | index 699b166..efc24ca 100644 | ||
13 | --- a/modules/core/include/opencv2/core/cvdef.h | ||
14 | +++ b/modules/core/include/opencv2/core/cvdef.h | ||
15 | @@ -303,8 +303,7 @@ enum CpuFeatures { | ||
16 | #define CV_2PI 6.283185307179586476925286766559 | ||
17 | #define CV_LOG2 0.69314718055994530941723212145818 | ||
18 | |||
19 | -#if defined __ARM_FP16_FORMAT_IEEE \ | ||
20 | - && !defined __CUDACC__ | ||
21 | +#if defined (__ARM_FP16_FORMAT_IEEE) | ||
22 | # define CV_FP16_TYPE 1 | ||
23 | #else | ||
24 | # define CV_FP16_TYPE 0 | ||
25 | -- | ||
26 | 2.9.3 | ||
27 | |||