diff --git a/examples/plot_tasks_MPI.py b/examples/plot_tasks_MPI.py
index 01649aec0edf5e2efd564bbbf9e60dbea27731fa..45bee3e15cbe90da6f5df3d37e92a89b0b201f2e 100755
--- a/examples/plot_tasks_MPI.py
+++ b/examples/plot_tasks_MPI.py
@@ -28,17 +28,19 @@ import pylab as pl
import numpy as np
import sys
+# CPU ticks per second.
+CPU_CLOCK = 2.7e9
+
# Handle command-line.
-if len( sys.argv ) != 4:
- print "Usage: ", sys.argv[0], "input.dat rank output.png"
+if len( sys.argv ) != 3 and len( sys.argv ) != 4:
+ print "Usage: ", sys.argv[0], "input.dat png-output-prefix [time-range-ms]"
sys.exit(1)
infile = sys.argv[1]
-rank = int(sys.argv[2])
-outpng = sys.argv[3]
-
-# CPU ticks per second.
-CPU_CLOCK = 2.7e9
+outbase = sys.argv[2]
+delta_t = 0
+if len( sys.argv ) == 4:
+ delta_t = int(sys.argv[3]) * CPU_CLOCK / 1000
params = {"axes.labelsize": 10,
"axes.titlesize": 10,
@@ -59,9 +61,9 @@ params = {"axes.labelsize": 10,
pl.rcParams.update(params)
# Tasks and subtypes. Indexed as in tasks.h.
-types = ["none", "sort", "self", "pair", "sub", "ghost", "kick1", "kick2",
- "send", "recv", "grav_pp", "grav_mm", "grav_up", "grav_down",
- "psort", "split_cell", "rewait", "count"]
+tasktypes = ["none", "sort", "self", "pair", "sub", "ghost", "kick1", "kick2",
+ "send", "recv", "grav_pp", "grav_mm", "grav_up", "grav_down",
+ "psort", "split_cell", "rewait", "count"]
taskcolours = {"none": "black",
"sort": "lightblue",
@@ -84,108 +86,118 @@ taskcolours = {"none": "black",
subtypes = ["none", "density", "force", "grav", "count"]
-subtypecolours = {"none": "black",
- "density": "red",
- "force": "blue",
- "grav": "indigo",
- "count": "purple"}
+subcolours = {"none": "black",
+ "density": "red",
+ "force": "blue",
+ "grav": "indigo",
+ "count": "purple"}
# Read input.
data = pl.loadtxt( infile )
nranks = int(max(data[:,0])) + 1
print "Number of ranks:", nranks
-if rank < 0 or rank >= nranks:
- print "Cannot read rank: ", rank, ", out of range"
- sys.exit(1)
-print "Processing rank:", rank
-
nthread = int(max(data[:,1])) + 1
print "Number of threads:", nthread
-tasks = {}
-tasks[-1] = []
-for i in range(nthread):
- tasks[i] = []
-
-# Pick data for our rank, and avoid start and end times of zero.
+# Avoid start and end times of zero.
sdata = data[data[:,5] != 0]
sdata = sdata[sdata[:,6] != 0]
-sdata = sdata[sdata[:,0] == rank]
-
-start_t = min(sdata[:,5])
-end_t = max(sdata[:,6])
-sdata[:,5] -= start_t
-sdata[:,6] -= start_t
-
-#np.savetxt("dump.txt", sdata, fmt="%d")
-
-num_lines = pl.size(sdata) / 10
-for line in range(num_lines):
- thread = int(sdata[line,1])
- tasks[thread].append({})
- tasks[thread][-1]["type"] = types[int(sdata[line,2])]
- tasks[thread][-1]["subtype"] = subtypes[int(sdata[line,3])]
- tic = int(sdata[line,5]) / CPU_CLOCK * 1000
- toc = int(sdata[line,6]) / CPU_CLOCK * 1000
- tasks[thread][-1]["tic"] = tic
- tasks[thread][-1]["toc"] = toc
- tasks[thread][-1]["t"] = (toc + tic)/ 2
-
-print "Collection done..."
-
-combtasks = {}
-combtasks[-1] = []
-for i in range(nthread):
- combtasks[i] = []
-
-for thread in range(nthread):
- tasks[thread] = sorted(tasks[thread], key=lambda l: l["t"])
- lasttype = ""
- types = []
- for task in tasks[thread]:
- if task["type"] not in types:
- types.append(task["type"])
- if lasttype == "" or not lasttype == task["type"]:
- combtasks[thread].append({})
- combtasks[thread][-1]["type"] = task["type"]
- combtasks[thread][-1]["subtype"] = task["subtype"]
- combtasks[thread][-1]["tic"] = task["tic"]
- combtasks[thread][-1]["toc"] = task["toc"]
- if task["type"] == "self" or task["type"] == "pair" or task["type"] == "sub":
- combtasks[thread][-1]["colour"] = subtypecolours[task["subtype"]]
+
+# Each rank can have different clock (compute node), but we want to use the
+# same delta times range for comparisons, so we suck it up and take the hit of
+# precalculating this, unless the user knows better.
+if delta_t == 0:
+ for rank in range(nranks):
+ data = sdata[sdata[:,0] == rank]
+ dt = max(data[:,6]) - min(data[:,5])
+ if dt > delta_t:
+ delta_t = dt
+
+# Once more doing the real gather and plots this time.
+for rank in range(nranks):
+ data = sdata[sdata[:,0] == rank]
+
+ start_t = min(data[:,5])
+ data[:,5] -= start_t
+ data[:,6] -= start_t
+
+ tasks = {}
+ tasks[-1] = []
+ for i in range(nthread):
+ tasks[i] = []
+
+ num_lines = pl.size(data) / 10
+ for line in range(num_lines):
+ thread = int(data[line,1])
+ tasks[thread].append({})
+ tasks[thread][-1]["type"] = tasktypes[int(data[line,2])]
+ tasks[thread][-1]["subtype"] = subtypes[int(data[line,3])]
+ tic = int(data[line,5]) / CPU_CLOCK * 1000
+ toc = int(data[line,6]) / CPU_CLOCK * 1000
+ tasks[thread][-1]["tic"] = tic
+ tasks[thread][-1]["toc"] = toc
+ tasks[thread][-1]["t"] = (toc + tic)/ 2
+
+ print "Collection done..."
+
+ combtasks = {}
+ combtasks[-1] = []
+ for i in range(nthread):
+ combtasks[i] = []
+
+ for thread in range(nthread):
+ tasks[thread] = sorted(tasks[thread], key=lambda l: l["t"])
+ lasttype = ""
+ types = []
+ for task in tasks[thread]:
+ if task["type"] not in types:
+ types.append(task["type"])
+ if lasttype == "" or not lasttype == task["type"]:
+ combtasks[thread].append({})
+ combtasks[thread][-1]["type"] = task["type"]
+ combtasks[thread][-1]["subtype"] = task["subtype"]
+ combtasks[thread][-1]["tic"] = task["tic"]
+ combtasks[thread][-1]["toc"] = task["toc"]
+ if task["type"] == "self" or task["type"] == "pair" or task["type"] == "sub":
+ combtasks[thread][-1]["colour"] = subcolours[task["subtype"]]
+ else:
+ combtasks[thread][-1]["colour"] = taskcolours[task["type"]]
+ lasttype = task["type"]
+ else:
+ combtasks[thread][-1]["toc"] = task["toc"]
+
+ print "Combination done..."
+
+ typesseen = []
+ pl.figure()
+ for i in range(nthread):
+ for task in combtasks[i]:
+ pl.fill_between([task["tic"], task["toc"]], i+0.05, i+0.95,
+ facecolor=task["colour"], linewidths=0)
+ if task["subtype"] != "none":
+ qtask = task["type"] + "/" + task["subtype"]
else:
- combtasks[thread][-1]["colour"] = taskcolours[task["type"]]
- lasttype = task["type"]
- else:
- combtasks[thread][-1]["toc"] = task["toc"]
-
-print "Combination done..."
-
-typesseen = []
-for i in range(nthread):
- for task in combtasks[i]:
- pl.fill_between([task["tic"], task["toc"]], i+0.05, i+0.95,
- facecolor=task["colour"], linewidths=0)
- if task["subtype"] != "none":
- qtask = task["type"] + "/" + task["subtype"]
- else:
- qtask = task["type"]
- if qtask not in typesseen:
- pl.plot([], [], color=task["colour"], label=qtask)
- typesseen.append(qtask)
-
-# Legend and room for it.
-pl.fill_between([0, 0], nthread, nthread+len(typesseen)/3, facecolor="white")
-pl.legend(loc=1, shadow=True, mode="expand", ncol=3)
-
-pl.xlabel("Wall clock time [ms]")
-pl.xlim(0, (end_t - start_t)*1.03 * 1000 / CPU_CLOCK)
-pl.ylabel("Thread ID for MPI Rank " + str(rank) )
-pl.yticks(pl.array(range(nthread)) + 0.5, pl.array(range(nthread)))
-
-pl.show()
-pl.savefig(outpng)
-print "Graphics done, output written to", outpng
+ qtask = task["type"]
+ if qtask not in typesseen:
+ pl.plot([], [], color=task["colour"], label=qtask)
+ typesseen.append(qtask)
+
+ # Legend and room for it.
+ nrow = len(typesseen) / 5
+ if len(typesseen) * 5 < nrow:
+ nrow = nrow + 1
+ pl.fill_between([0, 0], nthread+0.5, nthread + nrow + 0.5, facecolor="white")
+ pl.legend(loc=1, shadow=True, mode="expand", ncol=5)
+
+ pl.xlabel("Wall clock time [ms]")
+ pl.xlim(0, delta_t * 1.03 * 1000 / CPU_CLOCK)
+ pl.ylabel("Thread ID for MPI Rank " + str(rank) )
+ pl.yticks(pl.array(range(nthread)) + 0.5, pl.array(range(nthread)))
+
+ pl.show()
+ outpng = outbase + str(rank) + ".png"
+ pl.savefig(outpng)
+ print "Graphics done, output written to", outpng
sys.exit(0)