spack solve: respect unify:false config
Signed-off-by: Gregory Becker <becker33@llnl.gov>
This commit is contained in:
parent
bd79c37c95
commit
fbdf9d9e01
@ -136,20 +136,7 @@ def solve(parser, args):
|
|||||||
setup_only = set(show) == {"asp"}
|
setup_only = set(show) == {"asp"}
|
||||||
unify = spack.config.get("concretizer:unify")
|
unify = spack.config.get("concretizer:unify")
|
||||||
allow_deprecated = spack.config.get("config:deprecated", False)
|
allow_deprecated = spack.config.get("config:deprecated", False)
|
||||||
if unify != "when_possible":
|
if unify == "when_possible":
|
||||||
# set up solver parameters
|
|
||||||
# Note: reuse and other concretizer prefs are passed as configuration
|
|
||||||
result = solver.solve(
|
|
||||||
specs,
|
|
||||||
out=output,
|
|
||||||
timers=args.timers,
|
|
||||||
stats=args.stats,
|
|
||||||
setup_only=setup_only,
|
|
||||||
allow_deprecated=allow_deprecated,
|
|
||||||
)
|
|
||||||
if not setup_only:
|
|
||||||
_process_result(result, show, required_format, kwargs)
|
|
||||||
else:
|
|
||||||
for idx, result in enumerate(
|
for idx, result in enumerate(
|
||||||
solver.solve_in_rounds(
|
solver.solve_in_rounds(
|
||||||
specs,
|
specs,
|
||||||
@ -166,3 +153,29 @@ def solve(parser, args):
|
|||||||
print("% END ROUND {0}\n".format(idx))
|
print("% END ROUND {0}\n".format(idx))
|
||||||
if not setup_only:
|
if not setup_only:
|
||||||
_process_result(result, show, required_format, kwargs)
|
_process_result(result, show, required_format, kwargs)
|
||||||
|
elif unify:
|
||||||
|
# set up solver parameters
|
||||||
|
# Note: reuse and other concretizer prefs are passed as configuration
|
||||||
|
result = solver.solve(
|
||||||
|
specs,
|
||||||
|
out=output,
|
||||||
|
timers=args.timers,
|
||||||
|
stats=args.stats,
|
||||||
|
setup_only=setup_only,
|
||||||
|
allow_deprecated=allow_deprecated,
|
||||||
|
)
|
||||||
|
if not setup_only:
|
||||||
|
_process_result(result, show, required_format, kwargs)
|
||||||
|
else:
|
||||||
|
for spec in specs:
|
||||||
|
print("SOLVING SPEC:", spec)
|
||||||
|
result = solver.solve(
|
||||||
|
[spec],
|
||||||
|
out=output,
|
||||||
|
timers=args.timers,
|
||||||
|
stats=args.stats,
|
||||||
|
setup_only=setup_only,
|
||||||
|
allow_deprecated=allow_deprecated,
|
||||||
|
)
|
||||||
|
if not setup_only:
|
||||||
|
_process_result(result, show, required_format, kwargs)
|
||||||
|
Loading…
Reference in New Issue
Block a user