summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Arteaga <andyspiros@gmail.com>2011-08-08 13:50:33 +0200
committerAndrea Arteaga <andyspiros@gmail.com>2011-08-08 13:50:33 +0200
commite5a2c34a80bc1cfd984789f8c82a84c70c19f8bb (patch)
tree7d68de2f05f5622aab409b9a44ae1816a5097b7f
parentAdded some LAPACK tests. (diff)
downloadauto-numerical-bench-e5a2c34a80bc1cfd984789f8c82a84c70c19f8bb.tar.gz
auto-numerical-bench-e5a2c34a80bc1cfd984789f8c82a84c70c19f8bb.tar.bz2
auto-numerical-bench-e5a2c34a80bc1cfd984789f8c82a84c70c19f8bb.zip
Solve a PBLAS block issue. Log the pkg-config runs.
-rw-r--r--basemodule.py6
-rw-r--r--pblas.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/basemodule.py b/basemodule.py
index 8a1d180..b55adfc 100644
--- a/basemodule.py
+++ b/basemodule.py
@@ -181,9 +181,13 @@ class BaseTest:
# 1. Run with no requires
pfile = pc.GetFile(self.libname, self.impl, self.root)
flags = pc.Run(pfile, self.root, False)
+ logfile = file(pjoin(self.logdir, 'pkg-config.log'), 'w')
+ print >> logfile, "File:", pfile
+ print >> logfile, "Result:", flags
# 2. Get requires
requires = pc.Requires(pfile)
+ print >> logfile, "Requires:", requires
# 3.Substitute requires and add flags
for r in requires:
@@ -192,6 +196,8 @@ class BaseTest:
flags += ' ' + pc.Run(pfile)
else:
flags += ' ' + pc.Run(r)
+ print >> logfile, "Third run:", flags
+ logfile.close()
return shlex.split(flags)
diff --git a/pblas.py b/pblas.py
index 64d1eb7..e4a7d73 100644
--- a/pblas.py
+++ b/pblas.py
@@ -62,7 +62,7 @@ class PBLASTest(btlbase.BTLTest):
@staticmethod
def _btl_includes():
- return ["libs/BLAS", "libs/BLACS", "libs/PBLAS", "libs/STL"]
+ return ["libs/"+i for i in ("BLAS", "LAPACK", "BLACS", "PBLAS", "STL")]
def _btl_defines(self):
return ["PBLASNAME="+self.libname] \ No newline at end of file