From 31bca57e89333f34aeb24ba26edb88bd5467a738 Mon Sep 17 00:00:00 2001 From: Peter Lindstrom Date: Thu, 10 Jun 2021 10:25:46 -0700 Subject: [PATCH] zfp package: ensure openmp variant is processed (#24221) * zfp: several package improvements - add variants for build targets, language bindings, backends - ensure selected variants are compatible with zfp version - point to GitHub (not LLNL) tar balls - add dependencies - update link to homepage - add maintainers * zfp: address suggestions by Spack team - use conflicts() instead of raising exceptions - use define() and define_from_variant() where applicable * Apply suggestions from code review Co-authored-by: Massimiliano Culpo * Fix ZFP OpenMP build. Co-authored-by: Massimiliano Culpo --- var/spack/repos/builtin/packages/zfp/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py index e25d9b74fe..e3416ab76c 100644 --- a/var/spack/repos/builtin/packages/zfp/package.py +++ b/var/spack/repos/builtin/packages/zfp/package.py @@ -78,7 +78,7 @@ class Zfp(CMakePackage, CudaPackage): # Dependencies depends_on('cmake@3.4.0:', type='build') depends_on('cuda@7:', type=('build', 'test', 'run'), when='+cuda') - depends_on('python', type=('build', 'test', 'run'), when='+python') + depends_on('python', type=('build', 'test', 'run'), when='+python') depends_on('py-numpy', type=('build', 'test', 'run'), when='+python') depends_on('py-cython', type='build', when='+python') @@ -93,6 +93,7 @@ def cmake_args(self): self.define_from_variant('BUILD_CFP', 'c'), self.define_from_variant('BUILD_ZFPY', 'python'), self.define_from_variant('BUILD_ZFORP', 'fortran'), + self.define_from_variant('ZFP_WITH_OPENMP', 'openmp'), self.define_from_variant('ZFP_WITH_CUDA', 'cuda'), self.define('ZFP_BIT_STREAM_WORD_SIZE', spec.variants['bsws'].value),