python-fedci 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

fedci/server.py

@@ -202,17 +202,9 @@ class Server:
 
         all_tests = get_all_possible_tests(set(self.schema.keys()), max_cond_size)
 
-        if progress_bar:
-            from tqdm import tqdm
-            all_tests = tqdm(
-                all_tests,
-                position=_progress_bar_position,
-                leave=_progress_bar_position == 0,
-            )
-
         if workers > 1:
-            # Parallelise at the test level: each test runs in its own thread.
-            # NetworkClient sockets are thread-local so concurrent calls are safe.
+            from concurrent.futures import as_completed
+
             lock = threading.Lock()
 
             def _run_test(args):
@@ -227,8 +219,26 @@ class Server:
                 return (x, y, frozenset(s)), result
 
             with ThreadPoolExecutor(max_workers=workers) as pool:
-                results = dict(pool.map(_run_test, all_tests))
+                futures = [pool.submit(_run_test, args) for args in all_tests]
+                if progress_bar:
+                    from tqdm import tqdm
+                    completed = tqdm(
+                        as_completed(futures),
+                        total=len(futures),
+                        position=_progress_bar_position,
+                        leave=_progress_bar_position == 0,
+                    )
+                else:
+                    completed = as_completed(futures)
+                results = dict(f.result() for f in completed)
         else:
+            if progress_bar:
+                from tqdm import tqdm
+                all_tests = tqdm(
+                    all_tests,
+                    position=_progress_bar_position,
+                    leave=_progress_bar_position == 0,
+                )
             results = {}
             for x, y, s in all_tests:
                 if on_test_start is not None:

{python_fedci-0.2.0.dist-info → python_fedci-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fedci
-Version: 0.2.0
+Version: 0.2.1
 Summary: A small package for federated independence tests
 Author-email: Maximilian Hahn <max.hahn@gmx.de>
 License-Expression: AGPL-3.0-or-later

{python_fedci-0.2.0.dist-info → python_fedci-0.2.1.dist-info}/RECORD

@@ -6,11 +6,11 @@ fedci/masking.py,sha256=0sNSl0yLa0gJq8wNUkzeDnpDD_8KxIC7IWBAdixdfsM,3634
 fedci/modeling.py,sha256=BGfaJvqejGn2cFlz2Y9iOVNxmRKYjgYhCYalrqiZKbE,12006
 fedci/network.py,sha256=mATDNaFt6dL8-6sZUQiUXg4vNO1sf7UaLpjFfSxGrHQ,6785
 fedci/results.py,sha256=8vqiC-IjwL-YyNuY1u03ku93ATQIp1p_RsrOGI_AlJ4,6041
-fedci/server.py,sha256=2tWc_eXa-rlDgcyETWwClpD6Q_Co1OWJmLIgaDwCLDQ,10768
+fedci/server.py,sha256=wM1nL5odTRlBhAxoMCN7EIlB-C89wO0dVfXzVBJEGBs,11186
 fedci/testing.py,sha256=AxdO12iaPQsUJ4vv-fjpr8gUwf7bWZ_1xsAO7Nlhq4M,5052
 fedci/utils.py,sha256=JfaP_tGIg2TEDRjALtm2eFVJ4eBpo9eYiTZXjZjPl1U,2702
-python_fedci-0.2.0.dist-info/licenses/LICENSE,sha256=Iwyf1NjIYj-xnIJJNdukONRRDPZskVflWZrI-AWv7sg,34576
-python_fedci-0.2.0.dist-info/METADATA,sha256=-iJ0tyIFlV-PE4BhGAmZl3QLBNvpmSyAt1aOT0IDA14,10550
-python_fedci-0.2.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_fedci-0.2.0.dist-info/top_level.txt,sha256=cqbR8aI0m4KvYOXgv94Lg1XmKxIBBAFKyDmJD1zefDQ,6
-python_fedci-0.2.0.dist-info/RECORD,,
+python_fedci-0.2.1.dist-info/licenses/LICENSE,sha256=Iwyf1NjIYj-xnIJJNdukONRRDPZskVflWZrI-AWv7sg,34576
+python_fedci-0.2.1.dist-info/METADATA,sha256=L3qvuasOr9W7JLiCIKGdjps6UFft8gt8ZMwf5SuoCfw,10550
+python_fedci-0.2.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_fedci-0.2.1.dist-info/top_level.txt,sha256=cqbR8aI0m4KvYOXgv94Lg1XmKxIBBAFKyDmJD1zefDQ,6
+python_fedci-0.2.1.dist-info/RECORD,,