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

Move early exit for setup only argument (#29041)

Browse Source 
See https://github.com/spack/spack/pull/28468/files#r809156986

If we exit before generating the:

 error("Dependencies must have compatible OS's with their dependents").
 ...

facts we'll output a problem that is effectively
different by the one solved by clingo.
This commit is contained in:
Massimiliano Culpo 2022-02-23 10:46:52 +01:00 committed by GitHub
parent 1cb82dc542
commit 1ddad522a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/solver/asp.py
View File

@ -566,10 +566,6 @@ def solve(
setup.setup(self, specs) setup.setup(self, specs)
timer.phase("setup") timer.phase("setup")
# If we're only doing setup, just return an empty solve result
if setup_only:
return Result(specs)
# read in the main ASP program and display logic -- these are # read in the main ASP program and display logic -- these are
# handwritten, not generated, so we load them as resources # handwritten, not generated, so we load them as resources
parent_dir = os.path.dirname(__file__) parent_dir = os.path.dirname(__file__)
@ -588,6 +584,10 @@ def visit(node):
path = os.path.join(parent_dir, 'concretize.lp') path = os.path.join(parent_dir, 'concretize.lp')
parse_files([path], visit) parse_files([path], visit)
# If we're only doing setup, just return an empty solve result
if setup_only:
return Result(specs)
# Load the file itself # Load the file itself
self.control.load(os.path.join(parent_dir, 'concretize.lp')) self.control.load(os.path.join(parent_dir, 'concretize.lp'))
self.control.load(os.path.join(parent_dir, "display.lp")) self.control.load(os.path.join(parent_dir, "display.lp"))