diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2019-01-15 16:28:13 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-01-15 09:28:13 -0600 |
| commit | 89a493522c783587fad140560efd30f00a596b25 (patch) | |
| tree | c4aae9767c50730d536f6b36c91f2c23ed1f4d71 /var | |
| parent | 49dedb2443c3518013e69bdbb360e493d84c6faf (diff) | |
| download | spack-89a493522c783587fad140560efd30f00a596b25.tar.gz spack-89a493522c783587fad140560efd30f00a596b25.tar.bz2 spack-89a493522c783587fad140560efd30f00a596b25.tar.xz spack-89a493522c783587fad140560efd30f00a596b25.zip | |
openPMD-api: Dependency Update (#10314)
openPMD-api now only supports Python 3, needs a newer CMake and
ADIOS1 and also learned to read & write JSON :-)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openpmd-api/package.py | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index a14d78d9de..c7e0591685 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -24,27 +24,29 @@ class OpenpmdApi(CMakePackage): description='Enable ADIOS1 support') variant('adios2', default=False, description='Enable ADIOS2 support') - # variant('json', default=True, - # description='Enable JSON support') - variant('python', default=True, + variant('json', default=True, + description='Enable JSON support') + variant('python', default=False, description='Enable Python bindings') - depends_on('cmake@3.10.0:', type='build') + depends_on('cmake@3.11.0:', type='build') depends_on('mpark-variant@1.3.0:') depends_on('catch@2.3.0: ~single_header', type='test') depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+ depends_on('hdf5@1.8.13:', when='+hdf5') depends_on('hdf5@1.8.13: ~mpi', when='~mpi +hdf5') depends_on('hdf5@1.8.13: +mpi', when='+mpi +hdf5') - depends_on('adios@1.10.0:', when='+adios1') - depends_on('adios@1.10.0: ~mpi', when='~mpi +adios1') - depends_on('adios@1.10.0: +mpi', when='+mpi +adios1') - depends_on('adios2@2.1.0:', when='+adios2') - depends_on('adios2@2.1.0: ~mpi', when='~mpi +adios2') - depends_on('adios2@2.1.0: +mpi', when='+mpi +adios2') + depends_on('adios@1.13.1:', when='+adios1') + depends_on('adios@1.13.1: ~mpi', when='~mpi +adios1') + depends_on('adios@1.13.1: +mpi', when='+mpi +adios1') + depends_on('adios2@2.3.0:', when='+adios2') + depends_on('adios2@2.3.0: ~mpi', when='~mpi +adios2') + depends_on('adios2@2.3.0: +mpi', when='+mpi +adios2') + depends_on('nlohmann-json@3.4.0:', when='+json') # ideally we want 2.3.0+ for full C++11 CT function signature support - depends_on('py-pybind11@2.2.3:', when='+python') + depends_on('py-pybind11@2.2.3:', when='+python', type='link') depends_on('py-numpy@1.15.1:', when='+python', type=['test', 'run']) + depends_on('python@3.5:', when='+python', type=['link', 'test', 'run']) extends('python', when='+python') @@ -61,8 +63,8 @@ class OpenpmdApi(CMakePackage): 'ON' if '+adios1' in spec else 'OFF'), '-DopenPMD_USE_ADIOS2:BOOL={0}'.format( 'ON' if '+adios2' in spec else 'OFF'), - # '-DopenPMD_USE_JSON:BOOL={0}'.format( - # 'ON' if '+json' in spec else 'OFF'), + '-DopenPMD_USE_JSON:BOOL={0}'.format( + 'ON' if '+json' in spec else 'OFF'), '-DopenPMD_USE_PYTHON:BOOL={0}'.format( 'ON' if '+python' in spec else 'OFF'), # tests and examples @@ -72,12 +74,15 @@ class OpenpmdApi(CMakePackage): 'ON' if self.run_tests else 'OFF'), ] + # switch internally shipped third-party libraries for spack if spec.satisfies('+python'): args.append('-DopenPMD_USE_INTERNAL_PYBIND11:BOOL=OFF') args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format( self.spec['python'].command.path)) - # switch internally shipped third-party libraries for spack + if spec.satisfies('+json'): + args.append('-DopenPMD_USE_INTERNAL_JSON:BOOL=OFF') + args.append('-DopenPMD_USE_INTERNAL_VARIANT:BOOL=OFF') if self.run_tests: args.append('-DopenPMD_USE_INTERNAL_CATCH:BOOL=OFF') |