From 6d4caca5aa5b5e6ddabcb35bec1095a4aa4d661b Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 26 Jan 2017 15:17:33 +0000 Subject: [PATCH] Updated to use improved host machine information function. --- tests/benchmarking/plot_benchmark.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/benchmarking/plot_benchmark.py b/tests/benchmarking/plot_benchmark.py index b16474ad..81a4ab27 100644 --- a/tests/benchmarking/plot_benchmark.py +++ b/tests/benchmarking/plot_benchmark.py @@ -7,7 +7,7 @@ import matplotlib.pyplot as plt import matplotlib.gridspec as gridspec from gprMax._version import __version__ -from gprMax.utilities import get_machine_cpu_os +from gprMax.utilities import get_host_info """Plots execution times and speedup factors from benchmarking models run with different numbers of threads. Results are read from a NumPy archive.""" @@ -26,8 +26,8 @@ try: #machineIDlong = 'Dell PowerEdge R630; Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz; Linux (3.10.0-327.18.2.el7.x86_64)' # Use to manually describe machine machineID = machineIDlong.split(';')[0] except KeyError: - machineID, cpuID, osversion = get_machine_cpu_os() - machineIDlong = machineID + '; ' + cpuID + '; ' + osversion + hostinfo = get_host_info() + machineIDlong = '; '.join([hostinfo['machineID'], hostinfo['cpuID'], hostinfo['osversion']]) print('MachineID: {}'.format(machineIDlong)) # Base result info