[gentoo-commits] proj/auto-numerical-bench:master commit in: /

["Andrea Arteaga" <andyspiros@gmail.com>]

commit:     3ce46646c899b4a452a8dff930f39b6e7d898bd2
Author:     spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Jun 13 14:11:53 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Jun 13 14:11:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=3ce46646

Starting code cleanup. Created btlutils.

---
 blasbase.py |   36 +++++++++++++++---------------------
 btlutils.py |   30 ++++++++++++++++++++++++++++++
 main.py     |    6 ++++++
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/blasbase.py b/blasbase.py
index 3335000..b9be2cd 100644
--- a/blasbase.py
+++ b/blasbase.py
@@ -3,6 +3,7 @@ import commands as cmd
 import subprocess as sp
 import matplotlib.pyplot as plt
 import numpy as np
+import btlutils as btl
 
 run_cmd = lambda c : sp.Popen(c, stdout=sp.PIPE).communicate()[0]
 
@@ -85,29 +86,22 @@ class ModuleBase:
             os.environ['LD_LIBRARY_PATH'] = root + libdir
         
         # Compile
-        exe = testdir + "/test"
-        inc = """
-        -Ibtl/actions
-        -Ibtl/generic_bench
-        -Ibtl/generic_bench/utils
-        -Ibtl/libs/BLAS
-        -Ibtl/libs/STL
-        """.replace('\n', '')
-        libs = "-lrt -L" + root+libdir
-        cxxflags = run_cmd(['portageq', 'envvar', 'CXXFLAGS']).strip()
-        defines = "-DCBLASNAME=" + name
-        implflags = self._get_flags(root, impl, libdir)
-        cl = "g++ %s %s %s %s %s btl/libs/BLAS/main.cpp -o %s" \
-            % (inc, libs, cxxflags, defines, implflags, exe)
-        cl = shlex.split(cl)
-        cp = sp.Popen(cl, stdout=sp.PIPE, stderr=sp.PIPE)
-        cp.communicate()
-        if cp.returncode != 0:
-            raise Exception("Compilation failed: " + " ".join(cl))
-        Print("Compilation successful")
+        returncode, compilecl = btl.btlcompile(
+          exe = testdir + "/test",
+          source = "btl/libs/BLAS/main.cpp",
+          btldir = 'btl/',
+          includes = ['btl/libs/BLAS'],
+          defines = ["CBLASNAME=" + name],
+          libs = [],
+          libdirs = [root+libdir],
+          other = [self._get_flags(root, impl, libdir)]
+        )
+        if returncode != 0:
+            raise Exception("Compilation failed: " + compilecl)
+        Print("Compilation successful: " + compilecl)
         
         # Run test
-        args = [exe] + self.tests
+        args = [testdir + "/test"] + self.tests
         proc = sp.Popen(args, bufsize=1, stdout=sp.PIPE, stderr=sp.PIPE, 
           cwd = testdir)
         results = {}

diff --git a/btlutils.py b/btlutils.py
new file mode 100644
index 0000000..3da5b0c
--- /dev/null
+++ b/btlutils.py
@@ -0,0 +1,30 @@
+import subprocess as sp
+import shlex
+
+run_cmd = lambda c : sp.Popen(c, stdout=sp.PIPE).communicate()[0]
+
+def btlcompile(exe, source, btldir, includes, defines, libs, libdirs, other):
+    incs = (
+      "%s/actions" % btldir,
+      "%s/generic_bench" % btldir,
+      "%s/generic_bench/utils" % btldir,
+      "%s/libs/STL" % btldir
+    ) + tuple(includes)
+    incs = ' '.join(['-I'+i for i in incs])
+    
+    defs = ' '.join(['-D'+d for d in ["NDEBUG"] + defines])
+    
+    libs = ' '.join(['-l'+l for l in ["rt"] + libs])
+    
+    libdirs = ' '.join(['-L'+L for L in libdirs])
+    
+    cxxflags = run_cmd(['portageq', 'envvar', 'CXXFLAGS']).strip()
+    
+    otherflags = ' '.join(other)
+    
+    cl = "g++ -o %s %s %s %s %s %s %s %s" \
+        % (exe, source, incs, defs, libs, libdirs, cxxflags, otherflags)
+    cl = shlex.split(cl)
+    cp = sp.Popen(cl, stdout=sp.PIPE, stderr=sp.PIPE)
+    cp.communicate()
+    return (cp.returncode, ' '.join(cl))

diff --git a/main.py b/main.py
index ee17fed..a992e58 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,7 @@
 import os, sys, shlex
 from PortageUtils import *
 import subprocess as sp
+import time
   
 class _Print:
     def __init__(self, maxlevel=10):
@@ -78,6 +79,11 @@ try:
 except ImportError, IndexError:
     print_usage()
     exit(1)
+    
+#tmp = __import__(sys.argv[1], fromlist = ['Module'])
+#mod = tmp.Module(Print, libdir, sys.argv[3:])
+#del tmp
+#testsfname = sys.argv[2]
 
 
 """