Changeset 1392831 in sasmodels

Timestamp:

Aug 24, 2016 10:10:25 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:

948db69, 3a45c2c

Parents:

3bcb88c (diff), 0dc34c3 (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

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• kernelcl.py (modified) (1 diff)
• kerneldll.py (modified) (1 diff)
• sasview_model.py (modified) (1 diff)

sasmodels/generate.py

@@ -316 +316 @@
 
 
-def timestamp(model_info):
+def dll_timestamp(model_info):
     # type: (ModelInfo) -> int
     """
     Return a timestamp for the model corresponding to the most recently
     changed file or dependency.
+    """
+    # TODO: fails DRY; templates appear two places.
+    model_templates = [joinpath(DATA_PATH, filename)
+                       for filename in ('kernel_header.c', 'kernel_iq.c')]
+    source_files = (model_sources(model_info)
+                    + model_templates
+                    + [model_info.filename])
+    # Note: file may not exist when it is a standard model from library.zip
+    times = [getmtime(f) for f in source_files if exists(f)]
+    newest = max(times) if times else 0
+    return newest
+
+def ocl_timestamp(model_info):
+    # type: (ModelInfo) -> int
+    """
+    Return a timestamp for the model corresponding to the most recently
+    changed file or dependency.
 
     Note that this does not look at the time stamps for the OpenCL header
     information since that need not trigger a recompile of the DLL.
     """
+    # TODO: fails DRY; templates appear two places.
+    model_templates = [joinpath(DATA_PATH, filename)
+                       for filename in ('kernel_header.c', 'kernel_iq.cl')]
     source_files = (model_sources(model_info)
-                    + model_templates()
+                    + model_templates
                     + [model_info.filename])
-    newest = max(getmtime(f) for f in source_files)
+    # Note: file may not exist when it is a standard model from library.zip
+    times = [getmtime(f) for f in source_files if exists(f)]
+    newest = max(times) if times else 0
     return newest
-
-
-def model_templates():
-    # type: () -> List[str]
-    # TODO: fails DRY; templates appear two places.
-    # should instead have model_info contain a list of paths
-    # Note: kernel_iq.cl is not on this list because changing it need not
-    # trigger a recompile of the dll.
-    return [joinpath(DATA_PATH, filename)
-            for filename in ('kernel_header.c', 'kernel_iq.c')]
 
 

sasmodels/kernelcl.py

@@ -397 +397 @@
         if self.program is None:
             compile_program = environment().compile_program
-            timestamp = generate.timestamp(self.info)
+            timestamp = generate.ocl_timestamp(self.info)
             self.program = compile_program(
                 self.info.name,

sasmodels/kerneldll.py

@@ -226 +226 @@
     else:
         dll_time = os.path.getmtime(dll)
-        newest_source = generate.timestamp(model_info)
+        newest_source = generate.dll_timestamp(model_info)
         need_recompile = dll_time < newest_source
     if need_recompile:

sasmodels/sasview_model.py

@@ -454 +454 @@
         """
         # TODO: fix test so that parameter order doesn't matter
-        ret = ['%s.%s' % (p.name, ext)
-               for p in self._model_info.parameters.user_parameters()
-               for ext in ('npts', 'nsigmas', 'width')
-               if p.polydisperse]
+        ret = ['%s.%s' % (p_name, ext)
+               for p_name in self.dispersion.keys()
+               for ext in ('npts', 'nsigmas', 'width')]
         #print(ret)
         return ret