Changeset 839fd68 in sasmodels

Timestamp:

Sep 17, 2018 2:33:16 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

91bd550

Parents:

2c12061

Message:

cache modules by timestamp in the custom kernel loader

Location:

sasmodels

Files:

• custom/__init__.py (modified) (1 diff)
• sasview_model.py (modified) (4 diffs)

sasmodels/custom/__init__.py

@@ -37 +37 @@
         return module
 
+_MODULE_CACHE = {}
 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)
+    timestamp = os.path.getmtime(path)
+    module, cache_time = _MODULE_CACHE.get(path, (None, -1))
+    if cache_time < timestamp:
+        # Placing the model in the 'sasmodels.custom' name space.
+        module = load_module_from_path('sasmodels.custom.'+name, path)
+        _MODULE_CACHE[path] = module, timestamp
+
+    return module

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