hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zfp package: ensure openmp variant is processed (#24221)

Browse source 
* 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 <massimiliano.culpo@gmail.com>

* Fix ZFP OpenMP build.

Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
This commit is contained in:
Peter Lindstrom 2021-06-10 10:25:46 -07:00 committed by GitHub
parent 9da1cb615f
commit 31bca57e89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/zfp/package.py
View file

@ -78,7 +78,7 @@ class Zfp(CMakePackage, CudaPackage):
# Dependencies # Dependencies
depends_on('cmake@3.4.0:', type='build') depends_on('cmake@3.4.0:', type='build')
depends_on('cuda@7:', type=('build', 'test', 'run'), when='+cuda') 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-numpy', type=('build', 'test', 'run'), when='+python')
depends_on('py-cython', type='build', 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_CFP', 'c'),
self.define_from_variant('BUILD_ZFPY', 'python'), self.define_from_variant('BUILD_ZFPY', 'python'),
self.define_from_variant('BUILD_ZFORP', 'fortran'), 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_from_variant('ZFP_WITH_CUDA', 'cuda'),
self.define('ZFP_BIT_STREAM_WORD_SIZE', self.define('ZFP_BIT_STREAM_WORD_SIZE',
spec.variants['bsws'].value), spec.variants['bsws'].value),