zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hpx: change default of max_cpu_count variant to auto (#44220)

Browse Source
This commit is contained in:
Mikael Simberg 2024-05-17 11:54:48 +02:00 committed by GitHub
parent e604929a4c
commit 451a977de0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/hpx/package.py
View File

@ -60,9 +60,9 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage):
variant( variant(
"max_cpu_count", "max_cpu_count",
default="64", default="auto",
description="Max number of OS-threads for HPX applications", description="Max number of OS-threads for HPX applications",
values=lambda x: isinstance(x, str) and x.isdigit(), values=lambda x: isinstance(x, str) and (x.isdigit() or x == "auto"),
) )
instrumentation_values = ("apex", "google_perftools", "papi", "valgrind") instrumentation_values = ("apex", "google_perftools", "papi", "valgrind")
@ -224,6 +224,9 @@ def instrumentation_args(self):
def cmake_args(self): def cmake_args(self):
spec, args = self.spec, [] spec, args = self.spec, []
format_max_cpu_count = lambda max_cpu_count: (
"" if max_cpu_count == "auto" else max_cpu_count
)
args += [ args += [
self.define("HPX_WITH_CXX{0}".format(spec.variants["cxxstd"].value), True), self.define("HPX_WITH_CXX{0}".format(spec.variants["cxxstd"].value), True),
self.define_from_variant("HPX_WITH_MALLOC", "malloc"), self.define_from_variant("HPX_WITH_MALLOC", "malloc"),
@ -237,7 +240,10 @@ def cmake_args(self):
self.define("HPX_WITH_NETWORKING", "networking=none" not in spec), self.define("HPX_WITH_NETWORKING", "networking=none" not in spec),
self.define("HPX_WITH_PARCELPORT_TCP", "networking=tcp" in spec), self.define("HPX_WITH_PARCELPORT_TCP", "networking=tcp" in spec),
self.define("HPX_WITH_PARCELPORT_MPI", "networking=mpi" in spec), self.define("HPX_WITH_PARCELPORT_MPI", "networking=mpi" in spec),
self.define_from_variant("HPX_WITH_MAX_CPU_COUNT", "max_cpu_count"), self.define(
"HPX_WITH_MAX_CPU_COUNT",
format_max_cpu_count(spec.variants["max_cpu_count"].value),
),
self.define_from_variant("HPX_WITH_GENERIC_CONTEXT_COROUTINES", "generic_coroutines"), self.define_from_variant("HPX_WITH_GENERIC_CONTEXT_COROUTINES", "generic_coroutines"),
self.define("BOOST_ROOT", spec["boost"].prefix), self.define("BOOST_ROOT", spec["boost"].prefix),
self.define("HWLOC_ROOT", spec["hwloc"].prefix), self.define("HWLOC_ROOT", spec["hwloc"].prefix),