From c575cc46db50f5c71f1bc025d3dcbd6152442eee Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Mon, 24 Jun 2019 16:56:51 -0500 Subject: The py-pytables package depends on hdf5-blosc (#11823) * The py-pytables package depends on hdf5-blosc * Further modifications to py-pytables package The 3.2.2 version of py-pytables should still build with internal blosc. The issue with locking in a multithreaded environment has been fixed/worked around in version 3.3. Also, add bzip2 and lzo variants. --- var/spack/repos/builtin/packages/py-pytables/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py index eeba923aaa..30f526e625 100644 --- a/var/spack/repos/builtin/packages/py-pytables/package.py +++ b/var/spack/repos/builtin/packages/py-pytables/package.py @@ -17,6 +17,16 @@ class PyPytables(PythonPackage): version('3.2.2', '7cbb0972e4d6580f629996a5bed92441', url='https://github.com/PyTables/PyTables/archive/v.3.2.2.tar.gz') + variant('bzip2', default=False, description='Support for bzip2 compression') + variant('lzo', default=False, description='Support for lzo compression') + + depends_on('bzip2', when='+bzip2') + depends_on('lzo', when='+lzo') + + # Versions prior to 3.3 must build with the internal blosc due to a lock + # problem in a multithreaded environment. + depends_on('hdf5-blosc', when="@3.3.0:") + depends_on('hdf5@1.8.0:1.8.999', when="@:3.3.99") depends_on('hdf5@1.8.0:1.10.999', when="@3.4.0:") depends_on('py-numpy@1.8.0:', type=('build', 'run')) @@ -27,3 +37,9 @@ class PyPytables(PythonPackage): def setup_environment(self, spack_env, run_env): spack_env.set('HDF5_DIR', self.spec['hdf5'].prefix) + if '+bzip2' in self.spec: + spack_env.set('BZIP2_DIR', self.spec['bzip2'].prefix) + if '+lzo' in self.spec: + spack_env.set('LZO_DIR', self.spec['lzo'].prefix) + if '+hdf5-blosc' in self.spec: + spack_env.set('BLOSC_DIR', self.spec['c-blosc'].prefix) -- cgit v1.2.3-60-g2f50