Changeset 4f3dd42 in sasmodels

Timestamp:

Aug 18, 2016 9:30:31 AM (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:

3bcb88c, 0dc34c3

Parents:

300a2f7 (diff), deb854f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:sasview/sasmodels

Files:

• doc/ref/magnetism/magnetism.rst (modified) (2 diffs)
• sasmodels/kernelcl.py (modified) (4 diffs)
• sasmodels/sasview_model.py (modified) (1 diff)

doc/ref/magnetism/magnetism.rst

@@ -4 +4 @@
 =======================================================
 
-Magnetic scattering is implemented in five (2D) models
+In earlier versions of SasView magnetic scattering was implemented in just five 
+(2D) models
 
 *  :ref:`sphere`
@@ -11 +12 @@
 *  :ref:`cylinder`
 *  :ref:`parallelepiped`
+
+From SasView 4.x it is implemented on most models in the 'shape' category.
 
 In general, the scattering length density (SLD = $\beta$) in each region where the

sasmodels/kernelcl.py

@@ -281 +281 @@
             warnings.warn("the environment variable 'PYOPENCL_CTX' might not be set correctly")
 
-    def compile_program(self, name, source, dtype, fast=False):
-        # type: (str, str, np.dtype, bool) -> cl.Program
+    def compile_program(self, name, source, dtype, fast, timestamp):
+        # type: (str, str, np.dtype, bool, float) -> cl.Program
         """
         Compile the program for the device in the given context.
         """
+        # Note: PyOpenCL caches based on md5 hash of source, options and device
+        # so we don't really need to cache things for ourselves.  I'll do so
+        # anyway just to save some data munging time.
         key = "%s-%s%s"%(name, dtype, ("-fast" if fast else ""))
+        # Check timestamp on program
+        program, program_timestamp = self.compiled.get(key, (None, np.inf))
+        if program_timestamp < timestamp:
+            del self.compiled[key]
         if key not in self.compiled:
             context = self.get_context(dtype)
@@ -293 +300 @@
             program = compile_model(self.get_context(dtype),
                                     str(source), dtype, fast)
-            self.compiled[key] = program
-        return self.compiled[key]
-
-    def release_program(self, name):
-        # type: (str) -> None
-        """
-        Free memory associated with the program on the device.
-        """
-        if name in self.compiled:
-            self.compiled[name].release()
-            del self.compiled[name]
+            self.compiled[key] = (program, timestamp)
+        return program
 
 def _get_default_context():
@@ -399 +397 @@
         if self.program is None:
             compile_program = environment().compile_program
+            timestamp = generate.timestamp(self.info)
             self.program = compile_program(
                 self.info.name,
                 self.source['opencl'],
                 self.dtype,
-                self.fast)
+                self.fast,
+                timestamp)
             variants = ['Iq', 'Iqxy', 'Imagnetic']
             names = [generate.kernel_name(self.info, k) for k in variants]
@@ -421 +421 @@
         """
         if self.program is not None:
-            environment().release_program(self.info.name)
             self.program = None
 

sasmodels/sasview_model.py

@@ -115 +115 @@
     Load a custom model given the model path.
     """
+    #print("load custom", path)
     kernel_module = custom.load_custom_kernel_module(path)
     try: