[gentoo-commits] proj/auto-numerical-bench:master commit in: app-benchmarks/autobench/files/python/

[Andrea Arteaga]

commit:     c2093208c4f1e989a4f0041e33ee3bafd72a2ae6
Author:     spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Jul  4 09:35:40 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Jul  4 09:35:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=c2093208

BaseModule introduced. Work on accuracy module.

---
 .../python/{blas_accuracy.py => basemodule.py}     |  153 ++++++++---------
 .../autobench/files/python/blas_accuracy.py        |  179 +++----------------
 app-benchmarks/autobench/files/python/blasbase.py  |   23 +---
 app-benchmarks/autobench/files/python/btlbase.py   |  188 +++-----------------
 app-benchmarks/autobench/files/python/lapack.py    |   26 +---
 5 files changed, 128 insertions(+), 441 deletions(-)

diff --git a/app-benchmarks/autobench/files/python/blas_accuracy.py b/app-benchmarks/autobench/files/python/basemodule.py
similarity index 60%
copy from app-benchmarks/autobench/files/python/blas_accuracy.py
copy to app-benchmarks/autobench/files/python/basemodule.py
index 9e13ed2..5a35cc7 100644
--- a/app-benchmarks/autobench/files/python/blas_accuracy.py
+++ b/app-benchmarks/autobench/files/python/basemodule.py
@@ -1,8 +1,8 @@
-from pprint import pprint
 from os.path import join as pjoin
 import subprocess as sp
 import shlex, os
 from htmlreport import HTMLreport
+import basemodule
 
 try:
     import matplotlib.pyplot as plt
@@ -16,7 +16,7 @@ except ImportError:
 
 run_cmd = lambda c : sp.Popen(c, stdout=sp.PIPE).communicate()[0]
 
-class Module:
+class BaseModule:
     def __init__(self, Print, libdir, args):
         self.Print = Print
         self.libdir = libdir
@@ -37,31 +37,14 @@ class Module:
                 passargs += [i]
         
         self._parse_args(passargs)
-    
-    def _initialize(self):
-        self.libname = 'blas'
-        self.avail=['axpy', 'matrix_vector', 'trisolve_vector', 'matrix_matrix']
-    
-    def _parse_args(self, args):     
-        # Parse arguments
-        tests = []
-        for i in args:
-            if i in self.avail:
-                tests.append(i)
-                continue
-            raise Exception("Argument not recognized: " + i)
-        
-        # Sort tests
-        self.tests = [i for i in self.avail if i in tests]
-        
-        # If no test is specified, then do everything
-        if len(self.tests) == 0:
-            self.tests = self.avail
            
+    # Alternatives-2 version with pkg-config
     def _get_flags(self, root, impl, libdir):
+        while libdir[0] == '/':
+            libdir = libdir[1:]
         # Retrieve pkgconfig settings and map the directories to the new root
         path = pjoin(root, "etc/env.d/alternatives", \
-          self.libname, impl, libdir, "pkgconfig")
+          self.libname,impl,libdir, "pkgconfig")
         cmd = ['pkg-config', '--libs', '--cflags', self.libname]
         env = {'PKG_CONFIG_PATH':path}
         pkgconf = sp.Popen(cmd, stdout=sp.PIPE, env=env).communicate()[0]
@@ -69,41 +52,60 @@ class Module:
         pkgconf = pkgconf.replace('-I/', '-I'+root+'/')
         return shlex.split(pkgconf)
         
+    # Alternatives-2 version
     def get_impls(self, root):
         output = sp.Popen(
-          ['eselect', '--no-color', '--brief', 'blas', 'list'],
-          env={'ROOT' : root}, stdout=sp.PIPE
-        ).communicate()[0]
+          ['eselect', '--no-color', '--brief', self.libname, 'list'],
+          env={'ROOT' : root}, stdout=sp.PIPE).communicate()[0]
         return output.strip().split('\n')
+        
+    # Base version
+    def _generateResults(self, files):
+        return dict(zip(self.tests, files))
     
     def run_test(self, root, impl, testdir, env, logdir):
+        # Convenient renames and definition of report files
         Print = self.Print
-        libdir = self.libdir
         name = self.libname
-        files = [pjoin(testdir, 'accuracy_%s_%s.dat' % (op, name)) \
-          for op in self.tests]
+        files = [pjoin(testdir,f) for f in self.files]
+        if self.libdir[0] == '/':
+            libdir = root+self.libdir
+        else:
+            libdir = pjoin(root, self.libdir)
+        
+        # Create dir. If all results already exist use them and do not perform
+        # the tests, otherwise remove every old results.
+        runtests = False
+        if os.path.exists(testdir):
+            runtests = not all([os.path.exists(i) for i in files])
+        else:
+            os.makedirs(testdir)
+            runtests = True
+        
+        if not runtests:
+            Print("Not testing: results exist")
+            return self._generateResults(files)
         
-        results = {}
-        for op in self.tests:
-            results[op] = pjoin(testdir, 'accuracy_%s_%s.dat' % (op, name))
+        for i in files:
+            if os.path.exists(i): os.remove(i)
             
         # Prepare the environment
         if env.has_key('LIBRARY_PATH'):
-            env['LIBRARY_PATH'] = pjoin(root,libdir) + ":" + env['LIBRARY_PATH']
+            env['LIBRARY_PATH'] = libdir + ":" + env['LIBRARY_PATH']
         else:
-            env['LIBRARY_PATH'] = pjoin(root, libdir)
+            env['LIBRARY_PATH'] = libdir
             
         if env.has_key('INCLUDE_PATH'):
             env['INCLUDE_PATH'] = \
-              pjoin(root, "/usr/include") + ":" + env['INCLUDE_PATH']
+              pjoin(root, "usr/include") + ":" + env['INCLUDE_PATH']
         else:
-            env['INCLUDE_PATH'] = pjoin(root, "/usr/include")
+            env['INCLUDE_PATH'] = pjoin(root, "usr/include")
             
         if env.has_key('LD_LIBRARY_PATH'):
             env['LD_LIBRARY_PATH'] = \
-              pjoin(root, libdir) + ":" + env['LD_LIBRARY_PATH']
+              libdir + ":" + env['LD_LIBRARY_PATH']
         else:
-            env['LD_LIBRARY_PATH'] = pjoin(root, libdir)
+            env['LD_LIBRARY_PATH'] = libdir
         
         # Backup the environment
         oldenv = {}
@@ -111,60 +113,51 @@ class Module:
             oldenv[k] = \
               (os.environ.has_key(k) and (os.environ[k],) or (None,))[0]
         
-        # Set the environment
+        # Set the new environment
         for k,v in env.items():
             os.environ[k] = v
         
         # Compile test suite
-        exe = pjoin(testdir, 'test')
-        source = "accuracy/main_blas.cpp"
-        flags = self._get_flags(root, impl, libdir)
-        cxxflags = run_cmd(['portageq', 'envvar', 'CXXFLAGS']).strip()
-        cxx = 'g++'
-        cmd = [cxx, '-o', exe, source] + flags + shlex.split(cxxflags)
-        logfile = pjoin(logdir, 'compile.log')
-        p = sp.Popen(cmd, stdout=file(logfile, 'w'), stderr=sp.STDOUT)
-        p.wait()
-        if p.returncode != 0:
+        logfile = os.path.join(logdir, name+"_comp.log")
+        returncode, exe = self._compileTest(logfile=logfile, testdir=testdir, \
+          root=root, impl=impl, libdir=libdir)
+        if returncode != 0:
             Print("Compilation failed")
             Print("See log: " + logfile)
             return
         Print("Compilation successful")
         
         # Run test
-        logfile = file(pjoin(logdir, name+"_run.log"), 'w')
-        cmd = [pjoin(testdir,"test")] + self.tests
-        proc = sp.Popen(cmd, bufsize=1, stdout=sp.PIPE, stderr=sp.PIPE,
-          cwd=testdir)
-        Print.down()
-        while True:
-            line = proc.stdout.readline()
-            if not line:
-                break
-            logfile.write(line)
-            if len(line.strip()) == 0:
-                continue
-            if line[0] != ' ':
-                Print.up()
-                Print(line.strip().split()[-1])
-                Print.down()
-            else:
-                Print(line.strip())
-        Print.up()          
-        logfile.close()      
-        proc.wait()
-        if proc.returncode != 0:
-            Print('Test failed')
-        else:
-            Print('Test successful')
-        
-        return results
+        logfile = pjoin(logdir, name+"_run.log")
+        retcode = self._executeTest(logfile=logfile, exe=exe, testdir=testdir)
+        if returncode != 0:
+            Print("Test failed")
+            Print("See log: " + logfile)
+            return
+        Print("Test successful")
         
+        # Restore the old environment
+        for k in env.keys():
+            if oldenv[k] != None:
+                os.environ[k] = oldenv[k]
+            elif os.environ.has_key(k):
+                del os.environ[k]
+                
+        # Return
+        return self._generateResults(files)
+    
     
-    def save_results(self, results, figdir):
+    def save_results(self, results, figdir, plottype='plot'):
         if not with_images:
             self.Print("Report generation skipped - missing libraries")
             return
+        
+        if plottype == 'plot': plotf = plt.plot
+        elif plottype == 'semilogx': plotf = plt.semilogx
+        elif plottype == 'semilogy': plotf = plt.semilogy
+        elif plottype == 'loglog': plotf = plt.loglog
+        else:
+            raise Exception('Unrecognized plot type: "' + plottype + '"')
     
         # Re-order the result dictionary
         newresults = {}
@@ -189,7 +182,7 @@ class Module:
                 plt.title(test)
                 for impl in newresults[test]:
                     x,y = np.loadtxt(newresults[test][impl], unpack=True)
-                    plt.loglog(x,y, label=impl, hold=True)
+                    plotf(x,y, label=impl, hold=True)
                 plt.legend(loc='best')
                 plt.grid(True)
             fname = pjoin(figdir, 'summary.png')
@@ -203,7 +196,7 @@ class Module:
                 plt.figure(figsize=(12,9), dpi=300)
                 for impl in newresults[test]:
                     x,y = np.loadtxt(newresults[test][impl], unpack=True)
-                    plt.loglog(x,y, label=impl, hold=True)
+                    plotf(x,y, label=impl, hold=True)
                 plt.legend(loc='best')
                 plt.grid(True)
                 fname = pjoin(figdir, test+".png")
@@ -212,5 +205,3 @@ class Module:
                 self.Print('Figure ' + fname + ' saved')
         
         html.close()
-            
-            

diff --git a/app-benchmarks/autobench/files/python/blas_accuracy.py b/app-benchmarks/autobench/files/python/blas_accuracy.py
index 9e13ed2..edbf343 100644
--- a/app-benchmarks/autobench/files/python/blas_accuracy.py
+++ b/app-benchmarks/autobench/files/python/blas_accuracy.py
@@ -1,8 +1,8 @@
-from pprint import pprint
 from os.path import join as pjoin
 import subprocess as sp
 import shlex, os
 from htmlreport import HTMLreport
+import basemodule
 
 try:
     import matplotlib.pyplot as plt
@@ -16,27 +16,7 @@ except ImportError:
 
 run_cmd = lambda c : sp.Popen(c, stdout=sp.PIPE).communicate()[0]
 
-class Module:
-    def __init__(self, Print, libdir, args):
-        self.Print = Print
-        self.libdir = libdir
-        self.summary = False
-        self.summary_only = False
-        
-        self._initialize()
-        
-        passargs = []
-        for i in args:
-            if i == '-S':
-                self.summary_only = True
-                continue
-            elif i == '-s':
-                self.summary = True
-                continue
-            else:
-                passargs += [i]
-        
-        self._parse_args(passargs)
+class Module(basemodule.BaseModule):
     
     def _initialize(self):
         self.libname = 'blas'
@@ -57,86 +37,29 @@ class Module:
         # If no test is specified, then do everything
         if len(self.tests) == 0:
             self.tests = self.avail
-           
-    def _get_flags(self, root, impl, libdir):
-        # Retrieve pkgconfig settings and map the directories to the new root
-        path = pjoin(root, "etc/env.d/alternatives", \
-          self.libname, impl, libdir, "pkgconfig")
-        cmd = ['pkg-config', '--libs', '--cflags', self.libname]
-        env = {'PKG_CONFIG_PATH':path}
-        pkgconf = sp.Popen(cmd, stdout=sp.PIPE, env=env).communicate()[0]
-        pkgconf = pkgconf.replace('-L/', '-L'+root+'/')
-        pkgconf = pkgconf.replace('-I/', '-I'+root+'/')
-        return shlex.split(pkgconf)
-        
-    def get_impls(self, root):
-        output = sp.Popen(
-          ['eselect', '--no-color', '--brief', 'blas', 'list'],
-          env={'ROOT' : root}, stdout=sp.PIPE
-        ).communicate()[0]
-        return output.strip().split('\n')
-    
-    def run_test(self, root, impl, testdir, env, logdir):
-        Print = self.Print
-        libdir = self.libdir
-        name = self.libname
-        files = [pjoin(testdir, 'accuracy_%s_%s.dat' % (op, name)) \
+         
+        # Generate list of dat (result) files, relative to the testdir
+        self.files = [pjoin('accuracy_%s_%s.dat' % (op, name)) \
           for op in self.tests]
         
-        results = {}
-        for op in self.tests:
-            results[op] = pjoin(testdir, 'accuracy_%s_%s.dat' % (op, name))
-            
-        # Prepare the environment
-        if env.has_key('LIBRARY_PATH'):
-            env['LIBRARY_PATH'] = pjoin(root,libdir) + ":" + env['LIBRARY_PATH']
-        else:
-            env['LIBRARY_PATH'] = pjoin(root, libdir)
-            
-        if env.has_key('INCLUDE_PATH'):
-            env['INCLUDE_PATH'] = \
-              pjoin(root, "/usr/include") + ":" + env['INCLUDE_PATH']
-        else:
-            env['INCLUDE_PATH'] = pjoin(root, "/usr/include")
-            
-        if env.has_key('LD_LIBRARY_PATH'):
-            env['LD_LIBRARY_PATH'] = \
-              pjoin(root, libdir) + ":" + env['LD_LIBRARY_PATH']
-        else:
-            env['LD_LIBRARY_PATH'] = pjoin(root, libdir)
-        
-        # Backup the environment
-        oldenv = {}
-        for k in env.keys():
-            oldenv[k] = \
-              (os.environ.has_key(k) and (os.environ[k],) or (None,))[0]
-        
-        # Set the environment
-        for k,v in env.items():
-            os.environ[k] = v
-        
-        # Compile test suite
+    def _compileTest(self, logfile, testdir, root, impl, *args, **kwargs):
         exe = pjoin(testdir, 'test')
         source = "accuracy/main_blas.cpp"
-        flags = self._get_flags(root, impl, libdir)
+        flags = self._get_flags(root, impl, self.libdir)
         cxxflags = run_cmd(['portageq', 'envvar', 'CXXFLAGS']).strip()
         cxx = 'g++'
         cmd = [cxx, '-o', exe, source] + flags + shlex.split(cxxflags)
-        logfile = pjoin(logdir, 'compile.log')
-        p = sp.Popen(cmd, stdout=file(logfile, 'w'), stderr=sp.STDOUT)
-        p.wait()
-        if p.returncode != 0:
-            Print("Compilation failed")
-            Print("See log: " + logfile)
-            return
-        Print("Compilation successful")
-        
-        # Run test
-        logfile = file(pjoin(logdir, name+"_run.log"), 'w')
-        cmd = [pjoin(testdir,"test")] + self.tests
+        proc = sp.Popen(cmd, stdout=file(logfile, 'w'), stderr=sp.STDOUT)
+        proc.wait()
+        return proc.returncode, exe
+    
+    def _executeTest(self, logfile, exe, testdir):
+        # TODO: control objdump and nm
+        logfile = file(logfile, 'w')
+        cmd = [exe] + self.tests
         proc = sp.Popen(cmd, bufsize=1, stdout=sp.PIPE, stderr=sp.PIPE,
           cwd=testdir)
-        Print.down()
+        self.Print.down()
         while True:
             line = proc.stdout.readline()
             if not line:
@@ -145,72 +68,18 @@ class Module:
             if len(line.strip()) == 0:
                 continue
             if line[0] != ' ':
-                Print.up()
-                Print(line.strip().split()[-1])
-                Print.down()
+                self.Print.up()
+                self.Print(line.strip().split()[-1])
+                self.Print.down()
             else:
-                Print(line.strip())
-        Print.up()          
+                self.Print(line.strip())
+        self.Print.up()          
         logfile.close()      
         proc.wait()
-        if proc.returncode != 0:
-            Print('Test failed')
-        else:
-            Print('Test successful')
-        
-        return results
-        
+        return proc.returncode
+
     
     def save_results(self, results, figdir):
-        if not with_images:
-            self.Print("Report generation skipped - missing libraries")
-            return
-    
-        # Re-order the result dictionary
-        newresults = {}
-        for test in self.tests:
-            newresults[test] = {}
-            for nameimpl in results:
-                nameimplstr = pjoin(*nameimpl)
-                resdat = results[nameimpl][test]
-                newresults[test][nameimplstr] = resdat
-        
-        # Begin the HTML report
-        htmlfname = pjoin(figdir, 'index.html')
-        html = HTMLreport(htmlfname)
-        
-        # Generate summary - a single image with all plots
-        if self.summary or self.summary_only:
-            # Save summary figure
-            sprows = (len(self.tests)+1)/2
-            plt.figure(figsize=(16,6*sprows), dpi=300)
-            for i, test in enumerate(self.tests, 1):
-                plt.subplot(sprows, 2, i)
-                plt.title(test)
-                for impl in newresults[test]:
-                    x,y = np.loadtxt(newresults[test][impl], unpack=True)
-                    plt.loglog(x,y, label=impl, hold=True)
-                plt.legend(loc='best')
-                plt.grid(True)
-            fname = pjoin(figdir, 'summary.png')
-            plt.savefig(fname, format='png')
-            html.addFig("Summary", image=os.path.basename(fname), width='95%')
-            self.Print('Summary figure saved: ' + fname)
-                
-        # Generate plots
-        if not self.summary_only:
-            for test in self.tests:
-                plt.figure(figsize=(12,9), dpi=300)
-                for impl in newresults[test]:
-                    x,y = np.loadtxt(newresults[test][impl], unpack=True)
-                    plt.loglog(x,y, label=impl, hold=True)
-                plt.legend(loc='best')
-                plt.grid(True)
-                fname = pjoin(figdir, test+".png")
-                plt.savefig(fname, format='png')
-                html.addFig(test, image=os.path.basename(fname))
-                self.Print('Figure ' + fname + ' saved')
-        
-        html.close()
+        basemodule.BaseModule.save_results(self, results,figdir, 'loglog')
             
             

diff --git a/app-benchmarks/autobench/files/python/blasbase.py b/app-benchmarks/autobench/files/python/blasbase.py
index 2ca9070..d2e4edd 100644
--- a/app-benchmarks/autobench/files/python/blasbase.py
+++ b/app-benchmarks/autobench/files/python/blasbase.py
@@ -36,6 +36,8 @@ class BLASBase(btlbase.BTLBase):
         if len(self.tests) == 0:
             self.tests = ['axpy', 'matrix_vector', \
               'trisolve_vector', 'matrix_matrix']
+        
+        btlbase.BTLBase._parse_args(self, args)
     
     @staticmethod
     def _btl_source():
@@ -47,24 +49,3 @@ class BLASBase(btlbase.BTLBase):
     
     def _btl_defines(self):
         return ["CBLASNAME=" + self.libname, "BLAS_INTERFACE"]
-           
-    def _get_flags(self, root, impl, libdir):
-        # Retrieve pkgconfig settings and map the directories to the new root
-        path = pjoin(root, "etc/env.d/alternatives", \
-          self.libname,impl,libdir, "pkgconfig")
-        cmd = ['pkg-config', '--libs', '--cflags', self.libname]
-        env = {'PKG_CONFIG_PATH':path}
-        pkgconf = sp.Popen(cmd, stdout=sp.PIPE, env=env).communicate()[0]
-        pkgconf = pkgconf.replace('-L/', '-L'+root+'/')
-        pkgconf = pkgconf.replace('-I/', '-I'+root+'/')
-        return shlex.split(pkgconf)
-        
-        
-    def get_impls(self, root):
-        output = sp.Popen(
-          ['eselect', '--no-color', '--brief', self.libname, 'list'],
-          env={'ROOT' : root}, stdout=sp.PIPE
-        ).communicate()[0]
-        return output.strip().split('\n')
-
-del btlbase

diff --git a/app-benchmarks/autobench/files/python/btlbase.py b/app-benchmarks/autobench/files/python/btlbase.py
index 1c6f8aa..5e07178 100644
--- a/app-benchmarks/autobench/files/python/btlbase.py
+++ b/app-benchmarks/autobench/files/python/btlbase.py
@@ -3,6 +3,7 @@ import commands as cmd
 import subprocess as sp
 from os.path import join as pjoin
 from htmlreport import HTMLreport
+import basemodule
 
 try:
     import matplotlib.pyplot as plt
@@ -95,110 +96,36 @@ def btlcompile(exe, source, btldir, includes, defines, libs, libdirs, other, \
     return cp.returncode
 
 
-class BTLBase:
-    def __init__(self, Print, libdir, args):
-        self.Print = Print
-        self.libdir = libdir
-        self.summary = False
-        self.summary_only = False
-        
-        self._initialize()
-        
-        passargs = []
-        for i in args:
-            if i == '-S':
-                self.summary_only = True
-                continue
-            elif i == '-s':
-                self.summary = True
-                continue
-            else:
-                passargs += [i]
-        
-        self._parse_args(passargs)
-        
-          
-    def run_test(self, root, impl, testdir, env, logdir):
-        # Convenient renames and definition of report files 
-        Print = self.Print
-        libdir = self.libdir
-        name = self.libname
-        files = [pjoin(testdir, 'bench_%s_%s.dat' % (op, name)) \
+class BTLBase(basemodule.BaseModule):
+    
+    def _parse_args(self, args):
+        # Generate list of dat (result) files, relative to the testdir
+        self.files = [pjoin('bench_%s_%s.dat' % (op, self.libname)) \
           for op in self.tests]
-        
-        # Create dir. If all results already exist use them and do not perform
-        # the tests, otherwise remove every old results.
-        runtests = False
-        if os.path.exists(testdir):
-            runtests = not all([os.path.exists(i) for i in files])
-        else:
-            os.makedirs(testdir)
-            runtests = True
-        
-        if not runtests:
-            Print("Not testing: results exist")
-            results = {}
-            for op in self.tests:
-                results[op] = pjoin(testdir, 'bench_%s_%s.dat'%(op,name))
-            return results
-        
-        for i in files:
-            if os.path.exists(i): os.remove(i)
-            
-        # Prepare the environment
-        if env.has_key('LIBRARY_PATH'):
-            env['LIBRARY_PATH'] = pjoin(root,libdir) + ":" + env['LIBRARY_PATH']
-        else:
-            env['LIBRARY_PATH'] = pjoin(root, libdir)
-            
-        if env.has_key('INCLUDE_PATH'):
-            env['INCLUDE_PATH'] = \
-              pjoin(root, "/usr/include") + ":" + env['INCLUDE_PATH']
-        else:
-            env['INCLUDE_PATH'] = pjoin(root, "/usr/include")
-            
-        if env.has_key('LD_LIBRARY_PATH'):
-            env['LD_LIBRARY_PATH'] = \
-              pjoin(root, libdir) + ":" + env['LD_LIBRARY_PATH']
-        else:
-            env['LD_LIBRARY_PATH'] = pjoin(root, libdir)
-        
-        # Backup the environment
-        oldenv = {}
-        for k in env.keys():
-            oldenv[k] = \
-              (os.environ.has_key(k) and (os.environ[k],) or (None,))[0]
-        
-        # Set the environment
-        for k,v in env.items():
-            os.environ[k] = v
-        
-        # Compile test suite
+    
+    def _compileTest(self, logfile, testdir, root, impl, libdir, \
+      *args, **kwargs):
         btldir = 'btl/'
-        logfile = os.path.join(logdir, name+"_comp.log")
+        exe = pjoin(testdir, "test")
         returncode = btlcompile(
-          exe = pjoin(testdir, "test"),
+          exe = exe,
           source = pjoin(btldir, self._btl_source()),
           btldir = btldir,
           includes = [pjoin(btldir, d) for d in self._btl_includes()],
           defines = self._btl_defines(),
           libs = [],
-          libdirs = [root+libdir],
-          other = self._get_flags(root, impl, libdir),
+          libdirs = [libdir],
+          other = self._get_flags(root, impl, self.libdir),
           logfile = logfile
         )
-        if returncode != 0:
-            Print("Compilation failed")
-            Print("See log: " + logfile)
-            return
-        Print("Compilation successful")
-        
-        # Run test
-        logfile = file(pjoin(logdir, name+"_run.log"), 'w')
-        args = [pjoin(testdir,"test")] + self.tests
+        return returncode, exe
+    
+    def _executeTest(self, logfile, exe, testdir):
+        # TODO: control objdump and nm
+        logfile = file(logfile, 'w')
+        args = [exe] + self.tests
         proc = sp.Popen(args, bufsize=1, stdout=sp.PIPE, stderr=sp.PIPE, 
           cwd = testdir)
-        results = {}
         while True:
             # Each operation test begins with a line on stderr
             errline = proc.stderr.readline()
@@ -206,82 +133,19 @@ class BTLBase:
                 break
             logfile.write(errline)
             resfile = errline.split()[-1]
-            testname = resfile[6:-5-len(name)]
-            results[testname] = pjoin(testdir, resfile)
-            Print(resfile)
+            testname = resfile[6:-5-len(self.libname)]
+            self.Print(resfile)
             
             # 100 different sizes for each operation test
-            Print.down()
+            self.Print.down()
             for i in xrange(100):
                 outline = proc.stdout.readline()
                 logfile.write(outline)
-                Print(outline.rstrip())
-            Print.up()
+                self.Print(outline.strip())
+            self.Print.up()
         logfile.close()
         proc.wait()
-        if proc.returncode != 0:
-            Print('Test failed')
-        else:
-            Print('Test successful')
-        
-        # Restore the old environment
-        for k in env.keys():
-            if oldenv[k] != None:
-                os.environ[k] = oldenv[k]
-            elif os.environ.has_key(k):
-                del os.environ[k]
-        return results
+        return proc.returncode
     
     def save_results(self, results, figdir):
-        if not with_images:
-            self.Print("Report generation skipped - missing libraries")
-            return
-    
-        # Re-order the result dictionary
-        newresults = {}
-        for test in self.tests:
-            newresults[test] = {}
-            for nameimpl in results:
-                nameimplstr = pjoin(*nameimpl)
-                resdat = results[nameimpl][test]
-                newresults[test][nameimplstr] = resdat
-        
-        # Begin the HTML report
-        htmlfname = pjoin(figdir, 'index.html')
-        html = HTMLreport(htmlfname)
-        
-        # Generate summary - a single image with all plots
-        if self.summary or self.summary_only:
-            # Save summary figure
-            sprows = (len(self.tests)+1)/2
-            plt.figure(figsize=(16,6*sprows), dpi=300)
-            for i, test in enumerate(self.tests, 1):
-                plt.subplot(sprows, 2, i)
-                plt.title(test)
-                for impl in newresults[test]:
-                    x,y = np.loadtxt(newresults[test][impl], unpack=True)
-                    plt.semilogx(x,y, label=impl, hold=True)
-                plt.legend(loc='best')
-                plt.grid(True)
-            fname = pjoin(figdir, 'summary.png')
-            plt.savefig(fname, format='png')
-            html.addFig("Summary", image=os.path.basename(fname), width='95%')
-            self.Print('Summary figure saved: ' + fname)
-                
-        # Generate plots
-        if not self.summary_only:
-            for test in self.tests:
-                plt.figure(figsize=(12,9), dpi=300)
-                for impl in newresults[test]:
-                    x,y = np.loadtxt(newresults[test][impl], unpack=True)
-                    plt.semilogx(x,y, label=impl, hold=True)
-                plt.legend(loc='best')
-                plt.grid(True)
-                fname = pjoin(figdir, test+".png")
-                plt.savefig(fname, format='png')
-                html.addFig(test, image=os.path.basename(fname))
-                self.Print('Figure ' + fname + ' saved')
-        
-        html.close()
-            
-            
+        basemodule.BaseModule.save_results(self, results,figdir, 'semilogx')

diff --git a/app-benchmarks/autobench/files/python/lapack.py b/app-benchmarks/autobench/files/python/lapack.py
index ec98cd5..136d837 100644
--- a/app-benchmarks/autobench/files/python/lapack.py
+++ b/app-benchmarks/autobench/files/python/lapack.py
@@ -23,34 +23,16 @@ class Module(btlbase.BTLBase):
         # If no test is specified, run everything
         if len(self.tests) == 0:
             self.tests = self.avail
+        
+        btlbase.BTLBase._parse_args(self, args)
     
     @staticmethod
     def _btl_source():
-        return "/libs/LAPACK/main.cpp"
+        return "libs/LAPACK/main.cpp"
     
     @staticmethod
     def _btl_includes():
-        return ["/libs/BLAS", "libs/LAPACK"]
+        return ["libs/BLAS", "libs/LAPACK"]
     
     def _btl_defines(self):
         return ["LAPACKNAME=" + self.libname]
-           
-    def _get_flags(self, root, impl, libdir):
-        # Retrieve pkgconfig settings and map the directories to the new root
-        path = "%s/etc/env.d/alternatives/%s/%s/%s/pkgconfig" % \
-          (root, self.libname, impl, libdir)
-        pkgconf = sp.Popen('pkg-config --libs --cflags lapack', shell=True, \
-          stdout=sp.PIPE, env={'PKG_CONFIG_PATH':path}).communicate()[0]
-        pkgconf = pkgconf.replace('-L/', '-L'+root+'/')
-        pkgconf = pkgconf.replace('-I/', '-I'+root+'/')
-        return shlex.split(pkgconf)
-        
-        
-    def get_impls(self, root):
-        output = sp.Popen(
-          ['eselect', '--no-color', '--brief', self.libname, 'list'],
-          env={'ROOT' : root}, stdout=sp.PIPE
-        ).communicate()[0]
-        return output.strip().split('\n')
-
-del btlbase