-
Notifications
You must be signed in to change notification settings - Fork 274
Analysis: added matplotlib figure generation with several desirable performance metrics. #612
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nikwl
wants to merge
31
commits into
ericaltendorf:development
Choose a base branch
from
nikwl:development
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 20 commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
adc02c0
added figure file
nikwl 49f2a17
integrated figfile contents into analyzer.py
nikwl 4914ee2
passed logfile where I should have passed logdir
nikwl c0a75b5
default logdir and logfile should now be none
nikwl 3eda2a1
the figfile condition to run new code was flipped
nikwl ba577f8
removed period for consistency
nikwl 56d5363
forgot to add code that converts directory to list of files
nikwl bf7f02c
pyplot imported incorrectly
nikwl 8d06393
fig file now passable for either log file or log dir
nikwl 8458013
assertation prevents generating figure with too few datapoints
nikwl 876724f
directory handling was passed figfile instead of logfilenames
nikwl 866dbd3
fixed bug with cumulative plot
nikwl f6c958f
Revert "fix: avoid more missing process errors"
nikwl b106fea
baby's first merge
nikwl 375a90e
updating fork
nikwl e909d1b
migrated graph
nikwl b89bc40
Merge branch 'ericaltendorf:development' into development
nikwl 95e1c63
several fixes, added some cli arguments, should work now
nikwl be3871c
Merge branch 'development' into development
altendky f87c2ab
Merge branch 'development' into development
altendky 46260ad
Fixed several discontinuities that I think were caused by the previou…
nikwl a6c65ed
logdir is no longer required, instead it pull from the logdir defined…
nikwl 134d4b7
Added type annotations to functions
nikwl b478a14
Merge branch 'development' into nikwl/development
altendky a8039dd
black
altendky b55fb57
tidy
altendky 2b356f5
Merge branch 'development' into nikwl_development
altendky 37d6dc6
Merge pull request #1 from altendky/nikwl_development
nikwl 1011b0f
Updated graph.py parser to new style. Reformatted graph.py with black.
nikwl 3bc6d90
Update setup.cfg
altendky d15ec4c
[mypy-matplotlib] ignore_missing_imports = true
altendky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,184 @@ | ||
import os | ||
import time, datetime | ||
import re | ||
import statistics | ||
import sys | ||
import argparse | ||
|
||
import numpy as np | ||
|
||
import matplotlib | ||
import matplotlib.pyplot as plt | ||
|
||
from plotman.log_parser import PlotLogParser | ||
|
||
|
||
def create_ax_dumbbell(ax, data, max_stacked=50) -> None: | ||
''' | ||
Create a dumbbell plot of concurrent plot instances over time. | ||
Parameters: | ||
ax: a matplotlib axis. | ||
data: numpy arrary with [start times, end times]. | ||
''' | ||
|
||
def newline(p1, p2, color='r'): | ||
l = matplotlib.lines.Line2D([p1[0],p2[0]], [p1[1],p2[1]], color=color) | ||
ax.add_line(l) | ||
return l | ||
|
||
# Prevent the stack from growing to tall | ||
num_rows = data.shape[0] | ||
stacker = [] | ||
for _ in range(int(np.ceil(num_rows / float(max_stacked)))): | ||
stacker.extend(list(range(max_stacked))) | ||
stacker = np.array(stacker) | ||
if num_rows % float(max_stacked) != 0: | ||
stacker = stacker[:-(max_stacked-int(num_rows % float(max_stacked)))] | ||
|
||
for (p1, p2), i in zip(data[:,:2], stacker): | ||
newline([p1, i], [p2, i]) | ||
ax.scatter(data[:,0], stacker, color='b') | ||
ax.scatter(data[:,1], stacker, color='b') | ||
|
||
ax.set_ylabel('Plots') | ||
ax.set_xlim(np.min(data[:,0])-2, np.max(data[:,1])+2) | ||
|
||
|
||
def create_ax_plotrate(ax, data, end=True, window=3) -> None: | ||
''' | ||
Create a plot showing the rate of plotting over time. Can be computed | ||
with respect to the plot start (this is rate of plot creation) or | ||
with respect to the plot end (this is rate of plot completion). | ||
Parameters: | ||
ax: a matplotlib axis. | ||
data: numpy arrary with [start times, end times]. | ||
end: T/F, compute plot creation or plot completion rate. | ||
window: Window to compute rate over. | ||
''' | ||
|
||
def estimate_rate(data, window): | ||
rate_list = [] | ||
window_list = [] | ||
# This takes care of when we dont have a full window | ||
for i in range(window): | ||
rate_list.append(data[i] - data[0]) | ||
window_list.append(i) | ||
# This takes care of when we do | ||
for i in range(len(data) - window): | ||
rate_list.append(data[i+window] - data[i]) | ||
window_list.append(window) | ||
rate_list, window_list = np.array(rate_list), np.array(window_list) | ||
rate_list[rate_list == 0] = np.nan # This prevents div by zero error | ||
return np.where(np.logical_not(np.isnan(rate_list)), (window_list-1) / rate_list, 0) | ||
|
||
# Estimate the rate of ending or the rate of starting | ||
if end: | ||
rate = estimate_rate(data[:,1], window) | ||
ax.plot(data[:,1], rate) | ||
else: | ||
rate = estimate_rate(data[:,0], window) | ||
ax.plot(data[:,0], rate) | ||
|
||
ax.set_ylabel('Avg Plot Rate (plots/hour)') | ||
ax.set_xlim(np.min(data[:,0])-2, np.max(data[:,1])+2) | ||
|
||
|
||
def create_ax_plottime(ax, data, window=3) -> None: | ||
''' | ||
Create a plot showing the average time to create a single plot. This is | ||
computed using a moving average. Note that the plot may not be | ||
very accurate for the beginning and ending windows. | ||
Parameters: | ||
ax: a matplotlib axis. | ||
data: numpy arrary with [start times, end times]. | ||
window: Window to compute rate over. | ||
''' | ||
|
||
# Compute moving avg | ||
kernel = np.ones(window) / window | ||
data_tiled = np.vstack(( | ||
np.expand_dims(data[:,1] - data[:,0], axis=1), | ||
np.tile(data[-1,1] - data[-1,0], (window-1, 1)) | ||
)) | ||
rolling_avg = np.convolve(data_tiled.squeeze(), kernel, mode='valid') | ||
|
||
ax.plot(data[:,1], rolling_avg) | ||
|
||
ax.set_ylabel('Avg Plot Time (hours)') | ||
ax.set_xlim(np.min(data[:,0])-2, np.max(data[:,1])+2) | ||
|
||
|
||
def create_ax_plotcumulative(ax, data) -> None: | ||
''' | ||
Create a plot showing the cumulative number of plots over time. | ||
Parameters: | ||
ax: a matplotlib axis. | ||
data: numpy arrary with [start times, end times]. | ||
''' | ||
ax.plot(data[:,1], range(data.shape[0])) | ||
|
||
ax.set_ylabel('Total plots (plots)') | ||
ax.set_xlim(np.min(data[:,0])-2, np.max(data[:,1])+2) | ||
|
||
|
||
def graph(logdir : str, figfile : str, latest_k : int, window : int) -> None: | ||
assert window >= 2, "Cannot compute moving average over such a small window" | ||
assert os.path.isdir(logdir) | ||
|
||
# Build a list of the logfiles | ||
logdir = os.path.abspath(logdir) | ||
logfilenames = [os.path.join(logdir, l) for l in os.listdir(logdir) if | ||
os.path.splitext(l)[-1] == '.log'] | ||
|
||
assert len(logfilenames) > 0, "Directory contains no files {}".format(logdir) | ||
|
||
# For each log file, extract the start, end, and duration | ||
time_catter = [] | ||
parser = PlotLogParser() | ||
for logfilename in logfilenames: | ||
with open(logfilename, 'r') as f: | ||
info = parser.parse(f) | ||
if info.total_time_raw != 0: | ||
time_catter.append( | ||
[ | ||
info.started_at.timestamp(), | ||
info.started_at.timestamp() + info.total_time_raw, | ||
info.total_time_raw | ||
] | ||
) | ||
|
||
assert len(time_catter) > 0, "No valid log files found, need a finished plot" | ||
|
||
# This array will hold start and end data (in hours) | ||
data_started_ended = np.array(time_catter) / (60 * 60) | ||
|
||
# Shift the data so that it starts at zero | ||
data_started_ended -= np.min(data_started_ended[:, 0]) | ||
|
||
# Sort the rows by start time | ||
data_started_ended = data_started_ended[np.argsort(data_started_ended[:, 0])] | ||
|
||
# Remove older entries | ||
if latest_k is not None: | ||
data_started_ended = data_started_ended[-latest_k:, :] | ||
|
||
# Create figure | ||
num_plots = 4 | ||
f, _ = plt.subplots(2,1, figsize=(8, 10)) | ||
ax = plt.subplot(num_plots,1,1) | ||
ax.set_title('Plot performance summary') | ||
|
||
create_ax_dumbbell(ax, data_started_ended) | ||
|
||
if data_started_ended.shape[0] > window: | ||
ax = plt.subplot(num_plots,1,2) | ||
create_ax_plotrate(ax, data_started_ended, end=True, window=window) | ||
|
||
ax = plt.subplot(num_plots,1,3) | ||
create_ax_plottime(ax, data_started_ended, window=window) | ||
|
||
ax = plt.subplot(num_plots,1,4) | ||
create_ax_plotcumulative(ax, data_started_ended) | ||
|
||
ax.set_xlabel('Time (hours)') | ||
f.savefig(figfile) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.