Changes in / [899e050:9d8a027] in sasmodels

File:

• sasmodels/sasview_model.py (modified) (4 diffs)

sasmodels/sasview_model.py

@@ -25 +25 @@
 from . import core
 from . import custom
-from . import kernelcl
 from . import product
 from . import generate
@@ -31 +30 @@
 from . import modelinfo
 from .details import make_kernel_args, dispersion_mesh
-from .kernelcl import reset_environment
 
 # pylint: disable=unused-import
@@ -70 +68 @@
 #: has changed since we last reloaded.
 _CACHED_MODULE = {}  # type: Dict[str, "module"]
-
-def reset_environment():
-    # type: () -> None
-    """
-    Clear the compute engine context so that the GUI can change devices.
-
-    This removes all compiled kernels, even those that are active on fit
-    pages, but they will be restored the next time they are needed.
-    """
-    kernelcl.reset_environment()
-    for model in MODELS.values():
-        model._model = None
 
 def find_model(modelname):
@@ -694 +680 @@
     def _calculate_Iq(self, qx, qy=None):
         if self._model is None:
-            # Only need one copy of the compiled kernel regardless of how many
-            # times it is used, so store it in the class.  Also, to reset the
-            # compute engine, need to clear out all existing compiled kernels,
-            # which is much easier to do if we store them in the class.
-            self.__class__._model = core.build_model(self._model_info)
+            self._model = core.build_model(self._model_info)
         if qy is not None:
             q_vectors = [np.asarray(qx), np.asarray(qy)]