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

[hpx] Two new variants for upcoming v1.5, stable and master (#18022)

Browse source 
* New package: cxxopts

* Use +unicode instead of unicode=True

- Make the unicode option more explicit

* Add two new variants to spack for upcoming 1.5, stable and develop

* Add as maintainer

* Add depends_on on clauses

* Remove unrelated change
This commit is contained in:
Teodor Nikolov 2020-08-22 23:00:11 +02:00 committed by GitHub
parent c743d219aa
commit dc5176fbae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
var/spack/repos/builtin/packages/hpx/package.py
View file

@ -13,7 +13,7 @@ class Hpx(CMakePackage, CudaPackage):
homepage = "http://stellar.cct.lsu.edu/tag/hpx/" homepage = "http://stellar.cct.lsu.edu/tag/hpx/"
url = "https://github.com/STEllAR-GROUP/hpx/archive/1.2.1.tar.gz" url = "https://github.com/STEllAR-GROUP/hpx/archive/1.2.1.tar.gz"
maintainers = ['msimberg', 'albestro'] maintainers = ['msimberg', 'albestro', 'teonnik']
version('master', git='https://github.com/STEllAR-GROUP/hpx.git', branch='master') version('master', git='https://github.com/STEllAR-GROUP/hpx.git', branch='master')
version('stable', git='https://github.com/STEllAR-GROUP/hpx.git', tag='stable') version('stable', git='https://github.com/STEllAR-GROUP/hpx.git', tag='stable')
@ -59,6 +59,8 @@ class Hpx(CMakePackage, CudaPackage):
variant('tools', default=False, description='Build HPX tools') variant('tools', default=False, description='Build HPX tools')
variant('examples', default=False, description='Build examples') variant('examples', default=False, description='Build examples')
variant('async_mpi', default=False, description='Enable MPI Futures.')
variant('async_cuda', default=False, description='Enable CUDA Futures.')
depends_on('hwloc') depends_on('hwloc')
depends_on('python', type=('build', 'test', 'run')) depends_on('python', type=('build', 'test', 'run'))
@ -91,7 +93,6 @@ class Hpx(CMakePackage, CudaPackage):
depends_on('boost cxxstd=11', when='cxxstd=11') depends_on('boost cxxstd=11', when='cxxstd=11')
depends_on('boost cxxstd=14', when='cxxstd=14') depends_on('boost cxxstd=14', when='cxxstd=14')
depends_on('boost cxxstd=17', when='cxxstd=17') depends_on('boost cxxstd=17', when='cxxstd=17')
depends_on('boost cxxstd=17', when='@stable')
# Malloc # Malloc
depends_on('gperftools', when='malloc=tcmalloc') depends_on('gperftools', when='malloc=tcmalloc')
@ -100,6 +101,10 @@ class Hpx(CMakePackage, CudaPackage):
# MPI # MPI
depends_on('mpi', when='networking=mpi') depends_on('mpi', when='networking=mpi')
depends_on('mpi', when='+async_mpi')
# CUDA
depends_on('cuda', when='+async_cuda')
# Instrumentation # Instrumentation
depends_on('otf2', when='instrumentation=apex') depends_on('otf2', when='instrumentation=apex')
@ -130,6 +135,8 @@ def cmake_args(self):
self.define_from_variant('HPX_WITH_CUDA', 'cuda'), self.define_from_variant('HPX_WITH_CUDA', 'cuda'),
self.define_from_variant('HPX_WITH_TOOLS', 'tools'), self.define_from_variant('HPX_WITH_TOOLS', 'tools'),
self.define_from_variant('HPX_WITH_EXAMPLES', 'examples'), self.define_from_variant('HPX_WITH_EXAMPLES', 'examples'),
self.define_from_variant('HPX_WITH_ASYNC_MPI', 'async_mpi'),
self.define_from_variant('HPX_WITH_ASYNC_CUDA', 'async_cuda'),
self.define('HPX_WITH_TESTS', self.run_tests), self.define('HPX_WITH_TESTS', self.run_tests),
self.define('HPX_WITH_NETWORKING', 'networking=none' not in spec), self.define('HPX_WITH_NETWORKING', 'networking=none' not in spec),