summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2021-01-06 16:08:07 -0500
committerGitHub <noreply@github.com>2021-01-06 13:08:07 -0800
commit2c04bebc32857290d5dc2d6fd902307d56252843 (patch)
tree2d7a742287aa1abfac4724b75a11835094e4ee85
parent6157854de655f1f11ac71c8fb192a33753908ea0 (diff)
downloadspack-2c04bebc32857290d5dc2d6fd902307d56252843.tar.gz
spack-2c04bebc32857290d5dc2d6fd902307d56252843.tar.bz2
spack-2c04bebc32857290d5dc2d6fd902307d56252843.tar.xz
spack-2c04bebc32857290d5dc2d6fd902307d56252843.zip
Update kokkos amd gpu archs and required C++ level (#20096)
* Remove unsupported AMD GPU archs * Kokkos requires C++14 now
-rw-r--r--var/spack/repos/builtin/packages/kokkos/package.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index fde4839713..27325e57ea 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -73,10 +73,9 @@ class Kokkos(CMakePackage, CudaPackage):
}
amd_gpu_arches = (
- 'fiji',
- 'gfx901',
'vega900',
'vega906',
+ 'vega908',
)
variant("amd_gpu_arch", default='none', values=('none',) + amd_gpu_arches,
description="AMD GPU architecture")
@@ -178,7 +177,7 @@ class Kokkos(CMakePackage, CudaPackage):
depends_on("kokkos-nvcc-wrapper@master", when="@master+wrapper")
conflicts("+wrapper", when="~cuda")
- variant("std", default="11", values=["11", "14", "17", "20"], multi=False)
+ variant("std", default="14", values=["11", "14", "17", "20"], multi=False)
variant("pic", default=False, description="Build position independent code")
# nvcc does not currently work with C++17 or C++20