summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorRobert Pavel <rspavel@gmail.com>2018-04-02 18:22:46 -0600
committerAdam J. Stewart <ajstewart426@gmail.com>2018-04-02 19:22:46 -0500
commita759fcf33ed6159e8a2fe4cd7efdffbc5c540046 (patch)
tree9e74a9d9aaf42a4d96f9b09a0428bb0707a6e8c8 /var
parentd9e057842a7a790b1fc1317ac431832056ed9dd1 (diff)
downloadspack-a759fcf33ed6159e8a2fe4cd7efdffbc5c540046.tar.gz
spack-a759fcf33ed6159e8a2fe4cd7efdffbc5c540046.tar.bz2
spack-a759fcf33ed6159e8a2fe4cd7efdffbc5c540046.tar.xz
spack-a759fcf33ed6159e8a2fe4cd7efdffbc5c540046.zip
Current versions of kokkos conflict with hwloc 2.x (#7654)
* Current versions of kokkos conflict with hwloc 2.x Current versions of kokkos cannot build with hwloc v2.x due to changes in the associated structs. Requiring v1.11.9 for the time being until it becomes clear what the kokkos model will be * Explicitly commenting fix for posterity Explicitly commented version number of hwloc dependency for kokkos for posterity purposes and to pass code coverage for speedy merging * Generalized Kokkos's Hwloc Dependency Generalized dependency to v1.x of hwloc * Fixed Flake8 issue Fixed comment to conform to flake8 * Fixed ordering for Version Requirements Fixed ordering to indicate <= 1.11.9, not >1 * Generalized kokkos dependency
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/kokkos/package.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index 0494ab938c..5512b84f4a 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -37,7 +37,8 @@ class Kokkos(Package):
variant('qthreads', default=False, description="enable Qthreads backend")
variant('cuda', default=False, description="enable Cuda backend")
- depends_on('hwloc')
+ # Specify that v1.x is required as v2.x has API changes
+ depends_on('hwloc@:1')
depends_on('qthreads', when='+qthreads')
depends_on('cuda', when='+cuda')