Multiclass-interface 1.15__tar.gz → 1.18__tar.gz

{multiclass_interface-1.15 → multiclass_interface-1.18}/.gitlab-ci.yml

@@ -42,7 +42,7 @@ pypi_linux:
     #- pip install pypandoc
     - pip install -e . --upgrade
     - pip install --upgrade build
-    - pip install twine==6.0.1 --upgrade 
+    - pip install twine packaging --upgrade 
     - python3 -m build
     - twine upload dist/* -u $TWINE_USERNAME -p $TWINE_PASSWORD
   rules:

{multiclass_interface-1.15 → multiclass_interface-1.18/Multiclass_interface.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: Multiclass_interface
-Version: 1.15
+Version: 1.18
 Summary: Multiclass interface
 Author-email: "Mads M. Pedersen" <mmpe@dtu.dk>
 Project-URL: Homepage, https://gitlab.windenergy.dtu.dk/DYNAMIKS/multiclass_interface
@@ -15,6 +15,7 @@ Requires-Dist: numpy
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Dynamic: license-file
 
 # Multiclass interface
 

{multiclass_interface-1.15 → multiclass_interface-1.18}/Multiclass_interface.egg-info/SOURCES.txt

@@ -8,6 +8,8 @@ Multiclass_interface.egg-info/PKG-INFO
 Multiclass_interface.egg-info/SOURCES.txt
 Multiclass_interface.egg-info/dependency_links.txt
 Multiclass_interface.egg-info/requires.txt
+Multiclass_interface.egg-info/scm_file_list.json
+Multiclass_interface.egg-info/scm_version.json
 Multiclass_interface.egg-info/top_level.txt
 multiclass_interface/__init__.py
 multiclass_interface/mpi_interface.py

multiclass_interface-1.18/Multiclass_interface.egg-info/scm_file_list.json

@@ -0,0 +1,19 @@
+{
+  "files": [
+    ".gitignore",
+    ".gitlab-ci.yml",
+    "LICENSE",
+    "README.md",
+    "multiclass_interface/__init__.py",
+    "multiclass_interface/mpi_interface.py",
+    "multiclass_interface/multi_object_list.py",
+    "multiclass_interface/multiprocess_interface.py",
+    "multiclass_interface/tests/__init__.py",
+    "multiclass_interface/tests/my_test_cls.py",
+    "multiclass_interface/tests/test_mpi.py",
+    "multiclass_interface/tests/test_multiclass_list.py",
+    "multiclass_interface/tests/test_multiprocessinterface.py",
+    "pyproject.toml",
+    "sequence_diagrams.md"
+  ]
+}

multiclass_interface-1.18/Multiclass_interface.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.18",
+  "distance": 0,
+  "node": "gb934019843ac9640a5beae7880add16d3c7e3838",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-23"
+}

{multiclass_interface-1.15/Multiclass_interface.egg-info → multiclass_interface-1.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: Multiclass_interface
-Version: 1.15
+Version: 1.18
 Summary: Multiclass interface
 Author-email: "Mads M. Pedersen" <mmpe@dtu.dk>
 Project-URL: Homepage, https://gitlab.windenergy.dtu.dk/DYNAMIKS/multiclass_interface
@@ -15,6 +15,7 @@ Requires-Dist: numpy
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Dynamic: license-file
 
 # Multiclass interface
 

{multiclass_interface-1.15 → multiclass_interface-1.18}/multiclass_interface/mpi_interface.py

@@ -1,4 +1,9 @@
+import inspect
+from pathlib import Path
+import pytest
+import os
 import numpy as np
+import shutil
 import sys
 import traceback
 from contextlib import contextmanager
@@ -155,7 +160,7 @@ class MPIClassInterface():
     def __getattribute__(self, name):
         if name in MPIClassInterfaceAttributes:
             return object.__getattribute__(self, name)
-        elif not self.use_rank[rank]:
+        elif not COLLECTIVE_MPI and not self.use_rank[rank]:
             raise ChildProcessError(f'MPI worker {rank} not used')
 
         def wrap(*args, **kwargs):
@@ -234,3 +239,68 @@ class SubsetMPIClassInterface(MPIClassInterface):
 
     def close(self):
         raise Exception('Cannot close SubsetMPIClassInterface. Please close all instances at once')
+
+
+def barrier_print(s):
+    from mpi4py import MPI
+
+    newData = comm.gather(rank, root=0)
+    newData = comm.gather(rank, root=0)
+    import sys
+    sys.stdout.flush()
+    if rank == 0:
+        print("#########", s, newData, flush=True)
+
+
+def bcast_function_result(f):
+    # Decorator to broadcast the return value of a function as a wt dependent list to all mpi workers
+    # collect the return value from each mpiworker and broadcast the full list with wt as first dimension to all workers
+    def wrapper(*args, **kwargs):
+        if mpi:
+            try:
+                v = f(*args, **kwargs)[0]
+            except ChildProcessError:
+                v = None
+
+            # collect the return value from each mpiworker (wt as first dimension)
+            v = comm.gather(v, root=0)
+            # broadcast the full list to all workers
+            return comm.bcast(v, root=0)
+        else:
+            return f(*args, **kwargs)
+    return wrapper
+
+
+def mpi_run_test(n, cwd='.', mpirun_cmd='mpirun'):
+    if callable(n):
+        return mpi_run_test(n=4)(n)
+
+    def decorator(test_function):
+        try:
+            import mpi4py
+            assert shutil.which('mpirun') is not None
+        except Exception:  # pragma: no cover
+            return lambda: pytest.xfail('mpirun or mpi4py missing')
+        name = test_function.__name__
+
+        def wrap(mpirun=False):
+            cwd = os.getcwd()
+            try:
+                if mpirun:
+                    os.chdir(cwd)
+                    return test_function()
+                else:
+
+                    import_path = Path(inspect.getsourcefile(test_function)).relative_to(os.getcwd()).as_posix()
+                    import_path = import_path[:-3].replace('/', '.')
+                    cmd = f'''{mpirun_cmd} -n {n} {sys.executable} -c "from {import_path} import {name}; {name}(mpirun=True)"'''
+                    print(f"cd {os.getcwd()} && {cmd}", flush=True)
+                    assert os.system(cmd) == 0, name
+
+            finally:
+                os.chdir(cwd)
+
+        wrap.__name__ = name
+        return wrap
+
+    return decorator

{multiclass_interface-1.15 → multiclass_interface-1.18}/multiclass_interface/multi_object_list.py

@@ -9,6 +9,12 @@ class MultiObjectList():
     def __str__(self):
         return f'{self.__class__.__name__}({self.obj_lst})'
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        pass
+
     def get_obj_args_lst(self, args, kwargs):
         N = len(self.obj_lst)
 

{multiclass_interface-1.15 → multiclass_interface-1.18}/multiclass_interface/multiprocess_interface.py

@@ -21,7 +21,8 @@ from multiclass_interface.multi_object_list import MultiObjectList
 
 def run(cls, inputQueue, outputQueue, cls_args, **kwargs):
     o = cls(*cls_args, **kwargs)
-    while True:
+    running = True
+    while running:
         method, args, kwargs = inputQueue.get()
         try:
             if method == 'getattr':
@@ -48,7 +49,7 @@ def run(cls, inputQueue, outputQueue, cls_args, **kwargs):
         finally:
             if method == 'close':
                 outputQueue.put('Exit process')
-                return
+                running = False
 
 
 class ProcessClass():

{multiclass_interface-1.15 → multiclass_interface-1.18}/multiclass_interface/tests/my_test_cls.py

@@ -1,5 +1,6 @@
 import time
 import os
+from multiclass_interface.mpi_interface import bcast_function_result
 
 
 class MyTest():

{multiclass_interface-1.15 → multiclass_interface-1.18}/multiclass_interface/tests/test_mpi.py

@@ -10,6 +10,8 @@ from multiclass_interface.multiprocess_interface import ProcessClass
 import numpy as np
 from multiclass_interface.tests.my_test_cls import MyTest
 from multiclass_interface import mpi_interface
+from multiclass_interface.mpi_interface import mpi_run_test
+from multiclass_interface.multi_object_list import MultiClassInterface
 
 
 def mpirun(f):
@@ -27,7 +29,7 @@ def mpirun(f):
         return f
 
 
-@mpirun
+@mpi_run_test
 def test_mpi_collective_too_few_slots():
     mpi_interface.activate_mpi()
     N = 4
@@ -42,7 +44,7 @@ def test_mpi_collective_too_few_slots():
         assert str(e) == 'Not enough mpi slots. Slots: 4, Requested: 5'
 
 
-@mpirun
+@mpi_run_test
 def test_mpi_collective_MyTest():
     mpi_interface.activate_mpi()
     N = 4
@@ -60,6 +62,8 @@ def test_mpi_collective_MyTest():
         i = mpi_interface.main_run(lambda: m.get_id())
         npt.assert_array_equal(i, 1)
 
+        assert m[1].get_id() == [2]
+
         try:
             npt.assert_array_equal(m[1:3].get_id(), np.arange(1, 3) + 1)
         except ChildProcessError:
@@ -90,7 +94,7 @@ def test_mpi_collective_MyTest():
             m[:3][1]
 
 
-@mpirun
+@mpi_run_test
 def test_mpi_collective_close_released_mpi_workers():
     mpi_interface.activate_mpi()
     N = 4
@@ -100,7 +104,7 @@ def test_mpi_collective_close_released_mpi_workers():
             m.close()
 
 
-@mpirun
+@mpi_run_test
 def test_mpi_ProcessClass():
     mpi_interface.activate_mpi()
     with ProcessClass(MyTest) as cls:
@@ -108,13 +112,19 @@ def test_mpi_ProcessClass():
         assert myTest.get_id() == 1
 
 
-@mpirun
+@mpi_run_test
 def test_non_collective_mpi2():
     mpi_interface.activate_mpi(collective_mpi=False)
     rank = mpi_interface.rank
     N = 3
     with MPIClassInterface(MyTest, [(i + 10,) for i in range(N)]) as m:
 
+        id_lst = mpi_interface.bcast_function_result(lambda: m.get_id())()
+        assert id_lst == [10, 11, 12, None], id_lst
+        id_lst = mpi_interface.bcast_function_result(lambda: m.return_input(['a', 'b', 'c']))()
+        assert id_lst == ["10 got: ('a',) and {}", "11 got: ('b',) and {}", "12 got: ('c',) and {}", None], id_lst
+
+        mpi_interface.barrier_print('hello world')
         try:
             assert m.get_id()[0] == rank + 10, m.get_id()
             main_id = mpi_interface.main_run(lambda: m.get_id())
@@ -135,7 +145,17 @@ def test_non_collective_mpi2():
                 m.object.cls
 
 
-@mpirun
+def test_non_collective_mpi2_no_mpi():
+    N = 3
+    with MultiClassInterface(MyTest, [(i + 10,) for i in range(N)]) as m:
+
+        id_lst = mpi_interface.bcast_function_result(lambda: m.get_id())()
+        assert id_lst == [10, 11, 12], id_lst
+        id_lst = mpi_interface.bcast_function_result(lambda: m.return_input(['a', 'b', 'c']))()
+        assert id_lst == ["10 got: ('a',) and {}", "11 got: ('b',) and {}", "12 got: ('c',) and {}"], id_lst
+
+
+@mpi_run_test(4)
 def test_mpi_non_collective_MyTest():
     mpi_interface.activate_mpi(collective_mpi=False)
     rank = mpi_interface.rank
@@ -183,7 +203,7 @@ def test_mpi_non_collective_MyTest():
             m[:3][1]
 
 
-@mpirun
+@mpi_run_test(4)
 def test_multiprocessinterface_tests():
     from multiclass_interface.tests.test_multiprocessinterface import test_attribute, test_missing_attribute, test_execption, test_setattr, test_setattr_method
     mpi_interface.activate_mpi()
@@ -196,7 +216,7 @@ def test_multiprocessinterface_tests():
         pass
 
 
-@mpirun
+@mpi_run_test(4)
 def test_multiprocessinterface_tests_diff_interface():
     from multiclass_interface.tests.test_multiprocessinterface import test_attribute, test_missing_attribute, test_execption, test_setattr, test_setattr_method
     mpi_interface.activate_mpi(terminate_on_close=False)

multiclass_interface-1.18/multiclass_interface/version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.18'
+__version_tuple__ = version_tuple = (1, 18)
+
+__commit_id__ = commit_id = 'gb93401984'

multiclass_interface-1.15/multiclass_interface/version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '1.15'
-__version_tuple__ = version_tuple = (1, 15)