diff options
Diffstat (limited to 'numbench')
| -rw-r--r-- | numbench/htmlreport.py | 9 | ||||
| -rw-r--r-- | numbench/main.py | 3 | ||||
| -rw-r--r-- | numbench/report.py | 2 | ||||
| -rw-r--r-- | numbench/utils/btl.py | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/numbench/htmlreport.py b/numbench/htmlreport.py index 0439aff..39cf38f 100644 --- a/numbench/htmlreport.py +++ b/numbench/htmlreport.py @@ -63,7 +63,8 @@ h1, h2, .plot, .descr, .info { self.content += title + "</h1>" date = time.strftime('%Y-%m-%d, %I:%M %p') self.content += '<p class="info">Generated on ' + date + '</p>' - + + # Information regarding the CPU cpuinfo = file('/proc/cpuinfo', 'r').readlines() cpu = None for l in cpuinfo: @@ -71,7 +72,8 @@ h1, h2, .plot, .descr, .info { cpu = l.split(':',1)[1].strip() if cpu: self.content += '<p class="info">CPU: ' + cpu + '</p>' - + + # Information regarding the memory meminfo = file('/proc/meminfo', 'r').readlines() mem = None for l in meminfo: @@ -79,7 +81,8 @@ h1, h2, .plot, .descr, .info { mem = l.split(':',1)[1].strip() if mem: self.content += '<p class="info">Total memory: ' + mem + '</p>' - + + # Input file self.content += '<div class="inputfile">Input file: ' + \ '<a href="%s">%s</a>' % (basename(inputfile), cfg.inputfile) + \ '<pre>%s</pre></div>' % xmlescape(file(cfg.inputfile, 'r').read()) diff --git a/numbench/main.py b/numbench/main.py index 1cbb772..1285c18 100644 --- a/numbench/main.py +++ b/numbench/main.py @@ -147,6 +147,9 @@ for tname, ttest in cfg.tests.items(): if len(ttest['skip']) != 0: Print(" - Skip implementations: " + ' '.join(ttest['skip'])) + if len(ttest['skipre']) != 0: + Print(" - Skip implementations (regular expressions): " + ' '.join(ttest['skipre'])) + if len(ttest['requires']) != 0: Print(" - Pkg-config requirements substitutions:", '') for c_0, c_1 in ttest['requires'].items(): diff --git a/numbench/report.py b/numbench/report.py index 75be5c4..2d8d384 100644 --- a/numbench/report.py +++ b/numbench/report.py @@ -17,7 +17,7 @@ # from os.path import join as pjoin, basename import sys, numpy as np -from shutil import rmtree +from shutil import copy as fcopy, copytree, rmtree import benchconfig as cfg import benchutils as bu diff --git a/numbench/utils/btl.py b/numbench/utils/btl.py index 3031eb3..1f06f67 100644 --- a/numbench/utils/btl.py +++ b/numbench/utils/btl.py @@ -215,7 +215,7 @@ def runTest(test, btlconfig): if not outline: Print.up() Print('Execution error') - return 1 + return 1, None logfs.write(outline) logfs.flush() |