merge heads

2 files changed, 15 insertions, 5 deletions

diff --git a/gpu.py b/gpu.py
index 0f56ee4..e6b6856 100644
--- a/gpu.py
+++ b/gpu.py
@@ -72,13 +72,15 @@ class GPU(object):
             device = cuda.Device(device_id)
             self.context = device.make_context()
         print 'device %s' % self.context.get_device().name()
-        self.module = SourceModule(src.kernel, options=['-I' + src.dir], no_extern_c=True)
+        cuda_options = ['-I' + src.dir, '--use_fast_math']
+
+        self.module = SourceModule(src.kernel, options=cuda_options, no_extern_c=True)
         self.geo_funcs = CUDAFuncs(self.module, ['set_wavelength_range', 'set_material', 'set_surface', 'set_global_mesh_variables', 'color_solids'])
 
         self.prop_funcs = CUDAFuncs(self.module, ['init_rng', 'propagate'])
         self.nthread_per_block = 64
         self.max_blocks = 1024
-        self.daq_module = SourceModule(src.daq, options=['-I' + src.dir], no_extern_c=True)
+        self.daq_module = SourceModule(src.daq, options=cuda_options, no_extern_c=True)
         self.daq_funcs = CUDAFuncs(self.daq_module, 
                               ['reset_earliest_time_int', 'run_daq',
                                'convert_sortable_int_to_float'])
@@ -257,7 +259,8 @@ class GPU(object):
                                       block=(self.nthread_per_block,1,1),
                                       grid=(blocks, 1))
 
-        #self.context.synchronize()
+        if 'profile' in __builtins__:
+            self.context.synchronize()
 
     def get_photons(self):
         '''Returns a dictionary of current photon state information.
@@ -309,7 +312,8 @@ class GPU(object):
                                                      self.earliest_time_gpu, 
                                                      block=(self.nthread_per_block,1,1), 
                                                      grid=(len(self.earliest_time_int_gpu)//self.nthread_per_block+1,1))
-        #self.context.synchronize()
+        if 'profile' in __builtins__:
+            self.context.synchronize()
         
 
     def get_hits(self):
diff --git a/sim.py b/sim.py
index 0d775f4..34477f9 100755
--- a/sim.py
+++ b/sim.py
@@ -75,7 +75,13 @@ def write_event(T, ev, event_id, hits, photon_start=None, photon_stop=None):
     root.fill_hits(ev, len(hits['t']), hits['t'], hits['q'], hits['history'])
     T.Fill()
 
-#@profile
+# Allow profile decorator to exist, but do nothing if not running under kernprof
+try:
+    profile = profile
+except NameError:
+    profile = lambda x: x
+
+@profile
 def main():
     parser = optparse.OptionParser('%prog')
     parser.add_option('-b', type='int', dest='nbits', default=10)