Multiclass-interface 1.11__tar.gz → 1.14__tar.gz

{multiclass_interface-1.11 → multiclass_interface-1.14}/.gitlab-ci.yml

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

{multiclass_interface-1.11 → multiclass_interface-1.14/Multiclass_interface.egg-info}/PKG-INFO

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

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

@@ -43,6 +43,20 @@ TERMINATE_ON_CLOSE = True  # MPI workers (rank>0) will terminate (sys.exit) when
 COLLECTIVE_MPI = True  # rank0 acts as a single point of contact (scatters command+arg and gathers results)
 
 
+def main_run(f, *args, **kwargs):
+    if main:
+        r = f(*args, **kwargs)
+        if COLLECTIVE_MPI:
+            return r[0]
+    else:
+        try:
+            f(*args, **kwargs)
+        except BaseException:
+            pass
+        r = None
+    return comm.bcast(r)
+
+
 class MPIClassInterface():
     def __init__(self, cls, args_lst):
         if len(args_lst) > size:

{multiclass_interface-1.11 → multiclass_interface-1.14}/multiclass_interface/multiprocess_interface.py

@@ -1,11 +1,18 @@
 import multiprocessing
 import atexit
+import os
+try:
+    # before importing numpy
+    os.environ['OPENBLAS_NUM_THREADS'] = '1'
+    os.environ['MKL_NUM_THREADS'] = '1'
+except Exception:  # pragma: no cover
+    pass
+
 import numpy as np
 from threading import Thread
 from functools import wraps
 import traceback
 from _queue import Empty
-import os
 from contextlib import contextmanager
 import sys
 import inspect

{multiclass_interface-1.11 → multiclass_interface-1.14}/multiclass_interface/tests/test_mpi.py

@@ -21,6 +21,8 @@ def mpitest_mpi_MyTest():
             i = m.get_id()
             npt.assert_array_equal(i, np.arange(N))
 
+            i = mpi_interface.main_run(lambda: m.get_id())
+            npt.assert_array_equal(i, 0)
             npt.assert_array_equal(m[1:3].get_id(), np.arange(1, 3))
             t = time.time()
             m.work(1)
@@ -54,6 +56,8 @@ def mpitest_non_collective_mpi():
 
         try:
             assert m.get_id()[0] == rank + 10, m.get_id()
+            main_id = mpi_interface.main_run(lambda: m.get_id())
+            assert main_id == [10], (rank, main_id)
             assert rank < N  # rank > N will fail with ChildProcessError
         except ChildProcessError:
             pass
@@ -86,9 +90,7 @@ def mpitest_all():
     try:
         with MPIClassInterface(MyTest, [(1,), (2,), (3,)]) as mpici:
             for f in [test_attribute, test_missing_attribute, test_execption, test_setattr, test_setattr_method]:
-
                 run(f, mpici)
-
     except ChildProcessError:
         pass
 

{multiclass_interface-1.11 → multiclass_interface-1.14}/multiclass_interface/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11'
-__version_tuple__ = version_tuple = (1, 11)
+__version__ = version = '1.14'
+__version_tuple__ = version_tuple = (1, 14)