From fbdd2908774c7fc221c85fbeaa7b4d79709b9039 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Tue, 5 May 2020 15:31:13 -0600
Subject: [PATCH] kokkos: add v3.1.01 (#16470)
* kokkos: add v3.1.01
* kokkos: fix up versions
* kokkos-kernels: follow upstream versioning
---
.../repos/builtin/packages/kokkos-kernels/package.py | 8 +++-----
var/spack/repos/builtin/packages/kokkos/package.py | 9 ++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
index d4ae6a3363..1613c204b8 100644
--- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py
+++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
@@ -11,14 +11,12 @@ class KokkosKernels(CMakePackage, CudaPackage):
homepage = "https://github.com/kokkos/kokkos-kernels"
git = "https://github.com/kokkos/kokkos-kernels.git"
+ url = "https://github.com/kokkos/kokkos-kernels/archive/3.1.00.tar.gz"
- version('3.1', url='https://github.com/kokkos/kokkos-kernels/archive/3.1.00.tar.gz',
- sha256="27fea241ae92f41bd5b070b1a590ba3a56a06aca750207a98bea2f64a4a40c89",
- default=True)
- version('3.0', url='https://github.com/kokkos/kokkos-kernels/archive/3.0.00.tar.gz',
- sha256="e4b832aed3f8e785de24298f312af71217a26067aea2de51531e8c1e597ef0e6")
version('develop', branch='develop')
version('master', branch='master')
+ version('3.1.00', sha256="27fea241ae92f41bd5b070b1a590ba3a56a06aca750207a98bea2f64a4a40c89")
+ version('3.0.00', sha256="e4b832aed3f8e785de24298f312af71217a26067aea2de51531e8c1e597ef0e6")
depends_on("kokkos")
depends_on("kokkos@develop", when="@develop")
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index 86cf01e784..fef37d2ac7 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -11,14 +11,13 @@ class Kokkos(CMakePackage, CudaPackage):
homepage = "https://github.com/kokkos/kokkos"
git = "https://github.com/kokkos/kokkos.git"
+ url = "https://github.com/kokkos/kokkos/archive/3.1.01.tar.gz"
version('develop', branch='develop')
version('master', branch='master')
- version('3.0', url="https://github.com/kokkos/kokkos/archive/3.0.00.tar.gz",
- sha256="c00613d0194a4fbd0726719bbed8b0404ed06275f310189b3493f5739042a92b")
- version('3.1', url="https://github.com/kokkos/kokkos/archive/3.1.00.tar.gz",
- sha256="b935c9b780e7330bcb80809992caa2b66fd387e3a1c261c955d622dae857d878",
- default=True)
+ version('3.1.01', sha256='ff5024ebe8570887d00246e2793667e0d796b08c77a8227fe271127d36eec9dd')
+ version('3.1.00', sha256="b935c9b780e7330bcb80809992caa2b66fd387e3a1c261c955d622dae857d878")
+ version('3.0.00', sha256="c00613d0194a4fbd0726719bbed8b0404ed06275f310189b3493f5739042a92b")
depends_on("cmake@3.10:", type='build')
--
GitLab