Merge pull request #297 from bgilbert/cpu-count

examples/deepzoom: parallelize deepzoom_tile to available CPUs
openslide · Oct 28, 2024 · d2961cf · d2961cf
2 parents 9ded242 + 72300fe
commit d2961cf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/examples/deepzoom/deepzoom_multiserver.py b/examples/deepzoom/deepzoom_multiserver.py
@@ -42,7 +42,7 @@
 if os.name == 'nt':
     _dll_path = os.getenv('OPENSLIDE_PATH')
     if _dll_path is not None:
-        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined]
+        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined,unused-ignore]  # noqa: E501
             import openslide
     else:
         import openslide

diff --git a/examples/deepzoom/deepzoom_server.py b/examples/deepzoom/deepzoom_server.py
@@ -42,7 +42,7 @@
 if os.name == 'nt':
     _dll_path = os.getenv('OPENSLIDE_PATH')
     if _dll_path is not None:
-        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined]
+        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined,unused-ignore]  # noqa: E501
             import openslide
     else:
         import openslide

diff --git a/examples/deepzoom/deepzoom_tile.py b/examples/deepzoom/deepzoom_tile.py
@@ -48,7 +48,7 @@
 if os.name == 'nt':
     _dll_path = os.getenv('OPENSLIDE_PATH')
     if _dll_path is not None:
-        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined]
+        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined,unused-ignore]  # noqa: E501
             import openslide
     else:
         import openslide
@@ -382,6 +382,19 @@ def _shutdown(self) -> None:
 
 
 if __name__ == '__main__':
+    try:
+        # Python 3.13+
+        available_cpus = os.process_cpu_count()  # type: ignore[attr-defined]
+    except AttributeError:
+        try:
+            # Linux
+            available_cpus = len(
+                os.sched_getaffinity(0)  # type: ignore[attr-defined,unused-ignore]
+            )
+        except AttributeError:
+            # default
+            available_cpus = 4
+
     parser = ArgumentParser(usage='%(prog)s [options] <SLIDE>')
     parser.add_argument(
         '-B',
@@ -433,8 +446,8 @@ def _shutdown(self) -> None:
         metavar='COUNT',
         dest='workers',
         type=int,
-        default=4,
-        help='number of worker processes to start [4]',
+        default=available_cpus,
+        help=f'number of worker processes to start [{available_cpus}]',
     )
     parser.add_argument(
         '-o',

diff --git a/tests/common.py b/tests/common.py
@@ -30,7 +30,7 @@
     # environment.
     _dll_path = os.getenv('OPENSLIDE_PATH')
     if _dll_path is not None:
-        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined]
+        with os.add_dll_directory(_dll_path):  # type: ignore[attr-defined,unused-ignore]  # noqa: E501
             import openslide  # noqa: F401  module-imported-but-unused