Multiclass-interface 1.7__tar.gz → 1.9__tar.gz

{multiclass_interface-1.7 → multiclass_interface-1.9/Multiclass_interface.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Multiclass_interface
-Version: 1.7
+Version: 1.9
 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.7/Multiclass_interface.egg-info → multiclass_interface-1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Multiclass_interface
-Version: 1.7
+Version: 1.9
 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.7 → multiclass_interface-1.9}/multiclass_interface/mpi_interface.py

@@ -56,6 +56,10 @@ class MPIClassInterface():
             class Dummy():
                 def close(self):
                     pass
+
+                def __getattr__(self, name):
+                    raise AttributeError(
+                        f"rank {rank} trying to access {name}, but only {len(args_lst)} instances of {cls.__name__} exists")
             self.object = Dummy()
         self.closed = False
 
@@ -91,12 +95,6 @@ class MPIClassInterface():
                 res = None
             elif method == 'setattr':
                 name, value = args
-                if hasattr(value, '__call__'):
-                    def wrap(*args, func=value, **kwargs):
-                        if inspect.getfullargspec(func).args[:1] == ['self']:
-                            args = (self.object,) + args
-                        return func(*args, **kwargs)
-                    value = wrap
                 res = setattr(self.object, name, value)
             else:
                 res = getattr(self.object, method)
@@ -124,11 +122,15 @@ class MPIClassInterface():
 
     def get_input(self, name, i, args, kwargs):
         use_rank = self.use_rank
-        N = np.sum(use_rank)
+        if COLLECTIVE_MPI:
+            N = np.sum(use_rank)
+            j = sum(use_rank[:i])
+        else:
+            N = 1
         if use_rank[i]:
             def get_arg(arg):
                 if isinstance(arg, list) and len(arg) == N:
-                    return arg[np.where(use_rank)[0][i]]
+                    return arg[j]
                 else:
                     return arg
             return (name, [get_arg(arg) for arg in args], {k: get_arg(v) for k, v in kwargs.items()})
@@ -141,22 +143,20 @@ class MPIClassInterface():
         elif COLLECTIVE_MPI and rank > 0:
             self.work_loop()
             return lambda *args, **kwargs: 1
-        elif not self.use_rank[rank]:
-            raise ChildProcessError('MPI worker not used')
+        elif rank > 0 and not self.use_rank[rank]:
+            raise ChildProcessError(f'MPI worker {rank} not used')
 
         def wrap(*args, **kwargs):
             if COLLECTIVE_MPI:
                 inp = [self.get_input(name, i, args, kwargs) for i in range(size)]
                 return self.run_task(inp)
             else:
-                return self.do_task(name, args, kwargs)
-
+                method, args, kwargs = self.get_input(name, 0, args, kwargs)
+                return [self.do_task(name, args, kwargs)]
         if hasattr(getattr(self.object, name), '__call__'):
             res = wrap
         else:
             res = wrap()
-            if not COLLECTIVE_MPI:
-                res = [res]
         return res
 
     def __setattr__(self, name, value):

{multiclass_interface-1.7 → multiclass_interface-1.9}/multiclass_interface/multiprocess_interface.py

@@ -28,9 +28,8 @@ def run(cls, inputQueue, outputQueue, cls_args, **kwargs):
                         if inspect.getfullargspec(func).args[:1] == ['self']:
                             args = (o,) + args
                         return func(*args, **kwargs)
-                    outputQueue.put(setattr(o, name, wrap))
-                else:
-                    outputQueue.put(setattr(o, name, value))
+                    value = wrap
+                outputQueue.put(setattr(o, name, value))
             elif method == 'iscallable':
                 name = args[0]
                 outputQueue.put(hasattr(getattr(o, name), '__call__'))
@@ -92,8 +91,9 @@ class ProcessClass():
             def wrap(*args, wait_for_result=True, **kwargs):
                 self.inputQueue.put((name, args, kwargs))
                 if wait_for_result:
-                    return self.get_result(raise_exception=True,
-                                           cmd=lambda: f'executing {name}({", ".join(list(map(str,args))+["%s=%s"%(k,v) for k,v in kwargs.items()])})')
+                    return self.get_result(
+                        raise_exception=True,
+                        cmd=lambda: f'executing {name}({", ".join(list(map(str, args)) + ["%s=%s" % (k, v) for k, v in kwargs.items()])})')
             return wrap
         else:
             self.inputQueue.put(('getattr', (name,), {}))

{multiclass_interface-1.7 → multiclass_interface-1.9}/multiclass_interface/tests/test_mpi.py

@@ -53,7 +53,7 @@ def mpitest_non_collective_mpi():
     with MPIClassInterface(MyTest, [(i + 10,) for i in range(N)]) as m:
 
         try:
-            assert m.get_id() == rank + 10
+            assert m.get_id()[0] == rank + 10, m.get_id()
             assert rank < N  # rank > N will fail with ChildProcessError
         except ChildProcessError:
             pass

{multiclass_interface-1.7 → multiclass_interface-1.9}/multiclass_interface/tests/test_multiprocessinterface.py

@@ -1,7 +1,7 @@
 from numpy import testing as npt
 import pytest
 
-from multiclass_interface.multiprocess_interface import MultiProcessClassInterface, MultiThreadClassInterface,\
+from multiclass_interface.multiprocess_interface import MultiProcessClassInterface, MultiThreadClassInterface, \
     ProcessClass
 from multiclass_interface.tests.my_test_cls import MyTest
 from threading import Thread
@@ -45,10 +45,6 @@ def get_process_id():
     return os.getpid()
 
 
-def get_name(self):
-    return self.name
-
-
 def test_setattr_method(mpri):
     mpri.get_process_id = get_process_id
     main_id = get_process_id()
@@ -61,9 +57,6 @@ def test_setattr_method(mpri):
         assert pid1 != pid2
         assert pid2 != pid3
 
-    mpri.get_name = get_name
-    assert mpri.get_name() == mpri.name
-
 
 def test_str(mpri):
     assert str(mpri).startswith(

{multiclass_interface-1.7 → multiclass_interface-1.9}/multiclass_interface/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7'
-__version_tuple__ = version_tuple = (1, 7)
+__version__ = version = '1.9'
+__version_tuple__ = version_tuple = (1, 9)