diff --git a/docs/source/user_guide/gpu.rst b/docs/source/user_guide/gpu.rst index 3f4ff4bb4..f4ef89a0c 100644 --- a/docs/source/user_guide/gpu.rst +++ b/docs/source/user_guide/gpu.rst @@ -59,7 +59,7 @@ You can get more detailed info on each adapter like this:: import pprint for a in fpl.enumerate_adapters(): - pprint.pprint(a.request_adapter_info()) + pprint.pprint(a.info) General description of the fields: * vendor: GPU manufacturer @@ -265,7 +265,9 @@ You can select an adapter by passing one of the ``wgpu.GPUAdapter`` instances re to ``fpl.select_adapter()``:: # get info or summary of all adapters to pick an adapter - print([a.request_adapter_info() for a in fpl.enumerate_adapters()]) + import pprint + for a in fpl.enumerate_adapters(): + pprint.pprint(a.info) # example, pick adapter at index 2 chosen_gpu = fpl.enumerate_adapters()[2] diff --git a/examples/notebooks/linear_region_selector.ipynb b/examples/notebooks/linear_region_selector.ipynb index 57a72bdec..74b304a35 100644 --- a/examples/notebooks/linear_region_selector.ipynb +++ b/examples/notebooks/linear_region_selector.ipynb @@ -93,46 +93,6 @@ "fig.show(maintain_aspect=False)" ] }, - { - "cell_type": "code", - "execution_count": null, - "id": "2f29e913-c4f8-44a6-8692-eb14436849a5", - "metadata": {}, - "outputs": [], - "source": [ - "sine_graphic_x.data[:, 1].ptp()" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "1947a477-5dd2-4df9-aecd-6967c6ab45fe", - "metadata": {}, - "outputs": [], - "source": [ - "np.clip(-0.1, 0, 10)" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "18e10277-6d5d-42fe-8715-1733efabefa0", - "metadata": {}, - "outputs": [], - "source": [ - "ls_y.selection" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "8e9c42b9-60d2-4544-96c5-c8c6832b79e3", - "metadata": {}, - "outputs": [], - "source": [ - "ls_y.get_selected_indices()" - ] - }, { "cell_type": "code", "execution_count": null, diff --git a/examples/tests/testutils.py b/examples/tests/testutils.py index f62ae7602..1a95e249f 100644 --- a/examples/tests/testutils.py +++ b/examples/tests/testutils.py @@ -30,7 +30,7 @@ def get_wgpu_backend(): """ Query the configured wgpu backend driver. """ - code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.request_adapter_info(); print(info['adapter_type'], info['backend_type'])" + code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.info; print(info['adapter_type'], info['backend_type'])" result = subprocess.run( [ sys.executable, diff --git a/fastplotlib/graphics/line_collection.py b/fastplotlib/graphics/line_collection.py index 92aad56b2..4a55c1fb3 100644 --- a/fastplotlib/graphics/line_collection.py +++ b/fastplotlib/graphics/line_collection.py @@ -460,7 +460,7 @@ def _get_linear_selector_init_args(self, axis, padding): bounds = (xmin, value_25p) limits = (xmin, xmax) # size from orthogonal axis - size = bbox[:, 1].ptp() * 1.5 + size = np.ptp(bbox[:, 1]) * 1.5 # center on orthogonal axis center = bbox[:, 1].mean() @@ -472,7 +472,7 @@ def _get_linear_selector_init_args(self, axis, padding): bounds = (xmin, value_25p) limits = (xmin, xmax) - size = bbox[:, 0].ptp() * 1.5 + size = np.ptp(bbox[:, 0]) * 1.5 # center on orthogonal axis center = bbox[:, 0].mean() diff --git a/fastplotlib/legends/legend.py b/fastplotlib/legends/legend.py index b7e55f321..8ab3ddedb 100644 --- a/fastplotlib/legends/legend.py +++ b/fastplotlib/legends/legend.py @@ -244,7 +244,7 @@ def add_graphic(self, graphic: Graphic, label: str = None): # get width of widest LegendItem in previous column to add to x_pos offset for this column for item in prev_column_items: bbox = item.world_object.get_world_bounding_box() - width, height, depth = bbox.ptp(axis=0) + width, height, depth = np.ptp(bbox, axis=0) max_width = max(max_width, width) # x position offset for this new column @@ -278,7 +278,7 @@ def add_graphic(self, graphic: Graphic, label: str = None): def _reset_mesh_dims(self): bbox = self._legend_items_group.get_world_bounding_box() - width, height, _ = bbox.ptp(axis=0) + width, height, _ = np.ptp(bbox, axis=0) self._mesh.geometry.positions.data[mesh_masks.x_right] = width + 7 self._mesh.geometry.positions.data[mesh_masks.x_left] = -5 diff --git a/fastplotlib/utils/gui.py b/fastplotlib/utils/gui.py index 1941674ee..1f13c1406 100644 --- a/fastplotlib/utils/gui.py +++ b/fastplotlib/utils/gui.py @@ -60,9 +60,9 @@ def _notebook_print_banner(): # print logo and adapter info adapters = [a for a in wgpu.gpu.enumerate_adapters()] - adapters_info = [a.request_adapter_info() for a in adapters] + adapters_info = [a.info for a in adapters] - default_adapter_info = wgpu.gpu.request_adapter().request_adapter_info() + default_adapter_info = wgpu.gpu.request_adapter().info default_ix = adapters_info.index(default_adapter_info) if len(adapters) > 0: diff --git a/fastplotlib/widgets/histogram_lut.py b/fastplotlib/widgets/histogram_lut.py index a3edffcbd..02c21aa38 100644 --- a/fastplotlib/widgets/histogram_lut.py +++ b/fastplotlib/widgets/histogram_lut.py @@ -163,7 +163,7 @@ def _calculate_histogram(self, data): # used if data ptp <= 10 because event things get weird # with tiny world objects due to floating point error # so if ptp <= 10, scale up by a factor - self._scale_factor: int = max(1, 100 * int(10 / data_ss.ptp())) + self._scale_factor: int = max(1, 100 * int(10 / np.ptp(data_ss))) edges = edges * self._scale_factor diff --git a/setup.py b/setup.py index 3ba77201d..d75edf956 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ install_requires = [ "numpy>=1.23.0", - "wgpu>=0.15.1", + "wgpu>=0.16.0", "pygfx>=0.1.14", ]