diff options
| author | Jonathan R. Madsen <jrmadsen@users.noreply.github.com> | 2020-08-28 12:40:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 14:40:34 -0500 |
| commit | 0bf696a29deb948d2f09dd3d9b52317aabbb8754 (patch) | |
| tree | cd28c176c9909aae6ed5d081997976012c8fef4c | |
| parent | 6bb2dd40b6c5932e4b4d8cbc8214a7d3b3cbae89 (diff) | |
| download | spack-0bf696a29deb948d2f09dd3d9b52317aabbb8754.tar.gz spack-0bf696a29deb948d2f09dd3d9b52317aabbb8754.tar.bz2 spack-0bf696a29deb948d2f09dd3d9b52317aabbb8754.tar.xz spack-0bf696a29deb948d2f09dd3d9b52317aabbb8754.zip | |
Timemory: Fix python dependencies + NCCL (#18342)
* Fix python dependencies + NCCL
* Removed trailing whitespace
| -rw-r--r-- | var/spack/repos/builtin/packages/timemory/package.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/timemory/package.py b/var/spack/repos/builtin/packages/timemory/package.py index d54ccf4fba..5f1758890d 100644 --- a/var/spack/repos/builtin/packages/timemory/package.py +++ b/var/spack/repos/builtin/packages/timemory/package.py @@ -25,7 +25,10 @@ class Timemory(CMakePackage): variant('shared', default=True, description='Build shared libraries') variant('static', default=False, description='Build static libraries') variant('python', default=False, description='Enable Python support') - variant('mpi', default=False, description='Enable MPI support') + variant('mpi', default=False, + description='Enable support for MPI aggregation') + variant('nccl', default=False, + description='Enable support for wrapping NCCL functions') variant('tau', default=False, description='Enable TAU support') variant('papi', default=False, description='Enable PAPI support') variant('cuda', default=False, description='Enable CUDA support') @@ -92,7 +95,11 @@ class Timemory(CMakePackage): depends_on('py-numpy', when='+python', type=('run')) depends_on('py-pillow', when='+python', type=('run')) depends_on('py-matplotlib', when='+python', type=('run')) + depends_on('py-mpi4py', when='+python+mpi', type=('run')) + depends_on('py-cython', when='+python', type=('build')) + depends_on('py-ipython', when='+python', type=('run')) depends_on('mpi', when='+mpi') + depends_on('nccl', when='+nccl') depends_on('tau', when='+tau') depends_on('papi', when='+papi') depends_on('cuda', when='+cuda') @@ -123,6 +130,8 @@ class Timemory(CMakePackage): msg='+python require tls_model=global-dynamic') conflicts('tls_model=local-exec', when='+python', msg='+python require tls_model=global-dynamic') + conflicts('+nccl', when='~gotcha', + msg='+nccl requires +gotcha') conflicts('+mpip_library', when='~mpi', msg='+mpip_library requires +mpi') conflicts('+mpip_library', when='~gotcha', msg='+mpip_library requires +gotcha') @@ -161,6 +170,10 @@ class Timemory(CMakePackage): args.append('-DPYTHON_EXECUTABLE={0}'.format( spec['python'].command.path)) + if '+nccl' in spec: + args.append('-DTIMEMORY_USE_NCCL=ON') + args.append('-DTIMEMORY_BUILD_NCCLP_LIBRARY=ON') + if '+mpi' in spec: args.append('-DTIMEMORY_USE_MPI_LINK_FLAGS=OFF') args.append('-DMPI_C_COMPILER={0}'.format(spec['mpi'].mpicc)) |