Changeset 8a20be5 in sasmodels for sasmodel.py

Timestamp:

Jul 10, 2014 3:05:08 PM (10 years ago)

Author:

HMP1 <helen.park@…>

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:

8faffcd

Parents:

5378e40

Message:

Added a fit2 (fits two different models at different angles)
(preliminary) Added CoreshellCyl? and CapCyl? Kernels
(preliminary) Updated kernels to include functions

File:

• sasmodel.py (modified) (5 diffs)

sasmodel.py

@@ -3 +3 @@
 
 import numpy as np
+import pyopencl as cl
 from bumps.names import Parameter
 from sans.dataloader.loader import Loader
@@ -11 +12 @@
     loader = Loader()
     data = loader.load(filename)
+    if data is None:
+        raise IOError("Data %r could not be loaded"%filename)
     return data
 
@@ -47 +50 @@
 
 
+GPU_CONTEXT = None
+GPU_QUEUE = None
+def card():
+    global GPU_CONTEXT, GPU_QUEUE
+    if GPU_CONTEXT is None:
+        GPU_CONTEXT = cl.create_some_context()
+        GPU_QUEUE = cl.CommandQueue(GPU_CONTEXT)
+    return GPU_CONTEXT, GPU_QUEUE
+
+
 class SasModel(object):
-    def __init__(self, data, model, **kw):
+    def __init__(self, data, model, dtype='float32', **kw):
         self.index = data.mask==0
         self.iq = data.data[self.index]
@@ -55 +68 @@
         self.qx = data.qx_data
         self.qy = data.qy_data
-        self.gpu = model(self.qx, self.qy)
+        self.gpu = model(self.qx, self.qy, dtype=dtype)
         pd_pars = set(base+attr for base in model.PD_PARS for attr in ('_pd','_pd_n','_pd_nsigma'))
         total_pars = set(model.PARS.keys()) | pd_pars
@@ -79 +92 @@
     def theory(self):
         pars = dict((k,v.value) for k,v in self._parameters.items())
+        print pars
         result = self.gpu.eval(pars)
         return result