From 74c9ba551a73ff21db6d81f1f21f28ffeb35eb1b Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 30 Apr 2020 09:49:02 -0600 Subject: cabana: add v0.2 and fix kokkos deps (#16389) --- var/spack/repos/builtin/packages/cabana/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index aaf88e4e12..b3bc87c061 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -13,7 +13,8 @@ class Cabana(CMakePackage): git = "https://github.com/ECP-copa/Cabana.git" url = "https://github.com/ECP-copa/Cabana/archive/0.1.0.tar.gz" - version('develop', branch='master') + version('master', branch='master') + version('0.2.0', sha256='3e0c0e224e90f4997f6c7e2b92f00ffa18f8bcff72f789e0908cea0828afc2cb') version('0.1.0', sha256='3280712facf6932b9d1aff375b24c932abb9f60a8addb0c0a1950afd0cb9b9cf') version('0.1.0-rc0', sha256='73754d38aaa0c2a1e012be6959787108fec142294774c23f70292f59c1bdc6c5') @@ -22,9 +23,12 @@ class Cabana(CMakePackage): variant('cuda', default=False, description="enable Cuda backend") depends_on("cmake@3.9:", type='build') - depends_on("kokkos-legacy+serial", when="+serial") - depends_on("kokkos-legacy+openmp", when="+openmp") - depends_on("kokkos-legacy+cuda", when="+cuda") + depends_on("kokkos-legacy+serial", when="@:0.2.0+serial") + depends_on("kokkos-legacy+openmp", when="@:0.2.0+openmp") + depends_on("kokkos-legacy+cuda", when="@:0.2.0+cuda") + depends_on("kokkos@3.1:+serial", when="@0.3.0:+serial") + depends_on("kokkos@3.1:+openmp", when="@0.3.0:+openmp") + depends_on("kokkos@3.1:+cuda", when="@0.3.0:+cuda") def cmake_args(self): options = [ -- cgit v1.2.3-70-g09d2