diff options
author | 2012-08-05 23:03:15 +0200 | |
---|---|---|
committer | 2012-08-05 23:03:15 +0200 | |
commit | d646bdf12287efef4a199bffadfba22d60042aa9 (patch) | |
tree | 8574aba2554d3ec95588a36b2bd6fcece45c958c | |
parent | Updated openblas sample (diff) | |
download | auto-numerical-bench-d646bdf12287efef4a199bffadfba22d60042aa9.tar.gz auto-numerical-bench-d646bdf12287efef4a199bffadfba22d60042aa9.tar.bz2 auto-numerical-bench-d646bdf12287efef4a199bffadfba22d60042aa9.zip |
Cleaned modules.
-rw-r--r-- | numbench/modules/blas.py | 20 | ||||
-rw-r--r-- | numbench/modules/cblas.py | 20 | ||||
-rw-r--r-- | numbench/modules/lapack.py | 19 | ||||
-rw-r--r-- | numbench/modules/lapacke.py | 1 | ||||
-rw-r--r-- | numbench/modules/scalapack.py | 38 |
5 files changed, 19 insertions, 79 deletions
diff --git a/numbench/modules/blas.py b/numbench/modules/blas.py index 24834f5..738f3ce 100644 --- a/numbench/modules/blas.py +++ b/numbench/modules/blas.py @@ -26,23 +26,3 @@ class Module: runTest = base.runTest getTests = base.getTests reportConf = base.reportConf - - - -if __name__ == '__main__': - import os - import benchconfig as cfg - - -# m = Module(('1', 'matrix_matrix')) - m = Module(('axpy',)) - mytest = dict( - root='/home/spiros/packages/sci-libs/blasroot', - testdir='/home/spiros/tests/blas-reference', - logdir='/home/spiros/tests/log/blas-reference', - compileenv = {}, - runenv = {'PATH':os.environ['PATH']} - ) - cfg.libdir = 'usr/lib' - cfg.btldir = '/home/spiros/hg/btl' - print m.runTest(mytest, 'reference')
\ No newline at end of file diff --git a/numbench/modules/cblas.py b/numbench/modules/cblas.py index a0ef2c7..9371c9b 100644 --- a/numbench/modules/cblas.py +++ b/numbench/modules/cblas.py @@ -26,23 +26,3 @@ class Module: runTest = base.runTest getTests = base.getTests reportConf = base.reportConf - - - -if __name__ == '__main__': - import os - import benchconfig as cfg - - -# m = Module(('1', 'matrix_matrix')) - m = Module(('axpy',)) - mytest = dict( - root='/home/spiros/packages/sci-libs/cblasroot', - testdir='/home/spiros/tests/cblas-reference', - logdir='/home/spiros/tests/log/cblas-reference', - compileenv = {}, - runenv = {'PATH':os.environ['PATH']} - ) - cfg.libdir = 'usr/lib' - cfg.btldir = '/home/spiros/hg/btl' - print m.runTest(mytest, 'reference')
\ No newline at end of file diff --git a/numbench/modules/lapack.py b/numbench/modules/lapack.py index 13e46d5..35bbe92 100644 --- a/numbench/modules/lapack.py +++ b/numbench/modules/lapack.py @@ -26,22 +26,3 @@ class Module: runTest = base.runTest getTests = base.getTests reportConf = base.reportConf - - -if __name__ == '__main__': - import os - import benchconfig as cfg - - -# m = Module(('1', 'matrix_matrix')) - m = Module(('lu_decomp', 'qr_decomp')) - mytest = dict( - root='/home/spiros/packages/sci-libs/lapackroot', - testdir='/home/spiros/tests/lapack-reference', - logdir='/home/spiros/tests/log/lapack-reference', - compileenv = {}, - runenv = {'PATH':os.environ['PATH']} - ) - cfg.libdir = 'usr/lib' - cfg.btldir = '/home/spiros/hg/btl' - print m.runTest(mytest, 'reference')
\ No newline at end of file diff --git a/numbench/modules/lapacke.py b/numbench/modules/lapacke.py index 2f300b7..5ba4558 100644 --- a/numbench/modules/lapacke.py +++ b/numbench/modules/lapacke.py @@ -26,4 +26,3 @@ class Module: runTest = base.runTest getTests = base.getTests reportConf = base.reportConf - diff --git a/numbench/modules/scalapack.py b/numbench/modules/scalapack.py index 03fa190..bb75d2d 100644 --- a/numbench/modules/scalapack.py +++ b/numbench/modules/scalapack.py @@ -28,7 +28,7 @@ defaultTests = availableTests class Module: libname = 'scalapack' descr = 'Test module for ScaLAPACK implementations' - + def __init__(self, args): passargs = [] skip = 0 @@ -38,38 +38,38 @@ class Module: skip -= 1 continue elif a in ('-n', '--numproc'): - self.numproc = int(args[i+1]) + self.numproc = int(args[i + 1]) else: passargs.append(a) - + self.tests = btl.selectTests(availableTests, args) if len(self.tests) == 0: self.tests = defaultTests - + def getImplementations(self, test): return alt.getImplementations(test['root'], self.libname) - + def runTest(self, test, implementation): - btlincludes = ['libs/'+i for i in \ + btlincludes = ['libs/' + i for i in \ ('BLAS', 'LAPACK', 'BLACS', 'PBLAS', 'STL')] - + # Set up btlconfig btlconfig = dict ( - CXX = 'mpic++', - source = 'libs/PBLAS/main.cpp', - preargs = ('mpirun', '-np', str(self.numproc)), - exe = pjoin(test['testdir'], implementation, 'test'), - logdir = pjoin(test['logdir'], implementation), - testdir = pjoin(test['testdir'], implementation), - btlincludes = tuple(btlincludes), - defines = ('PBLASNAME='+self.libname, ), - flags = alt.getFlags(test, self.libname, implementation), - tests = self.tests + CXX='mpic++', + source='libs/PBLAS/main.cpp', + preargs=('mpirun', '-np', str(self.numproc)), + exe=pjoin(test['testdir'], implementation, 'test'), + logdir=pjoin(test['logdir'], implementation), + testdir=pjoin(test['testdir'], implementation), + btlincludes=tuple(btlincludes), + defines=('PBLASNAME=' + self.libname,), + flags=alt.getFlags(test, self.libname, implementation), + tests=self.tests ) return btlBase.runTest(self, test, btlconfig) getTests = btlBase.getTests reportConf = btlBase.reportConf - - + + |