Changeset 9404dd3 in sasmodels for sasmodels/kernelcl.py

Timestamp:

Dec 4, 2015 12:41:47 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

eaca9eb

Parents:

7bb290c

Message:

python 3.x support

File:

• sasmodels/kernelcl.py (modified) (4 diffs)

sasmodels/kernelcl.py

@@ -57 +57 @@
     # Ask OpenCL for the default context so that we know that one exists
     cl.create_some_context(interactive=False)
-except Exception, exc:
+except Exception as exc:
     warnings.warn(str(exc))
     raise RuntimeError("OpenCL not available")
@@ -184 +184 @@
         try:
             self.context = cl.create_some_context(interactive=False)
-        except Exception, exc:
+        except Exception as exc:
             warnings.warn(str(exc))
             warnings.warn("pyopencl.create_some_context() failed")
@@ -191 +191 @@
     def compile_program(self, name, source, dtype):
         if name not in self.compiled:
-            #print "compiling",name
+            #print("compiling",name)
             self.compiled[name] = compile_model(self.context, source, dtype)
         return self.compiled[name]
@@ -359 +359 @@
                 if pd_pars else np.empty(0, dtype=self.q_input.dtype)
             loops = np.ascontiguousarray(loops.T, self.q_input.dtype).flatten()
-            #print "loops",Nloops, loops
-
-            #import sys; print >>sys.stderr,"opencl eval",pars
-            #print "opencl eval",pars
+            #print("loops",Nloops, loops)
+
+            #import sys; print("opencl eval",pars)
+            #print("opencl eval",pars)
             if len(loops) > 2 * MAX_LOOPS:
                 raise ValueError("too many polydispersity points")