Merge pull request #8 from pynbody/multivis-fix

Only create one device across all visualizers
pynbody · Dec 4, 2023 · c69e08e · c69e08e
2 parents aec4546 + 2342104
commit c69e08e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/topsy/visualizer.py b/src/topsy/visualizer.py
@@ -26,6 +26,7 @@
 class VisualizerBase:
     colorbar_aspect_ratio = config.COLORBAR_ASPECT_RATIO
     show_status = True
+    device = None # device will be shared across all instances
 
     def __init__(self, data_loader_class = loader.TestDataLoader, data_loader_args = (),
                  *, render_resolution = config.DEFAULT_RESOLUTION, periodic_tiling = False,
@@ -77,8 +78,9 @@ def __init__(self, data_loader_class = loader.TestDataLoader, data_loader_args =
 
     def _setup_wgpu(self):
         self.adapter: wgpu.GPUAdapter = wgpu.gpu.request_adapter(power_preference="high-performance")
-        self.device: wgpu.GPUDevice = self.adapter.request_device(
-            required_features=["TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES"])
+        if self.device is None:
+            type(self).device: wgpu.GPUDevice = self.adapter.request_device(
+                required_features=["TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES"])
         self.context: wgpu.GPUCanvasContext = self.canvas.get_context()
         self.canvas_format = self.context.get_preferred_format(self.adapter)
         if self.canvas_format.endswith("-srgb"):

diff --git a/tests/test_render.py b/tests/test_render.py
@@ -95,4 +95,9 @@ def test_rotated_sph_output():
         result = vis.get_presentation_image()
         plt.imsave(folder / "test_rotated.png", result)  # needs manual verification
     finally:
-        vis.rotation_matrix = np.eye(3, dtype=np.float32)
+        vis.rotation_matrix = np.eye(3, dtype=np.float32)
+
+
+def test_second_renderer():
+    # tests that creating a second renderer works OK
+    vis2 = topsy._test(2000, render_resolution=200, canvas_class=offscreen.VisualizerCanvas)