Multiclass-interface 1.6__tar.gz → 1.8__tar.gz

{multiclass_interface-1.6 → multiclass_interface-1.8/Multiclass_interface.egg-info}/PKG-INFO

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

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

@@ -124,7 +124,10 @@ 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)
+        else:
+            N = 1
         if use_rank[i]:
             def get_arg(arg):
                 if isinstance(arg, list) and len(arg) == N:
@@ -149,14 +152,13 @@ class MPIClassInterface():
                 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.6 → multiclass_interface-1.8}/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.6 → multiclass_interface-1.8}/multiclass_interface/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6'
-__version_tuple__ = version_tuple = (1, 6)
+__version__ = version = '1.8'
+__version_tuple__ = version_tuple = (1, 8)