summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorCameron Smith <cwsmith@users.noreply.github.com>2019-04-08 02:58:35 -0400
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2019-04-08 08:58:35 +0200
commit0e044100447e1da0f6e9bedc57e29ab9c2d23670 (patch)
tree546e567c3887dc57c34bab348e0f0e68415b61fb /var
parent6e4b234d1356a6d085d7f2a0858d462e0bf6fa15 (diff)
downloadspack-0e044100447e1da0f6e9bedc57e29ab9c2d23670.tar.gz
spack-0e044100447e1da0f6e9bedc57e29ab9c2d23670.tar.bz2
spack-0e044100447e1da0f6e9bedc57e29ab9c2d23670.tar.xz
spack-0e044100447e1da0f6e9bedc57e29ab9c2d23670.zip
kokkos: update cuda conflict (#11110)
see https://github.com/spack/spack/pull/10943#issuecomment-475303870
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/kokkos/package.py7
1 files changed, 3 insertions, 4 deletions
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')