Changes in / [130d4c7:9ed53e7] in sasmodels

File:

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

sasmodels/sasview_model.py

@@ -16 +16 @@
 import logging
 from os.path import basename, splitext
+import thread
 
 import numpy as np  # type: ignore
@@ -38 +39 @@
 except ImportError:
     pass
+
+calculation_lock = thread.allocate_lock()
 
 SUPPORT_OLD_STYLE_PLUGINS = True
@@ -605 +608 @@
         to the card for each evaluation.
         """
+        ## uncomment the following when trying to debug the uncoordinated calls
+        ## to calculate_Iq
+        #if calculation_lock.locked():
+        #    logging.info("calculation waiting for another thread to complete")
+        #    logging.info("\n".join(traceback.format_stack()))
+
+        with calculation_lock:
+            return self._calculate_Iq(qx, qy)
+
+    def _calculate_Iq(self, qx, qy=None):
         #core.HAVE_OPENCL = False
         if self._model is None: