Skip to content

Commit

Permalink
Disable display of memory stats when for CPU-only profiling.
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeryberger
emeryberger committed Feb 3, 2022
1 parent 70e4a47 commit 74d2523
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 43 deletions.
93 changes: 51 additions & 42 deletions scalene/scalene-gui/scalene-gui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,22 @@ const MemoryColor = "green";
const CopyColor = "goldenrod";
let columns = [];

function makeTableHeader(fname, gpu, functions = false) {
function makeTableHeader(fname, gpu, memory, functions = false) {
let tableTitle;
if (functions) {
tableTitle = "function profile";
} else {
tableTitle = "line profile";
}
columns = [{ title : ["time", ""], color: CPUColor, width: 0 },
{ title: ["memory", "average"], color: MemoryColor, width: 0 },
{ title: ["memory", "peak"], color: MemoryColor, width: 0 },
{ title: ["memory", "timeline"], color: MemoryColor, width: 0 },
{ title: ["memory", "activity"], color: MemoryColor, width: 0 },
{ title: ["copy", "(MB/s)"], color: CopyColor, width: 0 }];
columns = [{ title : ["time", ""], color: CPUColor, width: 0 }];
if (memory) {
columns = columns.concat([
{ title: ["memory", "average"], color: MemoryColor, width: 0 },
{ title: ["memory", "peak"], color: MemoryColor, width: 0 },
{ title: ["memory", "timeline"], color: MemoryColor, width: 0 },
{ title: ["memory", "activity"], color: MemoryColor, width: 0 },
{ title: ["copy", "(MB/s)"], color: CopyColor, width: 0 }]);
}
if (gpu) {
columns.push({ title: ["gpu", ""], color: CopyColor, width: 0 });
}
Expand Down Expand Up @@ -157,30 +160,32 @@ function makeProfileLine(line, prof, cpu_bars, memory_bars, memory_sparklines) {
s += `<td style="height: 10; width: 100; vertical-align: middle" align="left" data-sort='${total_time_str}'>`;
s += `<span style="height: 10; width: 100; vertical-align: middle" id="cpu_bar${cpu_bars.length}"></span>`;
cpu_bars.push(makeBar(line.n_cpu_percent_python, line.n_cpu_percent_c, line.n_sys_percent));
s += `<td style="height: 10; width: 100; vertical-align: middle" align="left" data-sort='${String(line.n_avg_mb.toFixed(0)).padStart(10, '0')}'>`;
s += `<span style="height: 10; width: 100; vertical-align: middle" id="memory_bar${memory_bars.length}"></span>`;
s += '</td>';
memory_bars.push(makeMemoryBar(line.n_avg_mb.toFixed(0), "average memory", parseFloat(line.n_python_fraction), prof.max_footprint_mb.toFixed(2), "darkgreen"));
s += `<td style="height: 10; width: 100; vertical-align: middle" align="left" data-sort='${String(line.n_peak_mb.toFixed(0)).padStart(10, '0')}'>`;
s += `<span style="height: 10; width: 100; vertical-align: middle" id="memory_bar${memory_bars.length}"></span>`;
memory_bars.push(makeMemoryBar(line.n_peak_mb.toFixed(0), "peak memory", parseFloat(line.n_python_fraction), prof.max_footprint_mb.toFixed(2), "darkgreen"));
s += '</td>';
s += `<td style='vertical-align: middle; width: 100'><span style="height:10; width: 100; vertical-align: middle" id="memory_sparkline${memory_sparklines.length}"></span>`;
s += '</td>';
if (line.memory_samples.length > 0) {
memory_sparklines.push(makeSparkline(line.memory_samples, prof.elapsed_time_sec * 1e9, prof.max_footprint_mb));
} else {
memory_sparklines.push(null);
}
s += '<td style="width: 100" align="right">';
if (line.n_usage_fraction >= 0.01) {
s += `<font style="font-size: small">${String((100 * line.n_usage_fraction).toFixed(0)).padStart(10, ' ')}%&nbsp;&nbsp;&nbsp;</font>`;
}
s += '</td>';
if (line.n_copy_mb_s < 1.0) {
s += '<td style="width: 100"></td>';
} else {
s += `<td style="width: 100" align="right"><font style="font-size: small" color="${CopyColor}">${line.n_copy_mb_s.toFixed(0)}&nbsp;&nbsp;&nbsp;</font></td>`;
if (prof.memory) {
s += `<td style="height: 10; width: 100; vertical-align: middle" align="left" data-sort='${String(line.n_avg_mb.toFixed(0)).padStart(10, '0')}'>`;
s += `<span style="height: 10; width: 100; vertical-align: middle" id="memory_bar${memory_bars.length}"></span>`;
s += '</td>';
memory_bars.push(makeMemoryBar(line.n_avg_mb.toFixed(0), "average memory", parseFloat(line.n_python_fraction), prof.max_footprint_mb.toFixed(2), "darkgreen"));
s += `<td style="height: 10; width: 100; vertical-align: middle" align="left" data-sort='${String(line.n_peak_mb.toFixed(0)).padStart(10, '0')}'>`;
s += `<span style="height: 10; width: 100; vertical-align: middle" id="memory_bar${memory_bars.length}"></span>`;
memory_bars.push(makeMemoryBar(line.n_peak_mb.toFixed(0), "peak memory", parseFloat(line.n_python_fraction), prof.max_footprint_mb.toFixed(2), "darkgreen"));
s += '</td>';
s += `<td style='vertical-align: middle; width: 100'><span style="height:10; width: 100; vertical-align: middle" id="memory_sparkline${memory_sparklines.length}"></span>`;
s += '</td>';
if (line.memory_samples.length > 0) {
memory_sparklines.push(makeSparkline(line.memory_samples, prof.elapsed_time_sec * 1e9, prof.max_footprint_mb));
} else {
memory_sparklines.push(null);
}
s += '<td style="width: 100" align="right">';
if (line.n_usage_fraction >= 0.01) {
s += `<font style="font-size: small">${String((100 * line.n_usage_fraction).toFixed(0)).padStart(10, ' ')}%&nbsp;&nbsp;&nbsp;</font>`;
}
s += '</td>';
if (line.n_copy_mb_s < 1.0) {
s += '<td style="width: 100"></td>';
} else {
s += `<td style="width: 100" align="right"><font style="font-size: small" color="${CopyColor}">${line.n_copy_mb_s.toFixed(0)}&nbsp;&nbsp;&nbsp;</font></td>`;
}
}
if (prof.gpu) {
if (line.n_gpu_percent < 1.0) {
Expand Down Expand Up @@ -226,19 +231,23 @@ async function display(prof) {
s += '<tr>';
s += `<td><font style="font-size: small"><b>Time:</b> <font color="darkblue">Python</font> | <font color="#6495ED">native</font> | <font color="blue">system</font><br /></font></td>`;
s += '<td width="10"></td>';
s += `<td><font style="font-size: small"><b>Memory:</b> <font color="darkgreen">Python</font> | <font color="#50C878">native</font><br /></font></td>`;
s += '<td width="10"></td>';
s += '<td valign="middle" style="vertical-align: middle">';
s += `<font style="font-size: small"><b>Memory timeline: </b>(max: ${prof.max_footprint_mb.toFixed(1)}MB, growth: ${prof.growth_rate.toFixed(1)}%)</font>`;
s += '</td>';
if (prof.memory) {
s += `<td><font style="font-size: small"><b>Memory:</b> <font color="darkgreen">Python</font> | <font color="#50C878">native</font><br /></font></td>`;
s += '<td width="10"></td>';
s += '<td valign="middle" style="vertical-align: middle">';
s += `<font style="font-size: small"><b>Memory timeline: </b>(max: ${prof.max_footprint_mb.toFixed(1)}MB, growth: ${prof.growth_rate.toFixed(1)}%)</font>`;
s += '</td>';
}
s += '</tr>';
s += '<tr>';
s += '<td height="10"><span style="height: 15; width: 200; vertical-align: middle" id="cpu_bar0"></span></td>';
s += '<td></td>';
s += '<td height="10"><span style="height: 15; width: 150; vertical-align: middle" id="memory_bar0"></span></td>';
s += '<td></td>';
s += '<td align="left"><span style="vertical-align: top" id="memory_sparkline0"></span></td>';
memory_sparklines.push(makeSparkline(prof.samples, prof.elapsed_time_sec * 1e9, prof.max_footprint_mb, 15, 200));
if (prof.memory) {
s += '<td height="10"><span style="height: 15; width: 150; vertical-align: middle" id="memory_bar0"></span></td>';
s += '<td></td>';
s += '<td align="left"><span style="vertical-align: top" id="memory_sparkline0"></span></td>';
memory_sparklines.push(makeSparkline(prof.samples, prof.elapsed_time_sec * 1e9, prof.max_footprint_mb, 15, 200));
}
s += '</tr>';

// Compute overall usage.
Expand Down Expand Up @@ -287,7 +296,7 @@ async function display(prof) {
s += '<div>';
s += `<table class="profile table table-hover table-condensed" id="table-${tableID}">`;
tableID++;
s += makeTableHeader(ff[0], prof.gpu);
s += makeTableHeader(ff[0], prof.gpu, prof.memory);
s += '<tbody>';
// Print per-line profiles.
let prevLineno = -1;
Expand All @@ -309,7 +318,7 @@ async function display(prof) {
s += '</table>';
// Print out function summaries.
s += `<table class="profile table table-hover table-condensed" id="table-${tableID}">`;
s += makeTableHeader(ff[0], prof.gpu, true);
s += makeTableHeader(ff[0], prof.gpu, prof.memory, true);
s += '<tbody>';
tableID++;
if (prof.files[ff[0]].functions) {
Expand Down
3 changes: 2 additions & 1 deletion scalene/scalene_json.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ def output_profiles(
"samples": samples,
"max_footprint_mb": stats.max_footprint,
"files": {},
"gpu": self.gpu
"gpu": self.gpu,
"memory": profile_memory
}

# Build a list of files we will actually report on.
Expand Down

0 comments on commit 74d2523

Please sign in to comment.