integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 0 insertions, 33 deletions

diff --git a/benchmarks/CUDA/CP/driver/__init__.py b/benchmarks/CUDA/CP/driver/__init__.py
deleted file mode 100644
index 3b6c38a..0000000
--- a/benchmarks/CUDA/CP/driver/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# (c) 2007 The Board of Trustees of the University of Illinois.
-
-import sys
-import os
-from itertools import imap
-
-import globals
-import actions
-import options
-
-def run():
-    # Print a banner message
-    print "Parboil parallel benchmark suite, version 0.1"
-    print
-    
-    # Global variable setup
-    root_path = os.getcwd()
-    python_path = (os.path.join(root_path,'common','python') +
-                   ":" +
-                   os.environ.get('PYTHONPATH',""))
-    
-    globals.root = root_path
-    globals.benchmarks = benchmark.find_benchmarks()
-    globals.program_env = {'PARBOIL_ROOT':root_path,
-                           'PYTHONPATH':python_path,
-                           }
-
-    # Parse options
-    act = options.parse_options(sys.argv)
-
-    # Perform the specified action
-    if act: act()
-