hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use bfs order in spack find --deps tree (#33782)

Browse source 
* Use bfs order in spack find --deps tree
* fix printing tests
This commit is contained in:
Harmen Stoppels 2022-11-11 00:39:07 +01:00 committed by GitHub
parent 6a3e20023e
commit 0077a25639
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/spack/spack/cmd/__init__.py
View file

@ -30,6 +30,7 @@
import spack.paths import spack.paths
import spack.spec import spack.spec
import spack.store import spack.store
import spack.traverse as traverse
import spack.user_environment as uenv import spack.user_environment as uenv
import spack.util.spack_json as sjson import spack.util.spack_json as sjson
import spack.util.string import spack.util.string
@ -464,11 +465,12 @@ def format_list(specs):
# create the final, formatted versions of all specs # create the final, formatted versions of all specs
formatted = [] formatted = []
for spec in specs: for spec in specs:
formatted.append((fmt(spec), spec))
if deps: if deps:
for depth, dep in spec.traverse(root=False, depth=True): for depth, dep in traverse.traverse_tree([spec], depth_first=False):
formatted.append((fmt(dep, depth), dep)) formatted.append((fmt(dep.spec, depth), dep.spec))
formatted.append(("", None)) # mark newlines formatted.append(("", None)) # mark newlines
else:
formatted.append((fmt(spec), spec))
# unless any of these are set, we can just colify and be done. # unless any of these are set, we can just colify and be done.
if not any((deps, paths)): if not any((deps, paths)):

12
lib/spack/spack/test/cmd/find.py
View file

@ -269,9 +269,9 @@ def test_find_format_deps(database, config):
callpath-1.0 callpath-1.0
dyninst-8.2 dyninst-8.2
libdwarf-20130729 libdwarf-20130729
libelf-0.8.13 libelf-0.8.13
zmpi-1.0 zmpi-1.0
fake-1.0 fake-1.0
""" """
) )
@ -291,9 +291,9 @@ def test_find_format_deps_paths(database, config):
callpath-1.0 {1} callpath-1.0 {1}
dyninst-8.2 {2} dyninst-8.2 {2}
libdwarf-20130729 {3} libdwarf-20130729 {3}
libelf-0.8.13 {4} libelf-0.8.13 {4}
zmpi-1.0 {5} zmpi-1.0 {5}
fake-1.0 {6} fake-1.0 {6}
""".format( """.format(
*prefixes *prefixes