From a759fcf33ed6159e8a2fe4cd7efdffbc5c540046 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Mon, 2 Apr 2018 18:22:46 -0600 Subject: [PATCH] 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 --- var/spack/repos/builtin/packages/kokkos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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')