Adds a unique prefix for all allocations of this instance

Only deletes them on shutdown.

Adds test

Fixes #745

Author: Dimitar Tasev

mantidimaging/core/parallel/test/utility_test.py

@@ -2,8 +2,10 @@
 # SPDX - License - Identifier: GPL-3.0-or-later
 
 import mock
+import numpy as np
 
-from mantidimaging.core.parallel.utility import multiprocessing_necessary, execute_impl
+from mantidimaging.core.parallel.utility import create_array, free_all_owned_by_this_instance, multiprocessing_necessary, execute_impl
+import SharedArray as sa
 
 
 def test_correctly_chooses_parallel():
@@ -38,6 +40,21 @@ def test_execute_impl_par(mock_pool):
     assert mock_progress.update.call_count == 15
 
 
+def test_free_all_owned_by_this_instance():
+    [sa.delete(x.name.decode("utf-8")) for x in sa.list()]
+    create_array((10, 10), np.float32, random_name=True)
+    create_array((10, 10), np.float32, random_name=True)
+    create_array((10, 10), np.float32, random_name=True)
+
+    temp_name = "not_this_instance"
+    sa.create("not_this_instance", (10, 10))
+
+    assert len(sa.list()) == 4
+    free_all_owned_by_this_instance()
+    assert len(sa.list()) == 1
+    sa.delete(temp_name)
+
+
 if __name__ == "__main__":
     import pytest
 

mantidimaging/core/parallel/utility.py

@@ -24,9 +24,16 @@
 
 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 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

@@ -5,6 +5,7 @@
 import argparse
 import atexit
 import logging
+from mantidimaging.core.parallel.utility import INSTANCE_PREFIX, free_all_owned_by_this_instance
 import warnings
 
 import SharedArray as sa
@@ -42,11 +43,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 +54,6 @@ def free_all():
 
     h.initialise_logging(logging.getLevelName(args.log_level))
     startup_checks()
-    free_all()
 
     from mantidimaging import gui
     gui.execute()