diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2022-08-16 10:44:44 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2022-08-16 23:19:52 -0700 |
| commit | 2d6087995caa2dc03c2468992e0b8ccec29b0e85 (patch) | |
| tree | 7525ddc24c48fb5813c9e4bfdfdcd5781a8f966c | |
| parent | 8f34a3ac5c7ff09751007d57c88884aee48921bb (diff) | |
| download | spack-2d6087995caa2dc03c2468992e0b8ccec29b0e85.tar.gz spack-2d6087995caa2dc03c2468992e0b8ccec29b0e85.tar.bz2 spack-2d6087995caa2dc03c2468992e0b8ccec29b0e85.tar.xz spack-2d6087995caa2dc03c2468992e0b8ccec29b0e85.zip | |
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`
| -rw-r--r-- | var/spack/repos/builtin/packages/kokkos/package.py | 3 |
1 files changed, 2 insertions, 1 deletions
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"], |