[gentoo-commits] proj/auto-numerical-bench:master commit in: numbench/confinput/, samples/, numbench/modules/

[gentoo-commits] proj/auto-numerical-bench:master commit in: numbench/confinput/, samples/, numbench/modules/

[Andrea Arteaga]

commit:     c3d002ed1ee61e445aee27842f604b116fb2e729
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Apr  9 21:37:32 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Apr  9 21:37:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=c3d002ed

Solved problems with the scalapack module -- working now.

---
 numbench/confinput/xmlinput.py |    5 +++++
 numbench/modules/scalapack.py  |    2 +-
 samples/scalapacktests.xml     |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/numbench/confinput/xmlinput.py b/numbench/confinput/xmlinput.py
index 0a44b7c..cb82e5c 100644
--- a/numbench/confinput/xmlinput.py
+++ b/numbench/confinput/xmlinput.py
@@ -125,6 +125,11 @@ def parseConf(fname):
         runenv = getEnvFromNode(t, 'runenv')
 
         # Adjust PATH
+        if compileenv.has_key('PATH'):
+            compileenv['PATH'] += ':' + os.environ['PATH']
+        else:
+            compileenv['PATH'] = os.environ['PATH']
+            
         if runenv.has_key('PATH'):
             runenv['PATH'] += ':' + os.environ['PATH']
         else:

diff --git a/numbench/modules/scalapack.py b/numbench/modules/scalapack.py
index 28e694f..03fa190 100644
--- a/numbench/modules/scalapack.py
+++ b/numbench/modules/scalapack.py
@@ -57,7 +57,7 @@ class Module:
         btlconfig = dict (
           CXX = 'mpic++',
           source = 'libs/PBLAS/main.cpp',
-          preargs = ('mpirun', '-np', self.numproc),
+          preargs = ('mpirun', '-np', str(self.numproc)),
           exe = pjoin(test['testdir'], implementation, 'test'),
           logdir = pjoin(test['logdir'], implementation),
           testdir = pjoin(test['testdir'], implementation),

diff --git a/samples/scalapacktests.xml b/samples/scalapacktests.xml
index b74b5bc..cadf14b 100644
--- a/samples/scalapacktests.xml
+++ b/samples/scalapacktests.xml
@@ -1,14 +1,14 @@
 <tests>
 
     <test id="reference-O3">
-        <pkg>sci-libs/scalapack-1.8.0</pkg>
+        <pkg>sci-libs/scalapack-2.0.1</pkg>
         <emergeenv>
             <var name="FFLAGS">-O3</var>
         </emergeenv>
     </test>
 
     <test id="reference-O1">
-        <pkg>sci-libs/scalapack-1.8.0</pkg>
+        <pkg>sci-libs/scalapack-2.0.1</pkg>
         <emergeenv>
             <var name="FFLAGS">-O1</var>
         </emergeenv>