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

OpenCV: checksum for 4.5.5, make contrib optional (#34313)

Browse Source 
* OpenCV: checksum for 4.5.5, make contrib optional

* [@spackbot] updating style on behalf of iarspider

* Add conflicts for contrib modules

* Fix typo

* Implement changes from review

* Update var/spack/repos/builtin/packages/opencv/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: iarspider <iarspider@users.noreply.github.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
iarspider 2023-01-17 09:22:00 +01:00 committed by GitHub
parent a72a3fb2e0
commit 3161784e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ class Opencv(CMakePackage, CudaPackage):
version("master", branch="master") version("master", branch="master")
version("4.6.0", sha256="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277") version("4.6.0", sha256="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277")
version("4.5.5", sha256="a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad")
version( version(
"4.5.4", "4.5.4",
sha256="c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d", sha256="c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d",
@ -117,6 +118,7 @@ class Opencv(CMakePackage, CudaPackage):
"4.5.1", "4.5.1",
"4.5.2", "4.5.2",
"4.5.4", "4.5.4",
"4.5.5",
"4.6.0", "4.6.0",
] ]
for cv in contrib_vers: for cv in contrib_vers:
@ -124,7 +126,7 @@ class Opencv(CMakePackage, CudaPackage):
name="contrib", name="contrib",
git="https://github.com/opencv/opencv_contrib.git", git="https://github.com/opencv/opencv_contrib.git",
tag="{0}".format(cv), tag="{0}".format(cv),
when="@{0}".format(cv), when="@{0} +contrib".format(cv),
) )
# Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0 # Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0
@ -393,6 +395,7 @@ class Opencv(CMakePackage, CudaPackage):
mod, mod,
default=False, default=False,
description="Include opencv_{0} contrib module".format(mod), description="Include opencv_{0} contrib module".format(mod),
when="+contrib",
) )
# contrib module conflicts and dependencies # contrib module conflicts and dependencies
@ -782,6 +785,7 @@ class Opencv(CMakePackage, CudaPackage):
description="Enable -ffast-math (not recommended for GCC 4.6.x)", description="Enable -ffast-math (not recommended for GCC 4.6.x)",
) )
variant("nonfree", default=False, description="Enable non-free algorithms") variant("nonfree", default=False, description="Enable non-free algorithms")
variant("contrib", default=True, description="Enable OpenCV contrib modules")
# Required (dependencies) # Required (dependencies)
depends_on("cmake@3.5.1:", type="build") depends_on("cmake@3.5.1:", type="build")
@ -921,13 +925,15 @@ def determine_variants(cls, libs, version_str):
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
args = [ args = [
self.define(
"OPENCV_EXTRA_MODULES_PATH",
join_path(self.stage.source_path, "opencv_contrib/modules"),
),
self.define("BUILD_opencv_core", "on"), self.define("BUILD_opencv_core", "on"),
] ]
if self.spec.satisfies("+contrib"):
args += self.define(
"OPENCV_EXTRA_MODULES_PATH",
join_path(self.stage.source_path, "opencv_contrib", "modules"),
)
# OpenCV pre-built apps # OpenCV pre-built apps
apps_list = [] apps_list = []
for app in self.apps: for app in self.apps: