From aeb628ea74073b85d89f5b7140ddfd0512c48340 Mon Sep 17 00:00:00 2001
From: Andrew W Elble <aweits@rit.edu>
Date: Fri, 10 Apr 2020 10:49:32 -0400
Subject: opencv: assorted fixes (#15971)
* opencv: assorted fixes
1. depends on blas when +lapack
2. set cuda nvcc flags for cuda_arch
3. let cuda/contrib builds work
4. depends on hdf5 when cuda/contrib
5. depends on ant when +java
6. allow protobuf version to be different
7. let opencv recompile it's protoc files.
* ant is a build-time dependency
* register +cuda~contrib as impossible.
---
var/spack/repos/builtin/packages/opencv/package.py | 31 +++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index 7adacd1eef..0e5bca7907 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -100,6 +100,22 @@ class Opencv(CMakePackage, CudaPackage):
variant('vtk', default=True, description='Activates support for VTK')
variant('zlib', default=True, description='Build zlib from source')
+ variant('contrib', default=False, description='Adds in code from opencv_contrib.')
+ contrib_vers = ['4.1.0', '4.1.1', '4.2.0']
+ for cv in contrib_vers:
+ resource(name="contrib",
+ git='https://github.com/opencv/opencv_contrib.git',
+ tag="{0}".format(cv),
+ when='@{0}+contrib'.format(cv))
+ resource(name="contrib",
+ git='https://github.com/opencv/opencv_contrib.git',
+ tag="{0}".format(cv),
+ when='@{0}+cuda'.format(cv))
+
+ depends_on('hdf5', when='+contrib')
+ depends_on('hdf5', when='+cuda')
+ depends_on('blas', when='+lapack')
+
# Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0
# and 3.4.1) header file that have the same name.Problem is fixed in
# the current development branch of OpenCV. See #8461 for more information.
@@ -117,8 +133,9 @@ class Opencv(CMakePackage, CudaPackage):
depends_on('vtk', when='+vtk')
depends_on('qt', when='+qt')
depends_on('java', when='+java')
+ depends_on('ant', when='+java', type='build')
depends_on('py-numpy', when='+python', type=('build', 'run'))
- depends_on('protobuf@3.5.0', when='@3.4.1: +dnn')
+ depends_on('protobuf@3.5.0:', when='@3.4.1: +dnn')
depends_on('protobuf@3.1.0', when='@3.3.0:3.4.0 +dnn')
depends_on('ffmpeg', when='+videoio')
@@ -128,6 +145,7 @@ class Opencv(CMakePackage, CudaPackage):
# exists, otherwise build will fail
# See https://github.com/opencv/opencv_contrib/issues/1786
conflicts('cuda@10:', when='+cudacodec')
+ conflicts('cuda', when='~contrib', msg='cuda support requires +contrib')
extends('python', when='+python')
@@ -222,8 +240,19 @@ class Opencv(CMakePackage, CudaPackage):
'-DWITH_PROTOBUF:BOOL={0}'.format((
'ON' if '@3.3.0: +dnn' in spec else 'OFF')),
'-DBUILD_PROTOBUF:BOOL=OFF',
+ '-DPROTOBUF_UPDATE_FILES={0}'.format('ON')
])
+ if '+contrib' in spec or '+cuda' in spec:
+ args.append('-DOPENCV_EXTRA_MODULES_PATH={0}'.format(
+ join_path(self.stage.source_path, 'opencv_contrib/modules')))
+
+ if '+cuda' in spec:
+ if spec.variants['cuda_arch'].value[0] != 'none':
+ cuda_arch = [x for x in spec.variants['cuda_arch'].value if x]
+ args.append('-DCUDA_ARCH_BIN={0}'.format(
+ ' '.join(cuda_arch)))
+
# Media I/O
if '+zlib' in spec:
zlib = spec['zlib']
--
cgit v1.2.3-70-g09d2