diff options
3 files changed, 5 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py index 0b53e33f40..dd799bae02 100644 --- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py +++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py @@ -57,7 +57,7 @@ class KokkosKernels(CMakePackage, CudaPackage): "serial": (False, "enable Serial backend (default)"), "cuda": (False, "enable Cuda backend"), "openmp": (False, "enable OpenMP backend"), - "pthread": (False, "enable Pthread backend"), + "threads": (False, "enable C++ threads backend"), } for backend in backends: @@ -68,7 +68,7 @@ class KokkosKernels(CMakePackage, CudaPackage): space_etis = { "execspace_cuda": ("auto", "", "cuda"), "execspace_openmp": ("auto", "", "openmp"), - "execspace_threads": ("auto", "", "pthread"), + "execspace_threads": ("auto", "", "threads"), "execspace_serial": ("auto", "", "serial"), "memspace_cudauvmspace": ("auto", "", "cuda"), "memspace_cudaspace": ("auto", "", "cuda"), diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 6ab804203d..f4d723214a 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -47,7 +47,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): devices_variants = { "cuda": [False, "Whether to build CUDA backend"], "openmp": [False, "Whether to build OpenMP backend"], - "pthread": [False, "Whether to build Pthread backend"], + "threads": [False, "Whether to build the C++ threads backend"], "serial": [True, "Whether to build serial backend"], "rocm": [False, "Whether to build HIP backend"], "sycl": [False, "Whether to build the SYCL backend"], @@ -81,12 +81,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): "debug_dualview_modify_check": [False, "Debug check on dual views"], "deprecated_code": [False, "Whether to enable deprecated code"], "examples": [False, "Whether to build examples"], - "explicit_instantiation": [False, "Explicitly instantiate template types"], "hpx_async_dispatch": [False, "Whether HPX supports asynchronous dispath"], - "profiling": [True, "Create bindings for profiling tools"], "tuning": [False, "Create bindings for tuning tools"], - "profiling_load_print": [False, "Print which profiling tools got loaded"], - "qthread": [False, "Eenable the QTHREAD library"], "tests": [False, "Build for tests"], } @@ -208,6 +204,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): variant("pic", default=False, description="Build position independent code") conflicts("std=11", when="@3.7:") + conflicts("std=14", when="@4.0:") conflicts("+cuda", when="std=17 ^cuda@:10") conflicts("+cuda", when="std=20 ^cuda@:12") diff --git a/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py b/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py index 39d766a0ee..e910e087e1 100644 --- a/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py @@ -27,7 +27,7 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC "cuda": [False, "Whether to build CUDA backend"], "openmp": [False, "Whether to build OpenMP backend"], "openmptarget": [False, "Whether to build the OpenMPTarget backend"], - "pthread": [False, "Whether to build Pthread backend"], + "threads": [False, "Whether to build the C++ threads backend"], "rocm": [False, "Whether to build HIP backend"], "serial": [True, "Whether to build serial backend"], "sycl": [False, "Whether to build the SYCL backend"], |