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

[Andrea Arteaga]

commit:     ec1374ad483c4d7a71df5fdc4e2a983c7471bb0b
Author:     spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Fri Jul  1 16:05:49 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Fri Jul  1 16:05:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=ec1374ad

More logging (almost everything), bugs solved (multiple execution for
figures, wrong packages with no revision).

---
 .../autobench/files/python/PortageUtils.py         |   16 +++--
 app-benchmarks/autobench/files/python/btlbase.py   |   12 ++--
 app-benchmarks/autobench/files/python/main.py      |   66 ++++++++++++-------
 3 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/app-benchmarks/autobench/files/python/PortageUtils.py b/app-benchmarks/autobench/files/python/PortageUtils.py
index c162e1d..66d0b80 100644
--- a/app-benchmarks/autobench/files/python/PortageUtils.py
+++ b/app-benchmarks/autobench/files/python/PortageUtils.py
@@ -4,8 +4,9 @@ import portage
 import os
 
 class InstallException(Exception):
-    def __init__(self, command):
+    def __init__(self, command, logfile):
         self.command = command
+        self.logfile = logfile
 
 def available_packages(pattern):
     """Returns a list of packages matching the given pattern.
@@ -16,6 +17,12 @@ def available_packages(pattern):
     """
     return [portage.catpkgsplit(l) \
       for l in cmd.getoutput('equery -q list -po ' + pattern).split()]
+    
+def normalize_cpv(cpv):
+    if cpv[-1] != 'r0':
+        return '%s/%s-%s-%s' % cpv
+    else:
+        return '%s/%s-%s' % cpv[:-1]
 
 
 def install_package(package, env={}, root='/', pkgdir='usr/portage/packages',
@@ -40,10 +47,7 @@ def install_package(package, env={}, root='/', pkgdir='usr/portage/packages',
     """  
     
     # Retrieve package string
-    if package[-1] != 'r0':
-        pkg = '%s/%s-%s-%s' % package
-    else:
-        pkg = '%s/%s-%s' % package[:-1]
+    pkg = normalize_cpv(package)
     
     # Setup command line
     env['PKGDIR'] = pkgdir
@@ -69,7 +73,7 @@ def install_package(package, env={}, root='/', pkgdir='usr/portage/packages',
         fout.close()
     if p.returncode != 0:
         # In case of error, print the whole emerge command
-        raise InstallException(cl)
+        raise InstallException(cl, logfile)
     
 if __name__ == '__main__':
     # Just a test

diff --git a/app-benchmarks/autobench/files/python/btlbase.py b/app-benchmarks/autobench/files/python/btlbase.py
index a8dc3f4..d9a911a 100644
--- a/app-benchmarks/autobench/files/python/btlbase.py
+++ b/app-benchmarks/autobench/files/python/btlbase.py
@@ -1,6 +1,7 @@
 import sys, os, shlex
 import commands as cmd
 import subprocess as sp
+from os.path import join as pjoin
 
 try:
     import matplotlib.pyplot as plt
@@ -44,7 +45,8 @@ class BTLBase:
         Print = self.Print
         libdir = self.libdir
         name = self.libname
-        files = ['%s/bench_%s_%s.dat' %(testdir, op, name) for op in self.tests]
+        files = [pjoin(testdir, 'bench_%s_%s.dat' % (op, name)) \
+          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.
@@ -58,8 +60,8 @@ class BTLBase:
         if not runtests:
             Print("Not testing: results exist")
             results = {}
-            for i in self.tests:
-                results[i] = '%s/bench_%s_%s.dat' %(testdir, i, name)
+            for op in self.tests:
+                results[op] = pjoin(testdir, 'bench_%s_%s.dat'%(op,name))
             return results
         
         for i in files:
@@ -125,7 +127,7 @@ class BTLBase:
                 break
             resfile = errline.split()[-1]
             testname = resfile[6:-5-len(name)]
-            results[testname] = resfile
+            results[testname] = pjoin(testdir, resfile)
             Print(resfile)
             Print.down()
             for i in xrange(100):
@@ -190,7 +192,7 @@ class BTLBase:
                     plt.semilogx(x,y, label=impl, hold=True)
                 plt.legend(loc='best')
                 plt.grid(True)
-                fname = figdir + '/' + test + '.png'
+                fname = os.path.join(figdir, test+".png")
                 plt.savefig(fname, format='png')
                 self.Print('Figure ' + fname + ' saved')
             

diff --git a/app-benchmarks/autobench/files/python/main.py b/app-benchmarks/autobench/files/python/main.py
index 21e3c34..991d735 100644
--- a/app-benchmarks/autobench/files/python/main.py
+++ b/app-benchmarks/autobench/files/python/main.py
@@ -1,6 +1,7 @@
 #! /usr/bin/env python2
 
 import os, sys, shlex
+from os.path import join as pjoin
 from PortageUtils import *
 import subprocess as sp
 import time
@@ -8,18 +9,34 @@ import time
 # Retrieve relevant files/directories
 curdir = os.path.abspath('.')
 scriptdir = os.path.dirname(os.path.realpath(__file__))
+rootsdir = "/var/tmp/benchmarks/roots/"
+testsdir = "/var/tmp/benchmarks/tests/"
 if os.getuid() == 0:
     pkgsdir = "/var/cache/benchmarks/packages/"
-    figdir = "/var/cache/benchmarks/results/"
+    figdirb = "/var/cache/benchmarks/results/"
 else:
     pkgsdir = os.environ['HOME'] + "/.benchmarks/packages/"
-    figdir = os.environ['HOME'] + "/.benchmarks/results/"
-figdir += time.strftime('%Y%m%d-%H%M') + '/'
-rootsdir = "/var/tmp/benchmarks/roots/"
-testsdir = "/var/tmp/benchmarks/tests/"
+    figdirb = os.environ['HOME'] + "/.benchmarks/results/"
+    
+# Library directory (lib32 vs. lib64)
 libdir = sp.Popen \
   ('ABI=$(portageq envvar ABI); echo /usr/`portageq envvar LIBDIR_$ABI`/', \
   stdout=sp.PIPE, shell=True).communicate()[0].strip()
+    
+# Figures directory
+figdir = figdirb + time.strftime('%Y-%m-%d')
+if os.path.exists(figdir):
+    n = 1
+    while True:
+        figdir = figdirb + time.strftime('%Y-%m-%d') + "_%i"%n
+        if not os.path.exists(figdir):
+            os.makedirs(figdir)
+            break
+        n += 1
+else:
+    os.makedirs(figdir)
+  
+# Logs directory
 logdir = "/var/log/benchmarks/" + time.strftime('%Y-%m-%d')
 if os.path.exists(logdir):
     n = 1
@@ -145,51 +162,54 @@ input = file(testsfname).read()
 tests = tests_from_input(input)
 
 # Write summary
-print 60*'='
+print 80*'='
 print "The following tests will be run:"
 for tname, ttest in tests.items():
     print "Test: " + tname
-    print " - Package: " + "%s/%s-%s-%s" % ttest['package']
+    print " - Package: " + normalize_cpv(ttest['package'])
     print " - Environment: " + \
       ' '.join([n+'="'+v+'"' for n,v in ttest['env'].items()])
     print
-print 60*'='
+print 80*'='
 print
 
 for tn,(name,test) in enumerate(tests.items(),1):
     Print("BEGIN TEST %i - %s" % (tn, name))
     
-    pkgdir = "%s/%s/" % (pkgsdir, name)
-    root = "%s/%s/" % (rootsdir, name)
-    tlogdir = os.path.join(logdir, name)
+    pkgdir = pjoin(pkgsdir, name)
+    root = pjoin(rootsdir, name)
+    tlogdir = pjoin(logdir, name)
     os.path.exists(tlogdir) or os.makedirs(tlogdir)
     
     # Emerge package
     Print.down()
-    package = "%s/%s-%s-%s" % test['package']
-    archive = pkgdir+package+".tbz2"
+    package = normalize_cpv(test['package'])
+    archive = pjoin(pkgdir, package+".tbz2")
     Print("Emerging package %s" % package)
     if os.path.exists(archive):
         Print("Package already emerged - skipping")
     else:
         try:
-            logfile = os.path.join(tlogdir, 'emerge.log')
+            logfile = pjoin(tlogdir, 'emerge.log')
+            Print("(Run 'tail -f " + logfile + " | less' on another terminal" \
+              + " to see the progress)")
             install_package( \
               test['package'], env=test['env'], root=root, pkgdir=pkgdir, \
               logfile=logfile
               )
             # Unpack the archive onto the given root directory
-            archive = pkgdir + package + '.tbz2'
             os.path.exists(root) or os.makedirs(root)
-            tarcmd = "tar xjf " + archive + " -C " + root
-            tarp = sp.Popen(tarcmd, stdout=sp.PIPE, stderr=sp.PIPE, shell=True)
-            tarp.communicate()
+            tarcmd = ['tar', 'xjf', archive, '-C', root]
+            logfile = file(pjoin(tlogdir, 'tar.log'), 'w')
+            tarp = sp.Popen(tarcmd, stdout=logfile, stderr=sp.STDOUT)
+            tarp.wait()
+            logfile.close()
             if tarp.returncode != 0:
-                raise InstallException(tarcmd)
+                raise InstallException(tarcmd, logfile.name)
                 
         except InstallException as e:
             Print("Package %s failed to emerge" % package)
-            Print("See emerge log: " + logfile)
+            Print("Error log: " + e.logfile)
             Print.up()
             print
             continue
@@ -206,7 +226,7 @@ for tn,(name,test) in enumerate(tests.items(),1):
         Print.down()
         
         # Run the test suite
-        testdir = "%s/%s/%s" % (testsdir, name, impl)
+        testdir = os.path.join(testsdir, name, impl)
         test['results'][impl] = \
           mod.run_test(root, impl, testdir, env=test['env'], logdir=tlogdir)
         Print.up()
@@ -216,9 +236,7 @@ for tn,(name,test) in enumerate(tests.items(),1):
     
 
 # Reports will be saved in figdir
-if not os.path.exists(figdir):
-    os.makedirs(figdir)
-        
+os.path.exists(figdir) or os.makedirs(figdir)        
 results = {}
 for (name,test) in tests.items():
     if test.has_key('implementations'):