Merge branch 'master' into 774_remove_free_all_by_default

Author: Dimitar Tasev

mantidimaging/core/parallel/test/utility_test.py

@@ -2,8 +2,11 @@
 # SPDX - License - Identifier: GPL-3.0-or-later
 
 import mock
+import numpy as np
+import SharedArray as sa
 
-from mantidimaging.core.parallel.utility import multiprocessing_necessary, execute_impl
+from mantidimaging.core.parallel.utility import (create_array, create_shared_name, execute_impl,
+                                                 free_all_owned_by_this_instance, multiprocessing_necessary)
 
 
 def test_correctly_chooses_parallel():
@@ -38,6 +41,25 @@ def test_execute_impl_par(mock_pool):
     assert mock_progress.update.call_count == 15
 
 
+def test_free_all_owned_by_this_instance():
+    name1 = create_shared_name()
+    name2 = create_shared_name()
+    name3 = create_shared_name()
+    create_array((10, 10), np.float32, name=name1)
+    create_array((10, 10), np.float32, name=name2)
+    create_array((10, 10), np.float32, name=name3)
+
+    temp_name = "not_this_instance"
+    sa.create("not_this_instance", (10, 10))
+
+    free_all_owned_by_this_instance()
+    assert name1 not in [arr.name.decode("utf-8") for arr in sa.list()]
+    assert name2 not in [arr.name.decode("utf-8") for arr in sa.list()]
+    assert name3 not in [arr.name.decode("utf-8") for arr in sa.list()]
+    assert temp_name in [arr.name.decode("utf-8") for arr in sa.list()]
+    sa.delete(temp_name)
+
+
 if __name__ == "__main__":
     import pytest
 

mantidimaging/core/parallel/utility.py

@@ -24,6 +24,13 @@
 
 NP_DTYPE = Type[np.single]
 
+INSTANCE_PREFIX = str(uuid.uuid4())
+
+
+def free_all_owned_by_this_instance():
+    for arr in [array for array in sa.list() if array.name.decode("utf-8").startswith(INSTANCE_PREFIX)]:
+        sa.delete(arr.name.decode("utf-8"))
+
 
 def has_other_shared_arrays() -> bool:
     return len(sa.list()) > 0
@@ -35,7 +42,7 @@ def free_all():
 
 
 def create_shared_name(file_name=None) -> str:
-    return f"{uuid.uuid4()}{f'-{os.path.basename(file_name)}' if file_name is not None else ''}"
+    return f"{INSTANCE_PREFIX}-{uuid.uuid4()}{f'-{os.path.basename(file_name)}' if file_name is not None else ''}"
 
 
 def delete_shared_array(name, silent_failure=False):

mantidimaging/main.py

@@ -7,9 +7,8 @@
 import logging
 import warnings
 
-import SharedArray as sa
-
 from mantidimaging import helper as h
+from mantidimaging.core.parallel.utility import free_all_owned_by_this_instance
 from mantidimaging.core.utility.optional_imports import safe_import
 
 formatwarning_orig = warnings.formatwarning
@@ -42,11 +41,7 @@ def parse_args():
 
 
 def main():
-    def free_all():
-        for arr in sa.list():
-            sa.delete(arr.name.decode("utf-8"))
-
-    atexit.register(free_all)
+    atexit.register(free_all_owned_by_this_instance)
     args = parse_args()
     # Print version number and exit
     if args.version:
@@ -57,7 +52,6 @@ def free_all():
 
     h.initialise_logging(logging.getLevelName(args.log_level))
     startup_checks()
-    free_all()
 
     from mantidimaging import gui
     gui.execute()