Changeset dd16e07 in sasmodels

Timestamp:

Sep 25, 2018 7:15:47 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

284bdd4, da7b26b

Parents:

2015f02 (diff), 91bd550 (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.

git-author:

Paul Butler <butlerpd@…> (09/25/18 19:15:47)

git-committer:

GitHub <noreply@…> (09/25/18 19:15:47)

Message:

Merge pull request #80 from SasView?/ticket-1173-cache-loadinfo

Ticket 1173: cache load info

Closes #1173

Files:

• sasmodels/custom/__init__.py (modified) (1 diff)
• sasmodels/kernelpy.py (modified) (1 diff)
• sasmodels/sasview_model.py (modified) (4 diffs)
• doc/guide/plugin.rst (modified) (1 diff)

sasmodels/custom/__init__.py

@@ -37 +37 @@
         return module
 
+_MODULE_CACHE = {}
+_MODULE_DEPENDS = {}
+_MODULE_DEPENDS_STACK = []
 def load_custom_kernel_module(path):
     """load SAS kernel from *path* as *sasmodels.custom.modelname*"""
     # Pull off the last .ext if it exists; there may be others
     name = basename(splitext(path)[0])
-    # Placing the model in the 'sasmodels.custom' name space.
-    kernel_module = load_module_from_path('sasmodels.custom.'+name,
-                                          os.path.expanduser(path))
-    return kernel_module
+    path = os.path.expanduser(path)
+
+    # reload module if necessary
+    if need_reload(path):
+        # Push to the next dependency level
+        _MODULE_DEPENDS_STACK.append(path)
+        _MODULE_DEPENDS[path] = set([path])
+
+        # Load module into the 'sasmodels.custom' name space.
+        # If this triggers any submodule loads then they will be added
+        # as dependencies below when _MODULE_DEPENDS_STACK is not empty.
+        module = load_module_from_path('sasmodels.custom.'+name, path)
+
+        # Pop the dependency level
+        _MODULE_DEPENDS_STACK.pop()
+
+        # TODO: include external C code in the dependencies
+        # If we had the model info structure we could do the following:
+        #    _MODEL_DEPENDS[path].extend(generate.model_sources(info))
+        # but at this point all we have is the module.  Don't want to
+        # repeat the logic in modelinfo.make_model_info.
+
+        # Cache the module with the newest timestamp
+        timestamp = max(os.path.getmtime(f) for f in _MODULE_DEPENDS[path])
+        _MODULE_CACHE[path] = module, timestamp
+
+        #print("loading", os.path.basename(path), _MODULE_CACHE[path][1],
+        #    [os.path.basename(p) for p in _MODULE_DEPENDS[path]])
+
+    if _MODULE_DEPENDS_STACK:
+        # Add child and all its dependence to the parent module
+        working_on = _MODULE_DEPENDS_STACK[-1]
+        _MODULE_DEPENDS[working_on].update(_MODULE_DEPENDS[path])
+
+    return _MODULE_CACHE[path][0]
+
+def need_reload(path):
+    # TODO: fails if a dependency has a modification time in the future
+    # If the newest dependency has a time stamp in the future, then this
+    # will be recorded as the cached time.  When a second dependency
+    # is updated to the current time stamp, it will still be considered
+    # older than the current build and the reload will not be triggered.
+    # Could instead treat all future times as 0 here and in the code above
+    # which records the newest timestamp.  This will force a reload when
+    # the future time is reached, but other than that should perform
+    # correctly.  Probably not worth the extra code...
+    _, cache_time = _MODULE_CACHE.get(path, (None, -1))
+    depends = _MODULE_DEPENDS.get(path, [path])
+    return any(cache_time < os.path.getmtime(p) for p in depends)

sasmodels/kernelpy.py

@@ -37 +37 @@
         self.info = model_info
         self.dtype = np.dtype('d')
-        logger.info("load python model " + self.info.name)
 
     def make_kernel(self, q_vectors):

sasmodels/sasview_model.py

@@ -62 +62 @@
 #: set of defined models (standard and custom)
 MODELS = {}  # type: Dict[str, SasviewModelType]
+# TODO: remove unused MODEL_BY_PATH cache once sasview no longer references it
 #: custom model {path: model} mapping so we can check timestamps
 MODEL_BY_PATH = {}  # type: Dict[str, SasviewModelType]
@@ -106 +107 @@
     Load a custom model given the model path.
     """
-    model = MODEL_BY_PATH.get(path, None)
-    if model is not None and model.timestamp == getmtime(path):
-        #logger.info("Model already loaded %s", path)
-        return model
-
     #logger.info("Loading model %s", path)
     kernel_module = custom.load_custom_kernel_module(path)
@@ -127 +123 @@
         model_info = modelinfo.make_model_info(kernel_module)
         model = make_model_from_info(model_info)
-    model.timestamp = getmtime(path)
 
     # If a model name already exists and we are loading a different model,
@@ -144 +139 @@
 
     MODELS[model.name] = model
-    MODEL_BY_PATH[path] = model
     return model
 

doc/guide/plugin.rst

@@ -423 +423 @@
 calculations, but instead rely on numerical integration to compute the
 appropriately smeared pattern.
+
+Each .py file also contains a function::
+
+        def random():
+        ...
+        
+This function provides a model-specific random parameter set which shows model 
+features in the USANS to SANS range.  For example, core-shell sphere sets the 
+outer radius of the sphere logarithmically in `[20, 20,000]`, which sets the Q 
+value for the transition from flat to falling.  It then uses a beta distribution 
+to set the percentage of the shape which is shell, giving a preference for very 
+thin or very thick shells (but never 0% or 100%).  Using `-sets=10` in sascomp 
+should show a reasonable variety of curves over the default sascomp q range.  
+The parameter set is returned as a dictionary of `{parameter: value, ...}`.  
+Any model parameters not included in the dictionary will default according to 
+the code in the `_randomize_one()` function from sasmodels/compare.py.
 
 Python Models