From 0e044100447e1da0f6e9bedc57e29ab9c2d23670 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Mon, 8 Apr 2019 02:58:35 -0400 Subject: kokkos: update cuda conflict (#11110) see https://github.com/spack/spack/pull/10943#issuecomment-475303870 --- var/spack/repos/builtin/packages/kokkos/package.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index fb2ca3f23c..0567286891 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -123,10 +123,9 @@ class Kokkos(Package): # conflicts on kokkos version and cuda enabled # see kokkos issue #1296 # https://github.com/kokkos/kokkos/issues/1296 - conflicts('+cuda', when='@2.5.00:develop', - msg='Kokkos build system has issue when CUDA enabled' - ' in version 2.5.00 through 2.7.00, and develop until ' - 'issue #1296 is resolved.') + conflicts('+cuda', when='@2.5.00:2.7.00', + msg='Kokkos build system has issue (#1296) when CUDA enabled' + ' in version 2.5.00 through 2.7.00.') # Specify that v1.x is required as v2.x has API changes depends_on('hwloc@:1') -- cgit v1.2.3-60-g2f50