From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QgwG7-00059j-Rv for garchives@archives.gentoo.org; Wed, 13 Jul 2011 10:01:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19C3A21C01F; Wed, 13 Jul 2011 10:01:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C997C21C01F for ; Wed, 13 Jul 2011 10:01:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10F422AC0B5 for ; Wed, 13 Jul 2011 10:01:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 314108003D for ; Wed, 13 Jul 2011 10:01:25 +0000 (UTC) From: "Andrea Arteaga" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrea Arteaga" Message-ID: Subject: [gentoo-commits] proj/auto-numerical-bench:master commit in: app-benchmarks/autobench/files/python/ X-VCS-Repository: proj/auto-numerical-bench X-VCS-Files: app-benchmarks/autobench/files/python/PortageUtils.py app-benchmarks/autobench/files/python/benchutils.py app-benchmarks/autobench/files/python/blastests.in app-benchmarks/autobench/files/python/main.py X-VCS-Directories: app-benchmarks/autobench/files/python/ X-VCS-Committer: spiros X-VCS-Committer-Name: Andrea Arteaga X-VCS-Revision: fb65f8feeb8a6d2fa0a293a38678f325afc75139 Date: Wed, 13 Jul 2011 10:01:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 011622b35bce8a2247fa4a644ada641a commit: fb65f8feeb8a6d2fa0a293a38678f325afc75139 Author: spiros gmail com> AuthorDate: Wed Jul 13 09:57:21 2011 +0000 Commit: Andrea Arteaga gmail com> CommitDate: Wed Jul 13 09:57:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/auto-numerica= l-bench.git;a=3Dcommit;h=3Dfb65f8fe 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=3D{}, root=3D'/', pkgd= ir=3D'usr/portage/packages', p =3D sp.Popen( \ ['emerge', '--ignore-default-opts', '-OB', '=3D' + pkg], \ env =3D env, \ - stdout =3D fout, stderr =3D fout \ + stdout =3D fout, stderr =3D sp.STDOUT \ ) p.wait() if logfile is not None: diff --git a/app-benchmarks/autobench/files/python/benchutils.py b/app-be= nchmarks/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) =20 -run_cmd =3D lambda c : sp.Popen(c, stdout=3Dsp.PIPE).communicate()[0] - - =20 -if __name__ =3D=3D '__main__': - cfg.libdir =3D '/usr/lib64' - root =3D '/var/tmp/benchmarks/roots/atlas' - pfile =3D pc.GetFile('lapack', 'atlas', root) - print pc.Run(pfile, root, False) - =20 - print pfile - req =3D pc.Requires(pfile) - print req - change =3D sys.argv[1:] - print change - changes =3D dict([k.split(':',1) for k in change]) - deps =3D [] - for r in req: - if r in changes.keys(): - impl =3D changes[r] - pfile =3D pc.GetFile(r, changes[r]) - print pc.Run(pfile) - else: - print pc.Run(r) - =20 \ No newline at end of file +run_cmd =3D lambda c : sp.Popen(c, stdout=3Dsp.PIPE).communicate()[0] \ No newline at end of file diff --git a/app-benchmarks/autobench/files/python/blastests.in b/app-ben= chmarks/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 vector= ization =20 -blas-reference sci-libs/blas-reference-3.3.1-r1 FC=3Dgfortran-4.6.1 FFLA= GS=3D"-O3 -pipe -march=3Dnative -msse3 -msse4.1 -msse4.2" +blas-reference sci-libs/blas-reference-3.3.1-r1 FC=3Dgfortran-4.5.2 FFLA= GS=3D"-O3 -pipe -march=3Dnative -msse3 -msse4.1 -msse4.2" acml sci-libs/acml-4.4.0-r1 -acml32-gfortran -acml32-gfortran-openmp -ac= ml64-gfortran-openmp goto sci-libs/gotoblas2-1.13 CFLAGS=3D"-O3 -march=3Dnative" USE=3D'incbl= as' TARGET=3DNEHALEM atlas sci-libs/atlas-3.9.41 CC=3Dgcc-4.6.1 CFLAGS=3D"-O3 -pipe -march=3D= native -msse3 -msse4.1 -msse4.2" diff --git a/app-benchmarks/autobench/files/python/main.py b/app-benchmar= ks/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 =3D file(cfg.inputfile).read() -tests =3D tests_from_input(input) +cfg.tests =3D tests_from_input(input) =20 # Write summary print 80*'=3D' 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*'=3D' print =20 -for tn,(name,test) in enumerate(tests.items(),1): +for tn,(name,test) in enumerate(cfg.tests.items(),1): Print._level =3D 0 Print("BEGIN TEST %i - %s" % (tn, name)) =20