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

charmpp: resolve conflict with '+smp' (#29243)

Browse Source 
The 'multicore' backend always uses SMP, so reverse
the logic of the `conflict` clause. This resolves an issue
where the '+smp' default caused the 'backend' to switch
away from 'multicore' unintentionally (#29234).
This commit is contained in:
Nils Vu 2022-03-04 10:16:49 +01:00 committed by GitHub
parent f931067bf2
commit 77d2b9a87a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/charmpp/package.py
View File

@ -94,9 +94,7 @@ class Charmpp(Package):
# Other options
variant("papi", default=False, description="Enable PAPI integration")
variant("syncft", default=False, description="Compile with Charm++ fault tolerance support")
variant("smp", default=True,
description=(
"Enable SMP parallelism (does not work with +multicore)"))
variant("smp", default=True, description="Enable SMP parallelism")
variant("tcp", default=False,
description="Use TCP as transport mechanism (requires +net)")
variant("omp", default=False, description="Support for the integrated LLVM OpenMP runtime")
@ -134,7 +132,8 @@ class Charmpp(Package):
conflicts("~tracing", "+papi")
conflicts("backend=multicore", "+smp")
conflicts("backend=multicore", when="~smp",
msg="The 'multicore' backend always uses SMP")
conflicts("backend=ucx", when="@:6.9")
# Shared-lib builds with GCC are broken on macOS:
@ -299,7 +298,11 @@ def install(self, spec, prefix):
options.extend(["--basedir=%s" % spec["ucx"].prefix])
if "+papi" in spec:
options.extend(["papi", "--basedir=%s" % spec["papi"].prefix])
if "+smp" in spec:
if "+smp" in spec and 'backend=multicore' not in spec:
# The 'multicore' backend always uses SMP, so we don't have to
# append the 'smp' option when the 'multicore' backend is active. As
# of Charm++ v7.0.0 it is actually a build error to append 'smp'
# with the 'multicore' backend.
options.append("smp")
if "+tcp" in spec:
if 'backend=netlrts' not in spec: