From 2c04bebc32857290d5dc2d6fd902307d56252843 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 6 Jan 2021 16:08:07 -0500 Subject: [PATCH] Update kokkos amd gpu archs and required C++ level (#20096) * Remove unsupported AMD GPU archs * Kokkos requires C++14 now --- var/spack/repos/builtin/packages/kokkos/package.py | 5 ++--- 1 file 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 fde48397133..27325e57ea9 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