/[escript]/trunk/escript/py_src/benchmark.py

Diff of /trunk/escript/py_src/benchmark.py

Parent Directory | Revision Log | View Patch Patch

-revision 364 by gross,
Thu Dec 15 04:38:28 2005 UTC
+revision 379 by gross,
Mon Dec 19 01:10:34 2005 UTC
 Line 1
- # $Id:$
+ filter# $Id:$
  #
  #      COPYRIGHT ACcESS 2004 -  All Rights Reserved
 Line 95 
 class BenchmarkSuite(object):
         @type scale: C{int} or C{list} of C{int}s.
         """
         self.__scale=scale
-        for i in range(len(self)): self[i].run(scale)
+        for i in range(len(self)): self[i].run(scale=scale)
-    def getHTML(self,level=1):
+    def getHTML(self,filter,level=1):
         """
         returns the results of the last benchmark run in HTML format.
+        @param filter: filter to be applied to the results
+        @type filter: L{BenchmarkFilter}
         @param level: level used in header <H?> tags
         @type level: C{int}
         @return: HTML document
-Line 116 
 class BenchmarkSuite(object):
+Line 118 
 class BenchmarkSuite(object):
             out+="<p>platform: %s%s</p>\n"%(socket.gethostname(),m)
         for i in range(len(self)):
             out+="<p>\n"
-            out+=self[i].getHTML(min(level+1,self.MAX_LEVEL))
+            out+=self[i].getHTML(filter=filter,level=min(level+1,self.MAX_LEVEL))
             out+="<p>\n"
         if level==1:
             out+="<hr><p align=\"center\">by %s at %s</p>\n"%(os.getlogin(),time.strftime('%X %x %Z'))
-Line 189 
 class Benchmark(object):
+Line 191 
 class Benchmark(object):
         if isinstance(scale,list):
             if len(scale)<len(self.__problems):
                raise ValueError,"scale list is too small. must be greater or equal to the number of problems in the benchmark"
+        self.__filter=filter
         self.__scale=scale
         self.__results=[]
         c=0
-Line 203 
 class Benchmark(object):
+Line 206 
 class Benchmark(object):
                row.append(r.run(p))
            self.__results.append(row)
            c+=1
-    def getHTML(self,level=1):
+    def getHTML(self,filter,level=1):
         """
         returns the results of the last benchmark run in HTML format.
+        @param filter: filter to be applied to the results
+        @type filter: L{BenchmarkFilter}
         @param level: level used in header <H?> tags
         @type level: C{int}
         @return: HTML document
-Line 225 
 class Benchmark(object):
+Line 230 
 class Benchmark(object):
         if len(self.__problems)>0:
            out+="<TABLE ALIGN=\"center\" BORDER=3 CELLPADDING=5 CELLSPACING=1>\n"
            h1_seg=""
-           rn=self.__problems[0].getResultNames()
+           rn=filter.getResultNames()
            if len(rn)==0:
               h1_seg+="<TD></TD>"
            else:
-Line 247 
 class Benchmark(object):
+Line 252 
 class Benchmark(object):
            for r in range(len(self.__results)):
               out+="<TR><TH ALIGN=\"right\">%s</TH>"%str(self.__problems[r])
               if isinstance(self.__scale,list): out+="<TD ALIGN=\"right\">%s</TD>"%self.__scale[c]
-              for col in self.__results[r]:
+              filtered_results=filter(self.__results[r])
-                    for e in col: out+="<TD ALIGN=\"right\">%s</TD>"%str(e)
+              for col in filtered_results:
+                    for e in col: out+="<TD ALIGN=\"right\">%s</TD>"%e
               out+="</TR>\n"
            out+="</TABLE>"
            c+=1
-Line 274 
 class BenchmarkProblem(object):
+Line 280 
 class BenchmarkProblem(object):
         else:
            self.__name=name
-    def getResultNames(self):
-        """
-        return the names of the results produced when run() is called.
-        @return: names the list of the names to be used when the results of the run() call are printed
-        @rtype: C{list} of C{str}
-        @remark: this function has to overwritten by a particular problem
-        """
-        raise NotImplementedError
-        return []
     def __str__(self):
         """
-Line 302 
 class BenchmarkProblem(object):
+Line 298 
 class BenchmarkProblem(object):
         @param options: the options that are used for the run. Note that the number of OpenMP threads is controlled
                         by the L{Benchmark} the problem is run in.
         @type options: L{Options}
-        @return: list of run characteristics
+        @return: run characteristics
-        @rtype: C{list}
+        @rtype: any type that can be read by the L{BenchmarkFilter} applied to it.
         @remark: this function has to overwritten by a particular problem
         """
         raise NotImplementedError
         return []
+ class BenchmarkFilter(object):
+    """
+    object to filter the characteristcs returned by Bechmark runs.
+    """
+    def __init__(self):
+        """
+        sets up a filter
+        """
+        pass
+    def getResultNames(self):
+        """
+        return the names of the results produced when run() is called.
+        @return: names the list of the names to be used when the results of the run() call are printed
+        @rtype: C{list} of C{str}
+        @remark: this function has to overwritten by a particular problem
+        """
+        raise NotImplementedError
+        return []
+    def __call__(self,result):
+        """
+        filters out values results returned as characteristcs of a problem run
+        @param result: values to be filtered
+        @type result: any type that is produced by the L{BenchmarkProblem} it is applied to
+        @return: a list of strings selected from result
+        @rtype: C{list} of C{str}
+        @remark: this function has to overwritten by a particular problem
+        """
+        raise NotImplementedError
+        return []
  class Options(object):
      """
      defines a set of options to be used to run a L{BenchmarkProblem}
-Line 341 
 if __name__=="__main__":
+Line 374 
 if __name__=="__main__":
      class OptionsTest2(Options):
          pass
-     class BenchmarkProblemTest(BenchmarkProblem):
+     class BenchmarkProblemTest1(BenchmarkProblem):
-        def __init__(self,name=None):
-            super(BenchmarkProblemTest,self).__init__(name)
-        def getResultNames(self):
-             return ["r0","r1"]
-     class BenchmarkProblemTest1(BenchmarkProblemTest):
         def __init__(self):
             super(BenchmarkProblemTest1,self).__init__(name="TEST1")
         def run(self,options=None):
             import time
             return time.time(),"A"
-     class BenchmarkProblemTest2(BenchmarkProblemTest):
+     class BenchmarkProblemTest2(BenchmarkProblem):
         def __init__(self):
             super(BenchmarkProblemTest2,self).__init__(name="TEST2")
         def run(self,options=None):
             import time
             return -time.time(),"B"
+     class SimpleFilter(BenchmarkFilter):
+        def getResultNames(self):
+             return ["r0","r1"]
+        def __call__(self,result):
+             return [str(result[0]),str(result[1])]
      bm=Benchmark("Example")
      bm.addProblem(BenchmarkProblemTest1())
      bm.addProblem(BenchmarkProblemTest2())
-Line 371 
 if __name__=="__main__":
+Line 404 
 if __name__=="__main__":
      bms.addBenchmark(bm)
      bms.run()
-     print bms.getHTML()
+     print bms.getHTML(filter=SimpleFilter())
      bms.run(scale=4)
-     print bms.getHTML()
+     print bms.getHTML(filter=SimpleFilter())
      bms.run(scale=[1,2])
-     print bms.getHTML()
+     print bms.getHTML(filter=SimpleFilter())

 Legend:



Removed from v.364
 


changed lines


 
Added in v.379
 Legend:



Removed from v.364
 


changed lines


 
Added in v.379
-Removed from v.364
+Added in v.379

	ViewVC Help
Powered by ViewVC 1.1.26