Updated benchmarking models and plotting scripts.

2025-08-06 12:36:51 +08:00 · 2016-02-29 15:54:32 +00:00
--- a/tests/benchmarking/bench_100x100x100.in
+++ b/tests/benchmarking/bench_100x100x100.in
@@ -2,8 +2,6 @@
 #dx_dy_dz: 0.001 0.001 0.001
 #time_window: 3e-9

-#num_threads: 1
-
 #waveform: gaussiandotnorm 1 900e6 MySource
 #hertzian_dipole: x 0.05 0.05 0.05 MySource
 #rx: 0.05 0.05 0.05
--- a/tests/benchmarking/bench_150x150x150.in
+++ b/tests/benchmarking/bench_150x150x150.in
@@ -2,8 +2,6 @@
 #dx_dy_dz: 0.001 0.001 0.001
 #time_window: 3e-9

-#num_threads: 4
-
 #waveform: gaussiandotnorm 1 900e6 MySource
 #hertzian_dipole: x 0.05 0.05 0.05 MySource
 #rx: 0.05 0.05 0.05
--- a/tests/benchmarking/plot_benchmark.py
+++ b/tests/benchmarking/plot_benchmark.py
@@ -0,0 +1,73 @@
+import argparse, os, platform
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.gridspec as gridspec
+
+from gprMax._version import __version__
+
+"""Plots execution times and speedup factors from benchmarking models run with different numbers of threads. Results are read from a NumPy archive."""
+
+# Parse command line arguments
+parser = argparse.ArgumentParser(description='Plots execution times and speedup factors from benchmarking models run with different numbers of threads. Results are read from a NumPy archive.', usage='cd gprMax; python -m tests.benchmarking.plot_benchmark numpyfile')
+parser.add_argument('numpyfile', help='name of NumPy archive file including path')
+args = parser.parse_args()
+
+# Machine identifier
+platformID = platform.platform()
+#machineID = 'MacPro1,1'
+#machineIDlong = machineID + ' (2006); 2 x 2.66 GHz Quad-Core Intel Xeon; Mac OS X 10.11.3'
+machineID = 'iMac15,1'
+machineIDlong = machineID + ' (Retina 5K, 27-inch, Late 2014); 4GHz Intel Core i7; Mac OS X 10.11.3'
+
+# Load results
+results = np.load(args.numpyfile)
+plotlabel = os.path.splitext(os.path.split(args.numpyfile)[1])[0] + '.in'
+
+# Plot colours from http://tools.medialab.sciences-po.fr/iwanthue/index.php
+colors = ['#5CB7C6', '#E60D30', '#A21797', '#A3B347']
+
+fig, ax = plt.subplots(num=machineIDlong, figsize=(20, 10), facecolor='w', edgecolor='w')
+fig.suptitle(machineIDlong)
+gs = gridspec.GridSpec(1, 2, hspace=0.5)
+ax = plt.subplot(gs[0, 0])
+ax.plot(results['threads'], results['benchtimes'], color=colors[1], marker='.', ms=10, lw=2, label=plotlabel + ' (v' + __version__ + ')')
+#ax.plot(results['threads'], results['bench1c'], color=colors[0], marker='.', ms=10, lw=2, label='1e6 cells (v2)')
+#ax.plot(results['threads'], results['bench2'], color=colors[1], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v' + __version__ + ')')
+#ax.plot(results['threads'], results['bench2c'], color=colors[0], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v2)')
+
+ax.set_xlabel('Number of threads')
+ax.set_ylabel('Time [s]')
+ax.grid()
+
+legend = ax.legend(loc=1)
+frame = legend.get_frame()
+frame.set_edgecolor('white')
+
+ax.set_xlim([0, results['threads'][0] * 1.1])
+ax.set_xticks(np.append(results['threads'], 0))
+ax.set_ylim(0, top=ax.get_ylim()[1] * 1.1)
+
+ax = plt.subplot(gs[0, 1])
+ax.plot(results['threads'], results['benchtimes'][-1] / results['benchtimes'], color=colors[1], marker='.', ms=10, lw=2, label=plotlabel + ' (v' + __version__ + ')')
+#ax.plot(results['threads'], results['bench1c'][1] / results['bench1c'], color=colors[0], marker='.', ms=10, lw=2, label='1e6 cells (v2)')
+#ax.plot(results['threads'], results['bench2'][1] / results['bench2'], color=colors[1], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v' + __version__ + ')')
+#ax.plot(results['threads'], results['bench2c'][1] / results['bench2c'], color=colors[0], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v2)')
+
+ax.set_xlabel('Number of threads')
+ax.set_ylabel('Speed-up factor')
+ax.grid()
+
+legend = ax.legend(loc=1)
+frame = legend.get_frame()
+frame.set_edgecolor('white')
+
+ax.set_xlim([0, results['threads'][0] * 1.1])
+ax.set_xticks(np.append(results['threads'], 0))
+ax.set_ylim(bottom=1, top=ax.get_ylim()[1] * 1.1)
+
+# Save a pdf of the plot
+fig.savefig(os.path.splitext(args.numpyfile)[0] + '.png', dpi=150, format='png', bbox_inches='tight', pad_inches=0.1)
+
+plt.show()
+
+
--- a/tests/benchmarking/plot_time_speedup.py
+++ b/tests/benchmarking/plot_time_speedup.py
@@ -1,67 +0,0 @@
-import os, platform, psutil
-import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib.gridspec as gridspec
-
-from gprMax._version import __version__
-
-moduledirectory = os.path.dirname(os.path.abspath(__file__))
-
-# Machine identifier
-platformID = platform.platform()
-#machineID = 'MacPro1,1'
-#machineIDlong = machineID + ' (2006); 2 x 2.66 GHz Quad-Core Intel Xeon; Mac OS X 10.11.3'
-machineID = 'iMac15,1'
-machineIDlong = machineID + ' (Retina 5K, 27-inch, Late 2014); 4GHz Intel Core i7; Mac OS X 10.11.3'
-
-# Load results
-results = np.load(os.path.join(moduledirectory, machineID + '.npz'))
-
-# Plot colours from http://tools.medialab.sciences-po.fr/iwanthue/index.php
-colors = ['#5CB7C6', '#E60D30', '#A21797', '#A3B347']
-
-fig, ax = plt.subplots(num=machineIDlong, figsize=(20, 10), facecolor='w', edgecolor='w')
-fig.suptitle(machineIDlong)
-gs = gridspec.GridSpec(1, 2, hspace=0.5)
-ax = plt.subplot(gs[0, 0])
-ax.plot(results['threads'], results['bench1'], color=colors[1], marker='.', ms=10, lw=2, label='1e6 cells (v' + __version__ + ')')
-ax.plot(results['threads'], results['bench1c'], color=colors[0], marker='.', ms=10, lw=2, label='1e6 cells (v2)')
-ax.plot(results['threads'], results['bench2'], color=colors[1], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v' + __version__ + ')')
-ax.plot(results['threads'], results['bench2c'], color=colors[0], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v2)')
-
-ax.set_xlabel('Number of threads')
-ax.set_ylabel('Time [s]')
-ax.grid()
-
-legend = ax.legend(loc=1)
-frame = legend.get_frame()
-frame.set_edgecolor('white')
-
-ax.set_xlim([0, results['threads'][-1] * 1.1])
-ax.set_xticks(results['threads'])
-ax.set_ylim(0, top=ax.get_ylim()[1] * 1.1)
-
-ax = plt.subplot(gs[0, 1])
-ax.plot(results['threads'], results['bench1'][1] / results['bench1'], color=colors[1], marker='.', ms=10, lw=2, label='1e6 cells (v' + __version__ + ')')
-ax.plot(results['threads'], results['bench1c'][1] / results['bench1c'], color=colors[0], marker='.', ms=10, lw=2, label='1e6 cells (v2)')
-ax.plot(results['threads'], results['bench2'][1] / results['bench2'], color=colors[1], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v' + __version__ + ')')
-ax.plot(results['threads'], results['bench2c'][1] / results['bench2c'], color=colors[0], marker='.', ms=10, lw=2, ls='--', label='3.375e6 cells (v2)')
-
-ax.set_xlabel('Number of threads')
-ax.set_ylabel('Speed-up factor')
-ax.grid()
-
-legend = ax.legend(loc=1)
-frame = legend.get_frame()
-frame.set_edgecolor('white')
-
-ax.set_xlim([0, results['threads'][-1] * 1.1])
-ax.set_xticks(results['threads'])
-ax.set_ylim(bottom=1, top=ax.get_ylim()[1] * 1.1)
-
-# Save a pdf of the plot
-fig.savefig(os.path.join(moduledirectory, machineID + '.png'), dpi=150, format='png', bbox_inches='tight', pad_inches=0.1)
-
-plt.show()
-
-
--- a/tests/benchmarking/save_results.py
+++ b/tests/benchmarking/save_results.py
@@ -1,25 +0,0 @@
-import os, platform
-import numpy as np
-
-moduledirectory = os.path.dirname(os.path.abspath(__file__))
-
-# Machine identifier
-platformID = platform.platform()
-machineID = 'MacPro1,1'
-machineIDlong = machineID + ' (2006); 2 x 2.66 GHz Quad-Core Intel Xeon; Mac OS X 10.11.3'
-#machineID = 'iMac15,1'
-#machineIDlong = machineID + ' (Retina 5K, 27-inch, Late 2014); 4GHz Intel Core i7; Mac OS X 10.11.3'
-
-# Number of threads (0 signifies serial compiled code)
-threads = np.array([1, 2, 4, 8])
-
-# 100 x 100 x 100 cell model execution times (seconds)
-bench1 = np.array([149, 115, 100, 107])
-
-# 150 x 150 x 150 cell model execution times (seconds)
-bench2 = np.array([393, 289, 243, 235])
-
-# Save to file
-np.savez(os.path.join(moduledirectory, machineID), threads=threads, bench1=bench1, bench2=bench2)
-
-