diff options
author | 2012-02-27 01:58:20 +0100 | |
---|---|---|
committer | 2012-02-27 01:58:20 +0100 | |
commit | d9c091ef0cfd02908526f8fe2952cfed6a541539 (patch) | |
tree | c631b96c8caf08069d1222f4aa17fab9e799ef53 | |
parent | Merge remote branch 'origin/master' into HEAD (diff) | |
download | auto-numerical-bench-d9c091ef0cfd02908526f8fe2952cfed6a541539.tar.gz auto-numerical-bench-d9c091ef0cfd02908526f8fe2952cfed6a541539.tar.bz2 auto-numerical-bench-d9c091ef0cfd02908526f8fe2952cfed6a541539.zip |
Solved problems with lapack and report. Reordered sample configuration files.
-rw-r--r-- | blastests.xml | 56 | ||||
-rw-r--r-- | numbench/modules/internal/lapackBase.py | 7 | ||||
-rw-r--r-- | numbench/report.py | 6 | ||||
-rw-r--r-- | samples/Old/blastests.in (renamed from blastests.in) | 0 | ||||
-rw-r--r-- | samples/Old/cblastests.in | 12 | ||||
-rw-r--r-- | samples/Old/fftwtests.in | 5 | ||||
-rw-r--r-- | samples/Old/lapacktests.in | 5 | ||||
-rw-r--r-- | samples/Old/metistests.in (renamed from metistests.in) | 0 | ||||
-rw-r--r-- | samples/Old/scalapacktests.in (renamed from scalapacktests.in) | 0 | ||||
-rw-r--r-- | samples/blastests.xml | 56 | ||||
-rw-r--r-- | samples/lapacktests.xml | 38 |
11 files changed, 123 insertions, 62 deletions
diff --git a/blastests.xml b/blastests.xml deleted file mode 100644 index b1cc327..0000000 --- a/blastests.xml +++ /dev/null @@ -1,56 +0,0 @@ -<tests> - -<!-- - <test id="reference"> - <pkg>sci-libs/blas-reference-20120215-r1</pkg> - <emergeenv> - <var name="FFLAGS">-O3</var> - </emergeenv> - </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="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> - <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*</skip> - <skip>*int64*</skip> - <skip>*openmp</skip> - </test> - -</tests> diff --git a/numbench/modules/internal/lapackBase.py b/numbench/modules/internal/lapackBase.py index e45951d..7cd0c8c 100644 --- a/numbench/modules/internal/lapackBase.py +++ b/numbench/modules/internal/lapackBase.py @@ -27,10 +27,9 @@ defaultTests = ('lu_decomp', 'cholesky', 'qr_decomp', 'svd_decomp', 'syev') def init(self, args): - if len(args) == 0: + self.tests = btl.selectTests(availableTests, args) + if len(self.tests) == 0: self.tests = defaultTests - else: - self.tests = btl.selectTests(availableTests, args) def getImplementations(self, test): @@ -52,5 +51,5 @@ def runTest(self, test, implementation): return btlBase.runTest(self, test, btlconfig) -getTests btlBase.getTests +getTests = btlBase.getTests reportConf = btlBase.reportConf
\ No newline at end of file diff --git a/numbench/report.py b/numbench/report.py index 2d8d384..c080b1f 100644 --- a/numbench/report.py +++ b/numbench/report.py @@ -97,8 +97,10 @@ def saveReport(): for tid,test in cfg.tests.items(): if test.has_key('implementations'): for impl in test['implementations']: - if test['results'][impl].has_key(operation): - resultsFile = test['results'][impl][operation] + + implres = test['results'][impl] + if implres and implres.has_key(operation): + resultsFile = implres[operation] x,y = np.loadtxt(resultsFile, unpack=True) p.addPlot(x, y, tid+'/'+impl) diff --git a/blastests.in b/samples/Old/blastests.in index b31b19f..b31b19f 100644 --- a/blastests.in +++ b/samples/Old/blastests.in diff --git a/samples/Old/cblastests.in b/samples/Old/cblastests.in new file mode 100644 index 0000000..670ddc4 --- /dev/null +++ b/samples/Old/cblastests.in @@ -0,0 +1,12 @@ +# Testing different implementations of CBLAS + +# cblas-reference is a wrapper for blas: test this with different blas implementations +reference-eigen sci-libs/cblas-reference-20110218 blas:eigen +reference-openblas sci-libs/cblas-reference-20110218 blas:openblas-threads +reference-acml sci-libs/cblas-reference-20110218 blas:acml64-gfortran + +# Other implementations are not wrappers +# Test them using gcc-4.6.1 and enabling vectorization +gsl gsl-1.15-r1 CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" +goto sci-libs/gotoblas2-1.13 CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" USE=incblas TARGET=NEHALEM +openblas sci-libs/openblas CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2" USE=incblas TARGET=NEHALEM
\ No newline at end of file diff --git a/samples/Old/fftwtests.in b/samples/Old/fftwtests.in new file mode 100644 index 0000000..04a905d --- /dev/null +++ b/samples/Old/fftwtests.in @@ -0,0 +1,5 @@ +# Testing FFTW with different gcc versions and enabling vectorization + +gcc-4.6.1 sci-libs/fftw-3.2.2-r1 CC=gcc-4.6.1 CFLAGS="-O3 -march=native -msse2 -msse3 -mssse3 -msse4.1 -msse4.2" +gcc-4.5.2 sci-libs/fftw-3.2.2-r1 CC=gcc-4.5.2 CFLAGS="-O3 -march=native -msse2 -msse3 -mssse3 -msse4.1 -msse4.2" +gcc-4.3.6 sci-libs/fftw-3.2.2-r1 CC=gcc-4.3.6 CFLAGS="-O3 -march=native -msse2 -msse3 -mssse3 -msse4.1 -msse4.2"
\ No newline at end of file diff --git a/samples/Old/lapacktests.in b/samples/Old/lapacktests.in new file mode 100644 index 0000000..39d925e --- /dev/null +++ b/samples/Old/lapacktests.in @@ -0,0 +1,5 @@ +# Testing different implementations of LAPACK +reference_eigen sci-libs/lapack-reference-3.3.1-r1 blas:eigen +reference_openblas sci-libs/lapack-reference-3.3.1-r1 blas:openblas-threads +#atlas sci-libs/atlas-3.9.46 +acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp -acml64-gfortran-openmp diff --git a/metistests.in b/samples/Old/metistests.in index 76de6bb..76de6bb 100644 --- a/metistests.in +++ b/samples/Old/metistests.in diff --git a/scalapacktests.in b/samples/Old/scalapacktests.in index e32c0fb..e32c0fb 100644 --- a/scalapacktests.in +++ b/samples/Old/scalapacktests.in diff --git a/samples/blastests.xml b/samples/blastests.xml new file mode 100644 index 0000000..321e724 --- /dev/null +++ b/samples/blastests.xml @@ -0,0 +1,56 @@ +<tests> + +<!-- + <test id="reference"> + <pkg>sci-libs/blas-reference-20120215-r1</pkg> + <emergeenv> + <var name="FFLAGS">-O3</var> + </emergeenv> + </test> +--> + + <test id="atlas"> + <pkg>sci-libs/atlas-3.9.68</pkg> + <emergeenv> + <var name="USE">threads</var> + </emergeenv> + </test> + + <test id="eigen"> + <pkg>dev-cpp/eigen-3.0.5</pkg> + <emergeenv> + <var name="CXXFLAGS">-O3</var> + </emergeenv> + </test> + + <test id="openblas"> + <pkg>sci-libs/openblas-9999</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-9999</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*</skip> + <skip>*int64*</skip> + <skip>*openmp</skip> + </test> + +</tests> diff --git a/samples/lapacktests.xml b/samples/lapacktests.xml new file mode 100644 index 0000000..5ca0391 --- /dev/null +++ b/samples/lapacktests.xml @@ -0,0 +1,38 @@ +<tests> + + <test id="reference-mkl"> + <pkg>sci-libs/lapack-reference-3.4.0_p20120215-r1</pkg> + <emergeenv> + <var name="FFLAGS">-O3</var> + </emergeenv> + <required name="blas">mkl64-intel</required> + </test> + + <test id="reference-openblas"> + <pkg>sci-libs/lapack-reference-3.4.0_p20120215-r1</pkg> + <emergeenv> + <var name="FFLAGS">-O3</var> + </emergeenv> + <required name="blas">openblas</required> + </test> + + <test id="atlas"> + <pkg>sci-libs/atlas-3.9.68</pkg> + <emergeenv> + <var name="USE">threads</var> + </emergeenv> + </test> + + <test id="mkl"> + <pkg>sci-libs/mkl-10.3.7.256</pkg> + <skip>mkl32*</skip> + <skip>*int64*</skip> + <skip>*openmp</skip> + <skip>*dynamic*</skip> + </test> + + <test id="acml"> + <pkg>sci-libs/acml-5.1.0</pkg> + </test> + +</tests> |