A little more robust. Renamed to vbench

Author: wesm

.gitignore

@@ -10,4 +10,4 @@ MANIFEST
 *.pyd
 *flymake*
 .coverage
-gitbench.egg-info
+vbench.egg-info

setup.py

@@ -9,11 +9,11 @@
 """
 
 REQUIRES = ['sqlalchemy', 'pandas']
-DISTNAME = 'gitbench'
+DISTNAME = 'vbench'
 LICENSE = 'BSD'
 AUTHOR = "Wes McKinney"
 AUTHOR_EMAIL = "[email protected]"
-URL = "https://github.com/wesm/gitbench"
+URL = "https://github.com/wesm/vbench"
 CLASSIFIERS = [
     'Development Status :: 2 - Pre-Alpha',
     'Environment :: Console',
@@ -40,8 +40,8 @@ def configuration(parent_package='', top_path=None):
                        delegate_options_to_subpackages=True,
                        quiet=True)
 
-    config.add_subpackage('gitbench')
-    config.add_data_dir('gitbench/tests')
+    config.add_subpackage('vbench')
+    config.add_data_dir('vbench/tests')
     return config
 
 if __name__ == '__main__':

gitbench/README.md renamed to vbench/README.md

@@ -13,13 +13,14 @@
 class Benchmark(object):
 
     def __init__(self, code, setup, ncalls=None, cleanup=None,
-                 name=None, description=None):
+                 name=None, description=None, start_date=None):
         self.code = code
         self.setup = setup
         self.cleanup = cleanup or ''
         self.ncalls = ncalls
         self.name = name
         self.description = description
+        self.start_date = start_date
 
     def _setup(self):
         ns = globals().copy()

gitbench/__init__.py renamed to vbench/__init__.py

@@ -5,11 +5,11 @@
 from sqlalchemy import sql
 from sqlalchemy import exceptions as exc
 
-from gitbench.benchmark import Benchmark
+from vbench.benchmark import Benchmark
 
 class BenchmarkDB(object):
     """
-    Persist gitbench results in a sqlite3 database
+    Persist vbench results in a sqlite3 database
     """
 
     def __init__(self, dbpath):
@@ -83,6 +83,12 @@ def delete_result(self, checksum, revision):
         """
         pass
 
+    def delete_error_results(self):
+        tab = self._results
+        ins = tab.delete()
+        ins = ins.where(tab.c.timing == None)
+        self.conn.execute(ins)
+
     def get_benchmarks(self):
         stmt = sql.select([self._benchmarks])
         return list(self.conn.execute(stmt))
@@ -102,3 +108,4 @@ def get_benchmark_results(self, checksum):
         stmt = sql.select([tab],
                           sql.and_(tab.c.bmk_checksum == checksum))
         return self.conn.execute(stmt)
+

gitbench/benchmark.py renamed to vbench/benchmark.py

@@ -10,7 +10,7 @@
 
 from pandas import *
 
-import gitbench.config as config
+import vbench.config as config
 
 class Repo(object):
 
@@ -121,10 +121,11 @@ class BenchRepo(object):
     """
     Manage an isolated copy of a repository for benchmarking
     """
-    def __init__(self, source_dir, target_dir, build_cmds):
-        self.source_dir = source_dir
+    def __init__(self, source_url, target_dir, build_cmds, prep_cmd):
+        self.source_url = source_url
         self.target_dir = target_dir
         self.build_cmds = build_cmds
+        self.prep_cmd = prep_cmd
         self._copy_repo()
 
     def _copy_repo(self):
@@ -136,10 +137,12 @@ def _copy_repo(self):
             cmd = 'rm -rf %s' % self.target_dir
             print cmd
             os.system(cmd)
-        cmd = 'cp -r %s %s' % (self.source_dir, self.target_dir)
+
+        url = '[email protected]:wesm/pandas.git'
+        cmd = 'git clone %s %s' % (url, self.target_dir)
         print cmd
         os.system(cmd)
-
+        self._prep()
         self._copy_benchmark_script()
 
     def _copy_benchmark_script(self):
@@ -154,6 +157,7 @@ def switch_to_revision(self, rev):
         rev: git SHA
         """
         self._checkout(rev)
+        self._clean_pyc_files()
         self._build()
 
     def _checkout(self, rev):
@@ -177,6 +181,32 @@ def _build(self):
         stdout, stderr = proc.communicate()
         print stdout
 
+    def _prep(self):
+        cmd = ';'.join([x for x in self.prep_cmd.split('\n')
+                        if len(x.strip()) > 0])
+
+        print cmd
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True,
+                                cwd=self.target_dir)
+        stdout, stderr = proc.communicate()
+        print stdout
+
+    def hard_clean(self):
+        self._clean_pyc_files(('.pyc', '.pyo', 'c', 'cpp', 'so', 'pyd'))
+
+    def _clean_pyc_files(self, extensions=('.pyc', '.pyo')):
+        clean_me = []
+        for root, dirs, files in list(os.walk(self.target_dir)):
+            for f in files:
+                if os.path.splitext(f)[-1] in extensions:
+                    clean_me.append(os.path.join(root, f))
+
+        for path in clean_me:
+            try:
+                os.unlink(path)
+            except Exception:
+                pass
+
 
 def _convert_timezones(stamps):
     # tz = config.TIME_ZONE