Compare commits

..

3 commits

3 changed files with 7 additions and 0 deletions

View file

@ -25,6 +25,7 @@ class KokkosKernels(CMakePackage, CudaPackage):
# openssl sha256 kokkos-kernels-x.y.z.tar.gz # openssl sha256 kokkos-kernels-x.y.z.tar.gz
version("develop", branch="develop") version("develop", branch="develop")
version("master", branch="master") version("master", branch="master")
version("4.3.01", sha256="749553a6ea715ba1e56fa0b13b42866bb9880dba7a94e343eadf40d08c68fab8")
version("4.3.00", sha256="03c3226ee97dbca4fa56fe69bc4eefa0673e23c37f2741943d9362424a63950e") version("4.3.00", sha256="03c3226ee97dbca4fa56fe69bc4eefa0673e23c37f2741943d9362424a63950e")
version("4.2.01", sha256="058052b3a40f5d4e447b7ded5c480f1b0d4aa78373b0bc7e43804d0447c34ca8") version("4.2.01", sha256="058052b3a40f5d4e447b7ded5c480f1b0d4aa78373b0bc7e43804d0447c34ca8")
version("4.2.00", sha256="c65df9a101dbbef2d8fd43c60c9ea85f2046bb3535fa1ad16e7c661ddd60401e") version("4.2.00", sha256="c65df9a101dbbef2d8fd43c60c9ea85f2046bb3535fa1ad16e7c661ddd60401e")
@ -48,6 +49,7 @@ class KokkosKernels(CMakePackage, CudaPackage):
depends_on("kokkos") depends_on("kokkos")
depends_on("kokkos@master", when="@master") depends_on("kokkos@master", when="@master")
depends_on("kokkos@develop", when="@develop") depends_on("kokkos@develop", when="@develop")
depends_on("kokkos@4.3.01", when="@4.3.01")
depends_on("kokkos@4.3.00", when="@4.3.00") depends_on("kokkos@4.3.00", when="@4.3.00")
depends_on("kokkos@4.2.01", when="@4.2.01") depends_on("kokkos@4.2.01", when="@4.2.01")
depends_on("kokkos@4.2.00", when="@4.2.00") depends_on("kokkos@4.2.00", when="@4.2.00")

View file

@ -27,6 +27,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
version("master", branch="master") version("master", branch="master")
version("develop", branch="develop") version("develop", branch="develop")
version("4.3.01", sha256="5998b7c732664d6b5e219ccc445cd3077f0e3968b4be480c29cd194b4f45ec70")
version("4.3.00", sha256="53cf30d3b44dade51d48efefdaee7a6cf109a091b702a443a2eda63992e5fe0d") version("4.3.00", sha256="53cf30d3b44dade51d48efefdaee7a6cf109a091b702a443a2eda63992e5fe0d")
version("4.2.01", sha256="cbabbabba021d00923fb357d2e1b905dda3838bd03c885a6752062fe03c67964") version("4.2.01", sha256="cbabbabba021d00923fb357d2e1b905dda3838bd03c885a6752062fe03c67964")
version("4.2.00", sha256="ac08765848a0a6ac584a0a46cd12803f66dd2a2c2db99bb17c06ffc589bf5be8") version("4.2.00", sha256="ac08765848a0a6ac584a0a46cd12803f66dd2a2c2db99bb17c06ffc589bf5be8")
@ -196,6 +197,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
variant(dev, default=dflt, description=desc) variant(dev, default=dflt, description=desc)
conflicts("+cuda", when="+rocm", msg="CUDA and ROCm are not compatible in Kokkos.") conflicts("+cuda", when="+rocm", msg="CUDA and ROCm are not compatible in Kokkos.")
depends_on("intel-oneapi-dpl", when="+sycl") depends_on("intel-oneapi-dpl", when="+sycl")
depends_on("rocthrust", when="@4.3: +rocm")
for opt, (dflt, desc) in options_variants.items(): for opt, (dflt, desc) in options_variants.items():
variant(opt, default=dflt, description=desc, when=("+cuda" if "cuda" in opt else None)) variant(opt, default=dflt, description=desc, when=("+cuda" if "cuda" in opt else None))
@ -348,6 +350,7 @@ def cmake_args(self):
if "+rocm" in self.spec: if "+rocm" in self.spec:
options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc)) options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc))
options.append(self.define("Kokkos_ENABLE_ROCTHRUST", True))
elif "+wrapper" in self.spec: elif "+wrapper" in self.spec:
options.append( options.append(
self.define("CMAKE_CXX_COMPILER", self.spec["kokkos-nvcc-wrapper"].kokkos_cxx) self.define("CMAKE_CXX_COMPILER", self.spec["kokkos-nvcc-wrapper"].kokkos_cxx)

View file

@ -42,6 +42,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
version("master", branch="master") version("master", branch="master")
version("develop", branch="develop") version("develop", branch="develop")
version("16.0.0", sha256="46bfc40419ed2aa2db38c144fb8e61d4aa8170eaa654a88d833ba6b92903f309")
version("15.1.1", sha256="2108d633d2208ed261d09b2d6b2fbae7a9cdc455dd963c9c94412d38d8aaefe4") version("15.1.1", sha256="2108d633d2208ed261d09b2d6b2fbae7a9cdc455dd963c9c94412d38d8aaefe4")
version("15.0.0", sha256="5651f1f967217a807f2c418a73b7e649532824dbf2742fa517951d6cc11518fb") version("15.0.0", sha256="5651f1f967217a807f2c418a73b7e649532824dbf2742fa517951d6cc11518fb")
version("14.4.0", sha256="8e7d881cf6677aa062f7bfea8baa1e52e8956aa575d6a4f90f2b6f032632d4c6") version("14.4.0", sha256="8e7d881cf6677aa062f7bfea8baa1e52e8956aa575d6a4f90f2b6f032632d4c6")
@ -401,6 +402,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# External Kokkos # External Kokkos
depends_on("kokkos@4.3.00", when="@master: +kokkos") depends_on("kokkos@4.3.00", when="@master: +kokkos")
depends_on("kokkos@4.3.01", when="@16.0.0 +kokkos")
depends_on("kokkos@4.2.01", when="@15.1.0:15.1.1 +kokkos") depends_on("kokkos@4.2.01", when="@15.1.0:15.1.1 +kokkos")
depends_on("kokkos@4.1.00", when="@14.4.0:15.0.0 +kokkos") depends_on("kokkos@4.1.00", when="@14.4.0:15.0.0 +kokkos")