Multiprocessing re-work for benchmark utility (#30)

Cleptomania · web-flow · commit 7ac994856891 · 2023-08-03T01:15:24.000-04:00
diff --git a/benchmark/__main__.py b/benchmark/__main__.py
@@ -1,3 +1,4 @@
+import multiprocessing
 import argparse
 import sys
 from datetime import datetime
@@ -39,4 +40,5 @@ def parse_args(args):
 
 
 if __name__ == "__main__":
+    multiprocessing.set_start_method("spawn")
     main()
diff --git a/benchmark/manager.py b/benchmark/manager.py
@@ -90,9 +90,9 @@ def create_test_instances(self):
             # If a test have multiple instances, create one instance for each
             if cls.instances:
                 for params, _ in cls.instances:
-                    self.add_test_instance(cls(**params))
+                    self.add_test_instance(cls(self.session_dir, **params))
             else:
-                self.add_test_instance(cls())
+                self.add_test_instance(cls(self.session_dir))
 
         if self.debug:
             num_instances = len(self.test_instances)
@@ -120,7 +120,8 @@ def get_test_instance(self, name: str) -> Optional[PerfTest]:
     def run(self):
         """Run all tests"""
         for instance in self.test_instances:
-            instance.run(self.session_dir)
+            instance.start()
+            instance.join()
 
     def create_graph(
         self,
diff --git a/benchmark/tests/arcade/collision.py b/benchmark/tests/arcade/collision.py
@@ -1,4 +1,5 @@
 import random
+from pathlib import Path
 
 import arcade
 
@@ -20,8 +21,9 @@ class Test(ArcadePerfTest):
     name = "collision"
     instances = (({"method": 3}, "Simple"),)
 
-    def __init__(self, method: int = DEFAULT_METHOD):
+    def __init__(self, session_dir: Path, method: int = DEFAULT_METHOD):
         super().__init__(
+            session_dir,
             size=(SCREEN_WIDTH, SCREEN_HEIGHT),
             title=SCREEN_TITLE,
             start_count=0,
diff --git a/benchmark/tests/arcade_accelerate/collision.py b/benchmark/tests/arcade_accelerate/collision.py
@@ -1,4 +1,8 @@
 import random
+from pathlib import Path
+
+import arcade_accelerate
+arcade_accelerate.bootstrap()
 
 import arcade
 
@@ -20,8 +24,9 @@ class Test(AcceleratedPerfTest):
     name = "collision"
     instances = (({"method": 3}, "Simple"),)
 
-    def __init__(self, method: int = DEFAULT_METHOD):
+    def __init__(self, session_dir: Path, method: int = DEFAULT_METHOD):
         super().__init__(
+            session_dir,
             size=(SCREEN_WIDTH, SCREEN_HEIGHT),
             title=SCREEN_TITLE,
             start_count=0,
diff --git a/benchmark/tests/base.py b/benchmark/tests/base.py
@@ -1,27 +1,28 @@
-import sys
+import multiprocessing
 from pathlib import Path
 from typing import Tuple
 
-import arcade
-
 from benchmark.timing import PerformanceTiming
 
 
-class PerfTest:
+class PerfTest(multiprocessing.Process):
     name = "default"
     type = "default"
     series_name = "default"
     instances = []
 
     def __init__(
         self,
+        session_dir: Path,
         size: Tuple[int, int],
         title: str = "Perf Test",
         start_count: int = 0,
         increment_count: int = 100,
         duration: float = 60.0,
         **kwargs,
     ):
+        super().__init__()
+        self.session_dir = session_dir
         self.size = size
         self.title = title
         self.start_count = start_count
@@ -43,9 +44,9 @@ def on_update(self, delta_time: float):
     def update_state(self):
         pass
 
-    def run(self, session_dir: Path):
+    def run(self):
         self.frame = 0
-        out_path = session_dir / "data"
+        out_path = self.session_dir / "data"
         out_path.mkdir(parents=True, exist_ok=True)
 
         self.timing = PerformanceTiming(
@@ -61,6 +62,7 @@ class ArcadePerfTest(PerfTest):
 
     def __init__(
         self,
+        session_dir: Path,
         size: Tuple[int, int],
         title: str = "Perf Test",
         start_count: int = 0,
@@ -69,6 +71,7 @@ def __init__(
         **kwargs,
     ):
         super().__init__(
+            session_dir,
             size=size,
             title=title,
             start_count=start_count,
@@ -99,9 +102,9 @@ def run_test(self):
             self.update_state()
             self.window.flip()
 
-    def run(self, session_dir: Path):
+    def run(self):
         """Run the test collecting data."""
-        super().run(session_dir)
+        super().run()
         self.create_window()
         self.setup()
 
@@ -129,6 +132,7 @@ def run(self, session_dir: Path):
         self.timing.write()
 
     def create_window(self):
+        import arcade
         try:
             self.window = arcade.get_window()
             self.window.set_size(*self.size)
@@ -142,22 +146,4 @@ def create_window(self):
 
 
 class AcceleratedPerfTest(ArcadePerfTest):
-    type = "arcade-accelerate"
-
-    def run(self, session_dir: Path):
-        # This is necessary to unload arcade and ensure that we have the arcade-accelerate bootstrap applied
-        # The test module itself is responsbile for applying the bootstrap, but arcade needs to be fully unloaded before then
-        to_uncache = []
-        for mod in sys.modules:
-            if mod.startswith("arcade."):
-                to_uncache.append(mod)
-
-        for mod in to_uncache:
-            del sys.modules[mod]
-
-        import arcade_accelerate
-
-        arcade_accelerate.bootstrap()
-        import arcade
-
-        super().run(session_dir)
+    type = "accelerate"
diff --git a/src/sprite_list.rs b/src/sprite_list.rs
@@ -7,7 +7,9 @@ pub fn check_for_collision_with_list(
     py: Python<'_>,
     sprite: &PyAny, //
     sprite_list: &PyAny,
+    method: Option<i32>,
 ) -> Vec<PyObject> {
+    let _final_method = method.unwrap_or(3);
     let mut final_sprites: Vec<PyObject> = Vec::new();
 
     let mut hitbox1: Option<HitBox> = None;
