From 2d6087995caa2dc03c2468992e0b8ccec29b0e85 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 16 Aug 2022 10:44:44 -0700 Subject: kokkos: fix conflict for deprecated `sycl` namespace We're seeing errors pop up with older versions of Kokkos and newer versions of `oneapi`, specifically: error: no member named 'ONEAPI' in namespace 'sycl' This hapens because `sycl::ONEAPI` is `sycl::ext::oneapi` since oneapi `2022.0.0`. `kokkos@3.6:` uses the new namespace. A conflict was present for this, but it was too specific -- both to `dpcpp` and to the `2022.0.0` version. - [x] Expand version ranges in `kokkos` conflict - [x] Add conflict for `oneapi` in addition to `dpcpp` --- var/spack/repos/builtin/packages/kokkos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index f05fb1845d..f6f35046c6 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -54,7 +54,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): conflicts("+openmptarget", when="@:3.5") # https://github.com/spack/spack/issues/29052 - conflicts("@:3.5.00 +sycl", when="%dpcpp@2022.0.0") + conflicts("@:3.5 +sycl", when="%dpcpp@2022:") + conflicts("@:3.5 +sycl", when="%oneapi@2022:") tpls_variants = { "hpx": [False, "Whether to enable the HPX library"], -- cgit v1.2.3-60-g2f50