diff options
author | 2012-02-24 19:20:53 +0100 | |
---|---|---|
committer | 2012-02-24 19:20:53 +0100 | |
commit | 07410451faf82fbb764d8889436919f99c03fa64 (patch) | |
tree | 8987ebeb65c120d35b8528bb5dbdc70708d8ebcc | |
parent | New Plotter class (diff) | |
parent | Better results, error handling, sample configuration file. (diff) | |
download | auto-numerical-bench-07410451faf82fbb764d8889436919f99c03fa64.tar.gz auto-numerical-bench-07410451faf82fbb764d8889436919f99c03fa64.tar.bz2 auto-numerical-bench-07410451faf82fbb764d8889436919f99c03fa64.zip |
Merge remote branch 'origin/master' into HEAD0.2_beta1
Conflicts:
numbench/report.py
-rw-r--r-- | blastests.xml | 48 | ||||
-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 |
5 files changed, 39 insertions, 25 deletions
diff --git a/blastests.xml b/blastests.xml index d01615b..b1cc327 100644 --- a/blastests.xml +++ b/blastests.xml @@ -9,40 +9,48 @@ </test> --> -<!-- <test id="atlas"> <pkg>sci-libs/atlas-3.9.67</pkg> <emergeenv> <var name="USE">threads</var> </emergeenv> </test> ---> <test id="eigen"> <pkg>dev-cpp/eigen-3.0.5</pkg> <emergeenv> - <var name="FFLAGS">-O3</var> + <var name="CXXFLAGS">-O3</var> </emergeenv> - </test> - -<!-- - <test id="openblas"> - <pkg>sci-libs/openblas-0.1_alpha2</pkg> - <emergeenv> - <var name="TARGET">NEHALEM</var> - <var name="FFLAGS">-O3</var> - </emergeenv> - </test> ---> + </test> + + <test id="openblas"> + <pkg>sci-libs/openblas-0.1_alpha2</pkg> + <emergeenv> + <var name="TARGET">NEHALEM</var> + <var name="FFLAGS">-O3</var> + <var name="CFLAGS">-O3</var> + <var name="USE">-openmp -threads</var> + </emergeenv> + </test> + + <test id="openblas-8threads"> + <pkg>sci-libs/openblas-0.1_alpha2</pkg> + <emergeenv> + <var name="TARGET">NEHALEM</var> + <var name="FFLAGS">-O3</var> + <var name="CFLAGS">-O3</var> + <var name="USE">threads</var> + </emergeenv> + <runenv> + <var name="OPENBLAS_NUM_THREADS">8</var> + </runenv> + </test> <test id="mkl"> <pkg>sci-libs/mkl-10.3.7.256</pkg> - <skip>mkl32-dynamic</skip> - <skip>mkl32-dynamic-openmp</skip> - <skip>mkl32-gfortran</skip> - <skip>mkl32-gfortran-openmp</skip> - <skip>mkl32-intel</skip> - <skip>mkl32-intel-openmp</skip> + <skip>mkl32*</skip> + <skip>*int64*</skip> + <skip>*openmp</skip> </test> </tests> 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() |