From f49c58708bf82b7c875e2510d42d06c508183124 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Tue, 19 Sep 2023 14:28:13 -0600 Subject: FleCSI updates (#40087) * flecsi: update description and flog variant help * flecsi: use kokkos_cxx when needed --- var/spack/repos/builtin/packages/flecsi/package.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 6372faaddb..d240a93039 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -12,9 +12,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): provide a very general set of infrastructure design patterns that can be specialized and extended to suit the needs of a broad variety of solver and data requirements. Current support includes multi-dimensional - mesh topology, mesh geometry, and mesh adjacency information, - n-dimensional hashed-tree data structures, graph partitioning - interfaces,and dependency closures. + mesh topology, mesh geometry, and mesh adjacency information. """ homepage = "http://flecsi.org/" @@ -63,7 +61,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): multi=False, ) variant("shared", default=True, description="Build shared libraries") - variant("flog", default=False, description="Enable flog testing") + variant("flog", default=False, description="Enable logging support") variant("graphviz", default=False, description="Enable GraphViz Support") variant("doc", default=False, description="Enable documentation") variant("hdf5", default=True, description="Enable HDF5 Support") @@ -207,6 +205,8 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): if "+rocm" in self.spec: options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc)) options.append(self.define("CMAKE_C_COMPILER", self.spec["hip"].hipcc)) + elif "+kokkos" in self.spec: + options.append(self.define("CMAKE_CXX_COMPILER", self.spec["kokkos"].kokkos_cxx)) else: # kept for supporing version prior to 2.2 options = [ -- cgit v1.2.3-70-g09d2