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

[Andrea Arteaga]

commit:     fb65f8feeb8a6d2fa0a293a38678f325afc75139
Author:     spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Wed Jul 13 09:57:21 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Wed Jul 13 09:57:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=fb65f8fe

Some changes.

---
 .../autobench/files/python/PortageUtils.py         |    2 +-
 .../autobench/files/python/benchutils.py           |   25 +-------------------
 app-benchmarks/autobench/files/python/blastests.in |    2 +-
 app-benchmarks/autobench/files/python/main.py      |    6 ++--
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/app-benchmarks/autobench/files/python/PortageUtils.py b/app-benchmarks/autobench/files/python/PortageUtils.py
index 66d0b80..5bd4c1d 100644
--- a/app-benchmarks/autobench/files/python/PortageUtils.py
+++ b/app-benchmarks/autobench/files/python/PortageUtils.py
@@ -66,7 +66,7 @@ def install_package(package, env={}, root='/', pkgdir='usr/portage/packages',
     p = sp.Popen( \
       ['emerge', '--ignore-default-opts', '-OB', '=' + pkg], \
       env = env, \
-      stdout = fout, stderr = fout \
+      stdout = fout, stderr = sp.STDOUT \
       )
     p.wait()
     if logfile is not None:

diff --git a/app-benchmarks/autobench/files/python/benchutils.py b/app-benchmarks/autobench/files/python/benchutils.py
index 3122f0f..748f928 100644
--- a/app-benchmarks/autobench/files/python/benchutils.py
+++ b/app-benchmarks/autobench/files/python/benchutils.py
@@ -8,27 +8,4 @@ def mkdir(dir):
     if not os.path.exists(dir):
         os.makedirs(dir)
         
-run_cmd = lambda c : sp.Popen(c, stdout=sp.PIPE).communicate()[0]
-
-    
-if __name__ == '__main__':
-    cfg.libdir = '/usr/lib64'
-    root = '/var/tmp/benchmarks/roots/atlas'
-    pfile = pc.GetFile('lapack', 'atlas', root)
-    print pc.Run(pfile, root, False)
-    
-    print pfile
-    req = pc.Requires(pfile)
-    print req
-    change = sys.argv[1:]
-    print change
-    changes = dict([k.split(':',1) for k in change])
-    deps = []
-    for r in req:
-        if r in changes.keys():
-            impl = changes[r]
-            pfile = pc.GetFile(r, changes[r])
-            print pc.Run(pfile)
-        else:
-            print pc.Run(r)
-        
\ No newline at end of file
+run_cmd = lambda c : sp.Popen(c, stdout=sp.PIPE).communicate()[0]
\ No newline at end of file

diff --git a/app-benchmarks/autobench/files/python/blastests.in b/app-benchmarks/autobench/files/python/blastests.in
index d7b1a41..4a6900d 100644
--- a/app-benchmarks/autobench/files/python/blastests.in
+++ b/app-benchmarks/autobench/files/python/blastests.in
@@ -1,6 +1,6 @@
 # Testing almost all implementations using gcc-4.6.1 and enabling vectorization
 
-blas-reference sci-libs/blas-reference-3.3.1-r1 FC=gfortran-4.6.1 FFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"
+blas-reference sci-libs/blas-reference-3.3.1-r1 FC=gfortran-4.5.2 FFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"
 acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp -acml64-gfortran-openmp
 goto sci-libs/gotoblas2-1.13 CFLAGS="-O3 -march=native" USE='incblas' TARGET=NEHALEM
 atlas sci-libs/atlas-3.9.41 CC=gcc-4.6.1 CFLAGS="-O3 -pipe -march=native -msse3 -msse4.1 -msse4.2"

diff --git a/app-benchmarks/autobench/files/python/main.py b/app-benchmarks/autobench/files/python/main.py
index 10a2091..47d72eb 100644
--- a/app-benchmarks/autobench/files/python/main.py
+++ b/app-benchmarks/autobench/files/python/main.py
@@ -121,12 +121,12 @@ if not os.path.exists(cfg.inputfile):
     print_usage()
     exit(1)
 input = file(cfg.inputfile).read()
-tests = tests_from_input(input)
+cfg.tests = tests_from_input(input)
 
 # Write summary
 print 80*'='
 print "The following tests will be run:"
-for tname, ttest in tests.items():
+for tname, ttest in cfg.tests.items():
     print "Test: " + tname
     if ttest['descr'] is not None:
         print " - Description: " + ttest['descr']
@@ -145,7 +145,7 @@ for tname, ttest in tests.items():
 print 80*'='
 print
 
-for tn,(name,test) in enumerate(tests.items(),1):
+for tn,(name,test) in enumerate(cfg.tests.items(),1):
     Print._level = 0
     Print("BEGIN TEST %i - %s" % (tn, name))