Multiclass-interface 1.0__py3-none-any.whl → 1.2__py3-none-any.whl

{Multiclass_interface-1.0.dist-info → Multiclass_interface-1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Multiclass_interface
-Version: 1.0
+Version: 1.2
 Summary: Multiclass interface
 Author-email: "Mads M. Pedersen" <mmpe@dtu.dk>
 Project-URL: Homepage, https://gitlab.windenergy.dtu.dk/DYNAMIKS/multiclass_interface

Multiclass_interface-1.2.dist-info/RECORD

@@ -0,0 +1,15 @@
+multiclass_interface/__init__.py,sha256=1kI9Vxsap_8eap6kldNHhIWLEVBT2DLWl2UbTOTnVN0,114
+multiclass_interface/mpi_interface.py,sha256=CJCKbRQnE8jDndwjzlIy-0VKplsd4c0IUeT-oXbtbOY,5716
+multiclass_interface/multi_object_list.py,sha256=GmLKWUsu9Vf3Qcy7SlhxqPW_yDw2pzo2EFkkF8R94Dg,2022
+multiclass_interface/multiprocess_interface.py,sha256=S0gO9u4mQrbhpxarKMD0i7M35EVC9vaKjp3Ls4Y26KU,8169
+multiclass_interface/version.py,sha256=ygh-DNoh7nLBcVxwMCbHzWEyaJaMAEWs6Q04Ah2QTz0,406
+multiclass_interface/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+multiclass_interface/tests/my_test_cls.py,sha256=KDcM0zcwwFAcXJhHdl0KHd45MaqHvR8mxHdoUqmbC_E,826
+multiclass_interface/tests/test_mpi.py,sha256=aDIvB3o5MNHfkLxCiTl-crIDXyLYbFt9hpRZlop3i7I,2408
+multiclass_interface/tests/test_multiclass_list.py,sha256=W7w5wiA3-_wgL9lOCRDsCijikJiHVrp5RqBYwJzWxp4,515
+multiclass_interface/tests/test_multiprocessinterface.py,sha256=u2BVzoq7YB7L4jwKiveyQheCgQ2O7CGg5nQl9M1rTzM,3165
+Multiclass_interface-1.2.dist-info/LICENSE,sha256=oApPkWzMlqIJF9EOB2gV6yvdsm6a2-AW94wuayHIz70,1094
+Multiclass_interface-1.2.dist-info/METADATA,sha256=HVPvQX8xwZMqsF8wQjK3JPLjLOj5Uv6B3G35Z1pgSSo,1580
+Multiclass_interface-1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Multiclass_interface-1.2.dist-info/top_level.txt,sha256=LOL3xjSUkjW6thjDr0IMvgkitnbsNokahxl-HjgOJG4,21
+Multiclass_interface-1.2.dist-info/RECORD,,

multiclass_interface/mpi_interface.py

@@ -1,27 +1,24 @@
 import numpy as np
 import sys
-import os
-import subprocess
 import traceback
 import inspect
-from enum import Enum
 
-if 'SLURM_NTASKS' in os.environ:
-    mpi = int(os.environ['SLURM_NTASKS']) > 1
-elif any([k in os.environ for k in ['MPI_LOCALNRANKS', 'OMPI_COMM_WORLD_SIZE']]):
-    mpi = True
-else:
-    mpi = subprocess.run("python -c 'from mpi4py import MPI'", shell=True,
-                         check=False, stderr=subprocess.PIPE).returncode == 0
+comm = None
+size = 1
+rank = 0
+name = ""
+main = True
 
-if mpi:
+
+def activate_mpi():
+    global comm, size, rank, name, main
     from mpi4py import MPI
     comm = MPI.COMM_WORLD
     size = MPI.COMM_WORLD.Get_size()
     rank = MPI.COMM_WORLD.Get_rank()
     name = MPI.Get_processor_name()
-else:
-    size = 1
+    main = rank == 0
+
 
 MPIClassInterfaceAttributes = {
     'close',

multiclass_interface/multiprocess_interface.py

@@ -48,8 +48,9 @@ def run(cls, inputQueue, outputQueue, cls_args, **kwargs):
 class ProcessClass():
     cls = None
 
-    def __init__(self, cls, cls_attrs={}):
+    def __init__(self, cls, cls_attrs={}, index=""):
         self.cls_attrs = cls_attrs
+        self.index = index
         self.cls = cls
         self.ctx = multiprocessing.get_context('spawn')
         self.inputQueue = self.ctx.Queue()
@@ -103,7 +104,7 @@ class ProcessClass():
         return self.get_result(raise_exception=True, cmd=lambda: f"checking if '{name}' is callable")
 
     def __setattr__(self, name, value):
-        if name in {'cls', 'ctx', 'inputQueue', 'outputQueue', 'closed', 'process', 'cls_attrs'}:
+        if name in {'cls', 'ctx', 'inputQueue', 'outputQueue', 'closed', 'process', 'cls_attrs', 'index'}:
             return object.__setattr__(self, name, value)
         else:
             self.inputQueue.put(('setattr', (name, value), {}))
@@ -124,7 +125,10 @@ class ProcessClass():
             else:
                 if hasattr(cmd, '__call__'):
                     cmd = cmd()
-                e = Exception(f'{self.cls.__name__} process died before or while {cmd}')
+                p_id = f'{self.cls.__name__} process'
+                if self.index:
+                    p_id += f" index {self.index}"
+                e = Exception(f'{p_id} died before or while {cmd}')
                 if raise_exception:
                     raise e
                 return e
@@ -153,7 +157,8 @@ class ThreadClass(ProcessClass):
 class MultiProcessClassInterface(MultiObjectList):
 
     def __init__(self, cls, args_lst, cls_attrs={}):
-        MultiObjectList.__init__(self, [ProcessClass(cls, cls_attrs)(*args) for args in args_lst], SubsetProcessWrapper)
+        MultiObjectList.__init__(self, [ProcessClass(cls, cls_attrs, i)(*args)
+                                 for i, args in enumerate(args_lst)], SubsetProcessWrapper)
 
     def __getattr__(self, name):
         obj_lst = self.obj_lst

multiclass_interface/tests/test_mpi.py

@@ -46,9 +46,9 @@ def mpitest_mpi_ProcessClass():
 
 
 def mpitest_all():
+    mpi_interface.activate_mpi()
     mpi_interface.exit_mpi_on_close = False
-    from mpi4py import MPI
-    rank = MPI.COMM_WORLD.Get_rank()
+    rank = mpi_interface.rank
     from multiclass_interface.tests.test_multiprocessinterface import test_attribute, test_missing_attribute, test_execption, test_setattr, test_setattr_method
     mpi_interface.TERMINATE_ON_CLOSE = False
 

multiclass_interface/tests/test_multiprocessinterface.py

@@ -79,11 +79,12 @@ def test_subset(mpri):
         mpri[1].close()
 
 
-def test_():
-    pri = ProcessClass(MyTest)(1)
+@pytest.mark.parametrize('index,s', [('', ''), (5, ' index 5')])
+def test_dying_process(index, s):
+    pri = ProcessClass(MyTest, index=index)(1)
 
     def run():
-        with pytest.raises(Exception, match="MyTest process died before or while checking if 'work' is callable"):
+        with pytest.raises(Exception, match=f"MyTest process{s} died before or while checking if 'work' is callable"):
             pri.work(5)
     t = Thread(target=run)
     t.start()

multiclass_interface/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0'
-__version_tuple__ = version_tuple = (1, 0)
+__version__ = version = '1.2'
+__version_tuple__ = version_tuple = (1, 2)

Multiclass_interface-1.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-multiclass_interface/__init__.py,sha256=1kI9Vxsap_8eap6kldNHhIWLEVBT2DLWl2UbTOTnVN0,114
-multiclass_interface/mpi_interface.py,sha256=x-ZQHklNuyzhsnzGMayGaWOkK-RVitT483oZ2FGHeB4,5993
-multiclass_interface/multi_object_list.py,sha256=GmLKWUsu9Vf3Qcy7SlhxqPW_yDw2pzo2EFkkF8R94Dg,2022
-multiclass_interface/multiprocess_interface.py,sha256=_mgQeX-YJctyPEKyXH_WguUM6FeTJfLc7B0WSTf4MAk,7958
-multiclass_interface/version.py,sha256=NqIxvFkGTmjWkkWwq7_lHTaOlQBhNyI1nf75AHO9AOs,406
-multiclass_interface/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-multiclass_interface/tests/my_test_cls.py,sha256=KDcM0zcwwFAcXJhHdl0KHd45MaqHvR8mxHdoUqmbC_E,826
-multiclass_interface/tests/test_mpi.py,sha256=J-B-_ndKG6z5-uDz-nvA7AyHHK7aBcI5VTHYHGJ33gc,2409
-multiclass_interface/tests/test_multiclass_list.py,sha256=W7w5wiA3-_wgL9lOCRDsCijikJiHVrp5RqBYwJzWxp4,515
-multiclass_interface/tests/test_multiprocessinterface.py,sha256=JXD3DdB9dV8-m8X0K-DMNIOUW79i01Ex3Z_AAZIMcLc,3062
-Multiclass_interface-1.0.dist-info/LICENSE,sha256=oApPkWzMlqIJF9EOB2gV6yvdsm6a2-AW94wuayHIz70,1094
-Multiclass_interface-1.0.dist-info/METADATA,sha256=c0heDby7rIcBKtDUjmefmuqBHiTcvlzUk8O7Tw4r9_o,1580
-Multiclass_interface-1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Multiclass_interface-1.0.dist-info/top_level.txt,sha256=LOL3xjSUkjW6thjDr0IMvgkitnbsNokahxl-HjgOJG4,21
-Multiclass_interface-1.0.dist-info/RECORD,,