zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opencv: fix to build version 3.2.0 with Fujitsu compiler (#16840)

Browse Source
This commit is contained in:
Toyohisa Kameyama 2020-05-28 18:23:15 +09:00 committed by GitHub
parent 87cd375559
commit ab65a8ee27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch Normal file
View File

@ -0,0 +1,20 @@
diff -ru opencv-3.2.0.org/modules/core/include/opencv2/core/hal/intrin_neon.hpp opencv-3.2.0/modules/core/include/opencv2/core/hal/intrin_neon.hpp
--- opencv-3.2.0.org/modules/core/include/opencv2/core/hal/intrin_neon.hpp 2016-12-23 21:54:44.000000000 +0900
+++ opencv-3.2.0/modules/core/include/opencv2/core/hal/intrin_neon.hpp 2020-05-27 14:39:11.288700481 +0900
@@ -282,10 +282,16 @@
{ return (int16x4_t)a; }
template <typename T> static inline float16x4_t vreinterpret_f16_s16(T a)
{ return (float16x4_t)a; }
+#ifdef vld1_f16
+#undef vld1_f16
+#endif
template <typename T> static inline float16x4_t vld1_f16(const T* ptr)
{ return vreinterpret_f16_s16(vld1_s16((const short*)ptr)); }
+#ifdef vst1_f16
+#undef vst1_f16
+#endif
template <typename T> static inline void vst1_f16(T* ptr, float16x4_t a)
{ vst1_s16((short*)ptr, vreinterpret_s16_f16(a)); }
struct v_float16x4
{

1
var/spack/repos/builtin/packages/opencv/package.py
View File

@ -126,6 +126,7 @@ class Opencv(CMakePackage, CudaPackage):
patch('opencv3.2_regacyvtk.patch', when='@3.2+vtk')
patch('opencv3.2_ffmpeg.patch', when='@3.2+videoio')
patch('opencv3.2_python3.7.patch', when='@3.2+python')
patch('opencv3.2_fj.patch', when='@3.2 %fj')
depends_on('eigen', when='+eigen')
depends_on('zlib', when='+zlib')