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

concretizer: print out virtuals

Browse Source
This commit is contained in:
Todd Gamblin 2019-10-06 15:34:44 -07:00
parent 8a6207aa70
commit 3f93553a08
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/package.py
View File

@ -678,7 +678,7 @@ def installed_upstream(self):
@classmethod @classmethod
def possible_dependencies( def possible_dependencies(
cls, transitive=True, expand_virtuals=True, deptype='all', cls, transitive=True, expand_virtuals=True, deptype='all',
visited=None, missing=None): visited=None, missing=None, virtuals=None):
"""Return dict of possible dependencies of this package. """Return dict of possible dependencies of this package.
Args: Args:
@ -691,6 +691,7 @@ def possible_dependencies(
far, mapped to their immediate dependencies' names. far, mapped to their immediate dependencies' names.
missing (dict, optional): dict to populate with packages and their missing (dict, optional): dict to populate with packages and their
*missing* dependencies. *missing* dependencies.
virtuals (set): if provided, populate with virtuals seen so far.
Returns: Returns:
(dict): dictionary mapping dependency names to *their* (dict): dictionary mapping dependency names to *their*
@ -727,6 +728,8 @@ def possible_dependencies(
# expand virtuals if enabled, otherwise just stop at virtuals # expand virtuals if enabled, otherwise just stop at virtuals
if spack.repo.path.is_virtual(name): if spack.repo.path.is_virtual(name):
if virtuals is not None:
virtuals.add(name)
if expand_virtuals: if expand_virtuals:
providers = spack.repo.path.providers_for(name) providers = spack.repo.path.providers_for(name)
dep_names = [spec.name for spec in providers] dep_names = [spec.name for spec in providers]
@ -759,7 +762,8 @@ def possible_dependencies(
continue continue
dep_cls.possible_dependencies( dep_cls.possible_dependencies(
transitive, expand_virtuals, deptype, visited, missing) transitive, expand_virtuals, deptype, visited, missing,
virtuals)
return visited return visited

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

@ -346,6 +346,11 @@ def arch_defaults(self):
self.fact(fn.arch_os_default(default_arch.os)) self.fact(fn.arch_os_default(default_arch.os))
self.fact(fn.arch_target_default(default_arch.target)) self.fact(fn.arch_target_default(default_arch.target))
def virtual_providers(self, virtuals):
for vspec in virtuals:
providers = spack.repo.path.providers_for(vspec)
print("PROVIDE", providers, [type(t) for t in providers])
def generate_asp_program(self, specs): def generate_asp_program(self, specs):
"""Write an ASP program for specs. """Write an ASP program for specs.
@ -373,6 +378,7 @@ def generate_asp_program(self, specs):
self.h1('General Constraints') self.h1('General Constraints')
self.compiler_defaults() self.compiler_defaults()
self.arch_defaults() self.arch_defaults()
self.virtual_providers(virtuals)
self.h1('Package Constraints') self.h1('Package Constraints')
for pkg in pkgs: for pkg in pkgs: