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

Spec graph works without color.

Browse Source
This commit is contained in:
Todd Gamblin 2014-12-29 01:52:03 -08:00
parent a6e00f6086
commit 226de0a42d
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/cmd/spec.py
View File

@ -46,15 +46,12 @@ def spec(parser, args):
spec.normalize() spec.normalize()
print spec.tree(color=True, indent=2, cover='paths') print spec.tree(color=True, indent=2, cover='paths')
print
print spec.topological_sort(reverse=True)
print
print "Graph"
print "------------------------------"
print spec.graph()
return
print "Concretized" print "Concretized"
print "------------------------------" print "------------------------------"
spec.concretize() spec.concretize()
print spec.tree(color=True, indent=2) print spec.tree(color=True, indent=2)
print "Graph"
print "------------------------------"
spec.graph()
return

16
lib/spack/spack/spec.py
View File

@ -1343,7 +1343,6 @@ def ordered_deps(node):
frontier = [] frontier = []
debug = True
debug = False debug = False
def back_edge(end, start): def back_edge(end, start):
@ -1367,6 +1366,9 @@ def back_edge(end, start):
out.write("| " * end) out.write("| " * end)
out.write("|/") out.write("|/")
out.write("| " * (start - end - 1)) out.write("| " * (start - end - 1))
if (start - end) > 1:
out.write("| " * (len(frontier) - start))
else:
out.write(" /" * (len(frontier) - start)) out.write(" /" * (len(frontier) - start))
out.write("\n") out.write("\n")
@ -1424,6 +1426,9 @@ def add_deps_to_frontier(node, i):
deps = [name] deps = [name]
connect_deps(i, deps) connect_deps(i, deps)
if i+1 < len(frontier) and len(frontier[i+1]) == 1:
deps = frontier.pop(i+1)
connect_deps(i+1, deps)
else: else:
name = topo_order.pop() name = topo_order.pop()
@ -1452,15 +1457,6 @@ def add_deps_to_frontier(node, i):
out.write("\n") out.write("\n")
out.write("\n")
out.write("%s\n" % frontier)
# Reverse the lines in the output
#return '\n'.join(reversed(out.getvalue().split('\n')))
return "" #out.getvalue()
def topological_sort(self, **kwargs): def topological_sort(self, **kwargs):
"""Return a list of dependency specs sorted topologically. """Return a list of dependency specs sorted topologically.
This spec is not modified in the process.""" This spec is not modified in the process."""