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

[Andrea Arteaga]

commit:     f88db2f6927c447ec5be02a2d4d9bd2e2391f87f
Author:     spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 15:02:10 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 15:02:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=f88db2f6

Better reports (work on images and HTML).

---
 .../autobench/files/python/basemodule.py           |   22 +++++++++++-----
 app-benchmarks/autobench/files/python/blasbase.py  |    2 +-
 .../autobench/files/python/htmlreport.py           |   27 +++++++++++++++----
 app-benchmarks/autobench/files/python/main.py      |    2 +
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/app-benchmarks/autobench/files/python/basemodule.py b/app-benchmarks/autobench/files/python/basemodule.py
index 93b5a77..f3ee50b 100644
--- a/app-benchmarks/autobench/files/python/basemodule.py
+++ b/app-benchmarks/autobench/files/python/basemodule.py
@@ -29,10 +29,10 @@ class BaseModule:
         
         passargs = []
         for i in args:
-            if i == '-S':
+            if i in ('-S', '--summary-only'):
                 self.summary_only = True
                 continue
-            elif i == '-s':
+            elif i in ('-s', '--summary'):
                 self.summary = True
                 continue
             else:
@@ -45,7 +45,11 @@ class BaseModule:
         output = sp.Popen(
           ['eselect', '--no-color', '--brief', self.libname, 'list'],
           env={'ROOT' : root}, stdout=sp.PIPE).communicate()[0]
-        return output.strip().split('\n')
+        output = output.strip()
+        if '(none found)' in output:
+            return []
+        else:
+            return [i.split()[0] for i in output.split('\n')] 
            
     def getTest(self, root, impl, testdir, logdir):
         TestClass = self._testClass()
@@ -94,19 +98,22 @@ class BaseModule:
             # Save summary figure
             sprows = (len(self.tests)+1)/2
             plt.figure(figsize=(16,6*sprows), dpi=300)
+            plt.subplots_adjust(wspace=.4, hspace=.4)
             for i, test in enumerate(self.tests, 1):
                 plt.subplot(sprows, 2, i)
                 plt.title(test)
                 for impl in newresults[test]:
                     x,y = np.loadtxt(newresults[test][impl], unpack=True)
                     plotf(x,y, label=impl, hold=True)
-                plt.legend(loc='best')
+                if self.summary_only:
+                    plt.legend(loc='best')
                 plt.xlabel('size')
                 plt.ylabel('MFlops')
                 plt.grid(True)
             fname = pjoin(cfg.reportdir, 'summary.png')
-            plt.savefig(fname, format='png')
-            html.addFig("Summary", image=os.path.basename(fname), width='95%')
+            plt.savefig(fname, format='png', bbox_inches='tight', \
+              transparent=True)
+            html.addFig("Summary", image=os.path.basename(fname), width='90%')
             Print('Summary figure saved: ' + fname)
                 
         # Generate plots
@@ -121,7 +128,8 @@ class BaseModule:
                 plt.ylabel('MFlops')
                 plt.grid(True)
                 fname = pjoin(cfg.reportdir, test+".png")
-                plt.savefig(fname, format='png')
+                plt.savefig(fname, format='png', bbox_inches='tight', \
+                  transparent=True)
                 html.addFig(test, image=os.path.basename(fname))
                 Print('Figure ' + fname + ' saved')
         

diff --git a/app-benchmarks/autobench/files/python/blasbase.py b/app-benchmarks/autobench/files/python/blasbase.py
index 664d706..e2c14ff 100644
--- a/app-benchmarks/autobench/files/python/blasbase.py
+++ b/app-benchmarks/autobench/files/python/blasbase.py
@@ -54,4 +54,4 @@ class BLASTest(btlbase.BTLTest):
         return ["libs/BLAS"]
     
     def _btl_defines(self):
-        return ["CBLASNAME=" + self.libname, "BLAS_INTERFACE"]
\ No newline at end of file
+        return ["CBLASNAME="+self.libname, self.libname.upper()+"_INTERFACE"]
\ No newline at end of file

diff --git a/app-benchmarks/autobench/files/python/htmlreport.py b/app-benchmarks/autobench/files/python/htmlreport.py
index cb51da2..5e563fe 100644
--- a/app-benchmarks/autobench/files/python/htmlreport.py
+++ b/app-benchmarks/autobench/files/python/htmlreport.py
@@ -13,15 +13,14 @@ body {
 }
 
 img {
-  width:80%;
+  height:80%;
 }
 
-h1, h2, .plot, .descr, .date {
+h1, h2, .plot, .descr, .info {
   text-align: center;
 }
 
 .fig {
-   background-color: #CCCCCC;
    margin-bottom: 50px;
    padding-top: 20px;
    padding-bottom: 20px;
@@ -33,7 +32,23 @@ h1, h2, .plot, .descr, .date {
 """
         self.content += title + "</h1>"
         date = time.strftime('%Y-%m-%d, %I:%M %p')
-        self.content += '<p class="date">Generated on ' + date + '</p>'
+        self.content += '<p class="info">Generated on ' + date + '</p>'
+        
+        cpuinfo = file('/proc/cpuinfo', 'r').readlines()
+        cpu = None
+        for l in cpuinfo:
+            if l[:10] == 'model name':
+                cpu = l.split(':',1)[1].strip()
+        if cpu:
+            self.content += '<p class="info">CPU: ' + cpu + '</p>'
+        
+        meminfo = file('/proc/meminfo', 'r').readlines()
+        mem = None
+        for l in meminfo:
+            if l[:8] == 'MemTotal':
+                mem = l.split(':',1)[1].strip()
+        if mem:
+            self.content += '<p class="info">Total memory: ' + mem + '</p>'
         
         
     def addFig(self, title, image, descr='', alt='', width=None):
@@ -45,10 +60,10 @@ h1, h2, .plot, .descr, .date {
         self.content += '<a href="' + image + '">' 
         self.content += '<img src="' + image + '" alt="' + alt + '"'
         if width is not None:
-            self.content += ' style="width:' + str(width) + '"'
+            self.content += ' style="width:' + str(width) + '; height:auto"'
         self.content += ' /></a>'
         self.content += '</div>'
-        self.content += '</div>'
+        self.content += '</div><hr />'
         
     def close(self):
         self.content += "</body></html>"

diff --git a/app-benchmarks/autobench/files/python/main.py b/app-benchmarks/autobench/files/python/main.py
index 86c555a..8994168 100644
--- a/app-benchmarks/autobench/files/python/main.py
+++ b/app-benchmarks/autobench/files/python/main.py
@@ -190,6 +190,8 @@ for tn,(name,test) in enumerate(tests.items(),1):
     
     # Test every implementation
     test['results'] = {}
+    if len(impls) == 0:
+        Print("No implementation found")
     for impl in impls:
         Print("Testing " + impl)
         Print.down()