Changeset 68e7f9d in sasmodels

Timestamp:

Apr 4, 2016 10:18:02 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:

9d96649

Parents:

5b0335b

Message:

remove pyc file after loading custom model

Location:

sasmodels

Files:

• core.py (modified) (3 diffs)
• custom/__init__.py (added)
• direct_model.py (modified) (2 diffs)
• generate.py (modified) (3 diffs)

sasmodels/core.py

@@ -9 +9 @@
 from os.path import basename, dirname, join as joinpath, splitext
 from glob import glob
-import imp
 
 import numpy as np
@@ -29 +28 @@
 
 try:
-    # Python 3.5 and up
-    from importlib.util import spec_from_file_location, module_from_spec
-    def load_module(fullname, path):
-        spec = spec_from_file_location(fullname, path)
-        module = module_from_spec(spec)
-        spec.loader.exec_module(module)
-        return module
-except ImportError:
-    # CRUFT: python 2
-    import imp
-    def load_module(fullname, path):
-        module = imp.load_source(fullname, path)
-        return module
-
-try:
     np.meshgrid([])
     meshgrid = np.meshgrid
@@ -98 +82 @@
         return product.make_product_info(P_info, Q_info)
 
-    kernel_module = load_kernel_module(model_name)
+    kernel_module = generate.load_kernel_module(model_name)
     return generate.make_model_info(kernel_module)
-
-
-def load_kernel_module(model_name):
-    if model_name.endswith('.py'):
-        path = model_name
-        # 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.
-        from sasmodels import custom
-        kernel_module = load_module('sasmodels.custom.'+name, path)
-    else:
-        from sasmodels import models
-        __import__('sasmodels.models.'+model_name)
-        kernel_module = getattr(models, model_name, None)
-    #import sys; print "\n".join(sys.path)
-    __import__('sasmodels.models.'+model_name)
-    kernel_module = getattr(models, model_name, None)
-    return kernel_module
 
 

sasmodels/direct_model.py

@@ -25 +25 @@
 import numpy as np
 
-from .core import make_kernel
 from .core import call_kernel, call_ER_VR
 from . import sesans
@@ -171 +170 @@
     def _calc_theory(self, pars, cutoff=0.0):
         if self._kernel is None:
-            self._kernel = make_kernel(self._model, self._kernel_inputs)  # pylint: disable=attribute-dedata_type
-            self._kernel_mono = (make_kernel(self._model, self._kernel_mono_inputs)
+            self._kernel = self._model.make_kernel(self._kernel_inputs)
+            self._kernel_mono = (self._model.make_kernel(self._kernel_mono_inputs)
                                  if self._kernel_mono_inputs else None)
 

sasmodels/generate.py

@@ -193 +193 @@
 
 from .modelinfo import ModelInfo, Parameter, make_parameter_table, set_demo
+from .custom import load_custom_kernel_module
 
 # TODO: identify model files which have changed since loading and reload them.
@@ -662 +663 @@
             return Iq(np.sqrt(qx**2 + qy**2), **kw)
         model_info['Iqxy'] = Iqxy
+
+
+def load_kernel_module(model_name):
+    if model_name.endswith('.py'):
+        kernel_module = load_custom_kernel_module(model_name)
+    else:
+        from sasmodels import models
+        __import__('sasmodels.models.'+model_name)
+        kernel_module = getattr(models, model_name, None)
+    return kernel_module
 
 
@@ -811 +822 @@
     """
     import sys
-    from sasmodels.core import make_model_by_name
     if len(sys.argv) <= 1:
         print("usage: python -m sasmodels.generate modelname")
     else:
         name = sys.argv[1]
-        model_info = make_model_by_name(name)
+        kernel_module = load_kernel_module(name)
+        model_info = make_model_info(kernel_module)
         source = make_source(model_info)
         print(source)