Changeset 7fcdc9f in sasmodels

Timestamp:

Oct 16, 2016 4:38:03 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

248561a

Parents:

ff1fff5

Message:

OpenCL: use checksum to distinguish between kernels with the same name

Location:

sasmodels

Files:

• generate.py (modified) (2 diffs)
• kernelcl.py (modified) (1 diff)

sasmodels/generate.py

@@ -166 +166 @@
 import re
 import string
+from zlib import crc32
 
 import numpy as np  # type: ignore
@@ -356 +357 @@
     return newest
 
+def tag_source(source):
+    # type: (str) -> str
+    """
+    Return a unique tag for the source code.
+    """
+    # Note: need 0xffffffff&val to force an unsigned 32-bit number
+    return "%08X"%(0xffffffff&crc32(source))
 
 def convert_type(source, dtype):

sasmodels/kernelcl.py

@@ -294 +294 @@
         # 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 ""))
+        tag = generate.tag_source(source)
+        key = "%s-%s-%s%s"%(name, dtype, tag, ("-fast" if fast else ""))
         # Check timestamp on program
         program, program_timestamp = self.compiled.get(key, (None, np.inf))