Skip to content

Commit e3b574f

Browse files
dthainbtovar
andauthored
Vine: Plotting tools cleanup (#4245)
* Add description of taskgraph file format * Modify taskgraph log to generate abstract format, rather than writing graphviz dot directly. * Add vine_plot_taskgraph to consume new taskgraph format. * Organize plotting section to present each tool consistently: debug, performance, taskgraph, transactions. * Debug log first. * format * vine_graph_log -> vine_plot_performance vine_graph_workers -> vine_plot_workers * vine_graph_log -> vine_plot_performance * Modify vine_plot_performance to generate (nearly) same output using matplotlib. * format * vine_graph_log -> vine_plot_performance * vine_graph_log -> vine_plot_performance * Rebuild all md files from source. (Some changes propagated from prior commits.) * Add matplotlib to developer environment. * - Remove markers from points, since they all overlap. - Make time resolution adaptive so that you get a reasonable number of points. * remove changes to list.c --------- Co-authored-by: Benjamin Tovar <[email protected]>
1 parent afcfb44 commit e3b574f

23 files changed

+606
-878
lines changed

doc/man/m4/vine_graph_log.m4 renamed to doc/man/m4/vine_plot_performance.m4

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
include(manual.h)dnl
2-
HEADER(vine_graph_log)
2+
HEADER(vine_plot_performance)
33

44
SECTION(NAME)
5-
BOLD(vine_graph_log) - plots TaskVine performance logs.
5+
BOLD(vine_plot_performance) - plots TaskVine performance logs.
66

77
SECTION(SYNOPSIS)
8-
CODE(vine_graph_log [options] vine-perf-log)
8+
CODE(vine_plot_performance [options] vine-perf-log)
99

1010
SECTION(DESCRIPTION)
1111

12-
BOLD(vine_graph_log) is a script to plot some of the statistics from a
12+
BOLD(vine_plot_performance) is a script to plot some of the statistics from a
1313
TaskVine log, as generated by CODE(vine_enable_perf_log) from the C API, or by
14-
CODE(q.enable_perf_log) from the Python API. It assumes the availability of
15-
CODE(gnuplot).
14+
CODE(q.enable_perf_log) from the Python API.
1615

17-
BOLD(vine_graph_log) generates four plots, all with CODE(timestamp) as
16+
BOLD(vine_plot_performance) generates four plots, all with CODE(timestamp) as
1817
the independent variable:
1918

2019
CODE(time):
@@ -33,9 +32,8 @@ SECTION(OPTIONS)
3332
OPTIONS_BEGIN
3433
OPTION_ARG_SHORT(o,prefix-output)Generate prefix-output.{time,time-log,tasks,tasks-log}.PARAM(output-format). Default is PARAM(work-queue-log).
3534
OPTION_ARG_SHORT(o,prefix-output)Generate prefix-output.{time,time-log,tasks,tasks-log}.PARAM(output-format). Default is PARAM(work-queue-log).
36-
OPTION_ARG_SHORT(c,gnuplot-path)Specify the location of the gnuplot executable. Default is gnuplot.
3735
OPTION_ARG_SHORT(r,range)Range of time to plot, in time units (see -u) from the start of execution. Of the form: min:max, min:, or :max.
38-
OPTION_ARG_SHORT(T,output-format)Set output format. Default is png. If "text", then the gnuplot scripts are written instead of the images.
36+
OPTION_ARG_SHORT(T,output-format)Set output format. Default is svg.
3937
OPTION_ARG_SHORT(u,time-unit)Time scale to output. One of s,m,h or d, for seconds, minutes (default), hours or days.
4038
OPTION_FLAG_SHORT(h)Show help text.
4139
OPTIONS_END
@@ -45,37 +43,21 @@ SECTION(EXAMPLES)
4543
General use:
4644

4745
LONGCODE_BEGIN
48-
% vine_graph_log mylog
46+
% vine_plot_performance mylog
4947
% ls mylog*.png
5048
mylog.tasks.png mylog.tasks-log.png mylog.time.png mylog.time-log.png
5149
LONGCODE_END
5250

5351
Plot up to the eleventh hour:
5452

5553
LONGCODE_BEGIN
56-
% vine_graph_log -u h -r :11 mylog
54+
% vine_plot_performance -u h -r :11 mylog
5755

5856
LONGCODE_END
5957
Generate script text:
6058

61-
LONGCODE_BEGIN
62-
% vine_graph_log -Ttext mylog
63-
% ls mylog*.gnuplot
64-
mylog.tasks.png.gnuplot mylog.tasks-log.png.gnuplot mylog.time.png.gnuplot mylog.time-log.png.gnuplot
65-
LONGCODE_END
66-
67-
Specify gnuplot path:
68-
69-
LONGCODE_BEGIN
70-
% vine_graph_log -c/some/dir/bin/gnuplot mylog
71-
LONGCODE_END
72-
7359
SECTION(BUGS)
7460

75-
LIST_BEGIN
76-
LIST_ITEM(Some formats need a special setup for their gnuplot output terminal. `-T' blindly passes the output format, which may cause gnuplot to fail.)
77-
LIST_END
78-
7961
SECTION(COPYRIGHT)
8062

8163
COPYRIGHT_BOILERPLATE

doc/man/manual.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ define(SEE_ALSO_TASK_VINE,
2222
`LIST_BEGIN
2323
LIST_ITEM(MANUAL(Cooperative Computing Tools Documentation,"../index.html"))
2424
LIST_ITEM(MANUAL(TaskVine User Manual,"../taskvine.html"))
25-
LIST_ITEM(MANPAGE(vine_worker,1) MANPAGE(vine_status,1) MANPAGE(vine_factory,1) MANPAGE(vine_graph_log,1) )
25+
LIST_ITEM(MANPAGE(vine_worker,1) MANPAGE(vine_status,1) MANPAGE(vine_factory,1) MANPAGE(vine_plot_performance,1) )
2626
LIST_END')dnl
2727
dnl
2828
define(SEE_ALSO_PARROT,

doc/man/md/condor_submit_workers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The Cooperative Computing Tools are Copyright (C) 2022 The University of Notre D
101101

102102
- [Cooperative Computing Tools Documentation]("../index.html")
103103
- [Work Queue User Manual]("../workqueue.html")
104-
- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [sge_submit_workers(1)](sge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md)
104+
- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [uge_submit_workers(1)](uge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md)
105105

106106

107107
CCTools

doc/man/md/makeflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ OPTION_END
8989
- **--send-environment**<br />Send all local environment variables in remote execution.
9090
- **--wait-for-files-upto=_&lt;#&gt;_**<br />Wait for output files to be created upto this many seconds (e.g., to deal with NFS semantics).
9191
- **-S**,**--submission-timeout=_&lt;timeout&gt;_**<br />Time to retry failed batch job submission. (default is 3600s)
92-
- **-T**,**--batch-type=_&lt;type&gt;_**<br />Batch system type: local, dryrun, condor, sge, pbs, torque, blue_waters, slurm, moab, cluster, wq, amazon, mesos. (default is local)
92+
- **-T**,**--batch-type=_&lt;type&gt;_**<br />Batch system type: local, dryrun, condor, wq, vine, uge, pbs, torque, slurm, moab, cluster, amazon. (default is local)
9393
- **--safe-submit-mode**<br />Excludes resources at submission. (SLURM, TORQUE, and PBS)
9494
- **--ignore-memory-spec**<br />Excludes memory at submission. (SLURM)
9595
- **--batch-mem-type=_&lt;type&gt;_**<br />Specify memory resource type. (SGE)

doc/man/md/makeflow_amazon_batch_cleanup.md

Lines changed: 0 additions & 67 deletions
This file was deleted.

doc/man/md/makeflow_amazon_batch_setup.md

Lines changed: 0 additions & 93 deletions
This file was deleted.

doc/man/md/makeflow_mpi_starter.md

Lines changed: 0 additions & 102 deletions
This file was deleted.

doc/man/md/pbs_submit_workers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The Cooperative Computing Tools are Copyright (C) 2022 The University of Notre D
8585

8686
- [Cooperative Computing Tools Documentation]("../index.html")
8787
- [Work Queue User Manual]("../workqueue.html")
88-
- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [sge_submit_workers(1)](sge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md)
88+
- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [uge_submit_workers(1)](uge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md)
8989

9090

9191
CCTools

doc/man/md/replica_exchange.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The Cooperative Computing Tools are Copyright (C) 2022 The University of Notre D
9090

9191
- [Cooperative Computing Tools Documentation]("../index.html")
9292
- [Work Queue User Manual]("../workqueue.html")
93-
- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [sge_submit_workers(1)](sge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md)
93+
- [work_queue_worker(1)](work_queue_worker.md) [work_queue_status(1)](work_queue_status.md) [work_queue_factory(1)](work_queue_factory.md) [condor_submit_workers(1)](condor_submit_workers.md) [uge_submit_workers(1)](uge_submit_workers.md) [torque_submit_workers(1)](torque_submit_workers.md)
9494

9595

9696
CCTools

0 commit comments

Comments
 (0)