Skip to content

Commit 0937309

Browse files
jcafhekushalkolar
jcafhe
and
kushalkolar
authored
fix typo in the requested limit name of the wgpu device (#679)
* fix typo in the requested limit name of the wgpu device. * fix test config. * fix examples/test and docs * fix max-texture-dimension-2d limit name and replace underscore by hyphen for the other limits. * fix missing dependency (libxrandr) to compile GLFW during building wheel for imgui-bundle. * update CI timeout * update timeout in non-nb test job --------- Co-authored-by: Kushal Kolar <kushalkolar@gmail.com>
1 parent 5c12b36 commit 0937309

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
test-build-full:
1818
name: Test Linux, notebook + offscreen
1919
runs-on: ubuntu-latest
20-
timeout-minutes: 10
20+
timeout-minutes: 30
2121
if: ${{ !github.event.pull_request.draft }}
2222
strategy:
2323
fail-fast: false
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install llvmpipe and lavapipe for offscreen canvas
4141
run: |
4242
sudo apt-get update -y -qq
43-
sudo apt-get install --no-install-recommends -y ffmpeg libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
43+
sudo apt-get install --no-install-recommends -y ffmpeg libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers xorg-dev
4444
- name: Install dev dependencies
4545
run: |
4646
python -m pip install --upgrade pip setuptools
@@ -73,7 +73,7 @@ jobs:
7373
test-build-offscreen:
7474
name: Test Linux, only offscreen
7575
runs-on: ubuntu-latest
76-
timeout-minutes: 10
76+
timeout-minutes: 30
7777
if: ${{ !github.event.pull_request.draft }}
7878
strategy:
7979
fail-fast: false
@@ -96,7 +96,7 @@ jobs:
9696
- name: Install llvmpipe and lavapipe for offscreen canvas
9797
run: |
9898
sudo apt-get update -y -qq
99-
sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
99+
sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers xorg-dev
100100
- name: Install dev dependencies
101101
run: |
102102
python -m pip install --upgrade pip setuptools

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import imageio.v3 as iio
1919

2020
MAX_TEXTURE_SIZE = 2048
21-
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension2d": MAX_TEXTURE_SIZE})
21+
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension-2d": MAX_TEXTURE_SIZE})
2222

2323
ROOT_DIR = Path(__file__).parents[1].parents[0] # repo root
2424
EXAMPLES_DIR = Path.joinpath(ROOT_DIR, "examples")

‎docs/source/user_guide/gpu.rst‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -235,38 +235,38 @@ Example output::
235235

236236
adapter device
237237

238-
max_bind_groups: 8 8
239-
max_bind_groups_plus_vertex_buffers: 0 0
240-
max_bindings_per_bind_group: 1.00K 1.00K
241-
max_buffer_size: 2.14G 2.14G
242-
max_color_attachment_bytes_per_sample: 0 0
243-
max_color_attachments: 0 0
244-
max_compute_invocations_per_workgroup: 1.02K 1.02K
245-
max_compute_workgroup_size_x: 1.02K 1.02K
246-
max_compute_workgroup_size_y: 1.02K 1.02K
247-
max_compute_workgroup_size_z: 1.02K 1.02K
248-
max_compute_workgroup_storage_size: 32.7K 32.7K
249-
max_compute_workgroups_per_dimension: 65.5K 65.5K
250-
max_dynamic_storage_buffers_per_pipeline_layout: 8 8
251-
max_dynamic_uniform_buffers_per_pipeline_layout: 16 16
252-
max_inter_stage_shader_components: 128 128
253-
max_inter_stage_shader_variables: 0 0
254-
max_sampled_textures_per_shader_stage: 8.38M 8.38M
255-
max_samplers_per_shader_stage: 8.38M 8.38M
256-
max_storage_buffer_binding_size: 2.14G 2.14G
257-
max_storage_buffers_per_shader_stage: 8.38M 8.38M
258-
max_storage_textures_per_shader_stage: 8.38M 8.38M
259-
max_texture_array_layers: 2.04K 2.04K
260-
max_texture_dimension1d: 16.3K 16.3K
261-
max_texture_dimension2d: 16.3K 16.3K
262-
max_texture_dimension3d: 2.04K 2.04K
263-
max_uniform_buffer_binding_size: 2.14G 2.14G
264-
max_uniform_buffers_per_shader_stage: 8.38M 8.38M
265-
max_vertex_attributes: 32 32
266-
max_vertex_buffer_array_stride: 2.04K 2.04K
267-
max_vertex_buffers: 16 16
268-
min_storage_buffer_offset_alignment: 32 32
269-
min_uniform_buffer_offset_alignment: 32 32
238+
max-bind-groups: 8 8
239+
max-bind-groups-plus-vertex-buffers: 0 0
240+
max-bindings-per-bind-group: 1.00K 1.00K
241+
max-buffer-size: 2.14G 2.14G
242+
max-color-attachment-bytes-per-sample: 0 0
243+
max-color-attachments: 0 0
244+
max-compute-invocations-per-workgroup: 1.02K 1.02K
245+
max-compute-workgroup-size-x: 1.02K 1.02K
246+
max-compute-workgroup-size-y: 1.02K 1.02K
247+
max-compute-workgroup-size-z: 1.02K 1.02K
248+
max-compute-workgroup-storage-size: 32.7K 32.7K
249+
max-compute-workgroups-per-dimension: 65.5K 65.5K
250+
max-dynamic-storage-buffers-per-pipeline-layout: 8 8
251+
max-dynamic-uniform-buffers-per-pipeline-layout: 16 16
252+
max-inter-stage-shader-components: 128 128
253+
max-inter-stage-shader-variables: 0 0
254+
max-sampled-textures-per-shader-stage: 8.38M 8.38M
255+
max-samplers-per-shader-stage: 8.38M 8.38M
256+
max-storage-buffer-binding-size: 2.14G 2.14G
257+
max-storage-buffers-per-shader-stage: 8.38M 8.38M
258+
max-storage-textures-per-shader-stage: 8.38M 8.38M
259+
max-texture-array-layers: 2.04K 2.04K
260+
max-texture-dimension-1d: 16.3K 16.3K
261+
max-texture-dimension-2d: 16.3K 16.3K
262+
max-texture-dimension-3d: 2.04K 2.04K
263+
max-uniform-buffer-binding-size: 2.14G 2.14G
264+
max-uniform-buffers-per-shader-stage: 8.38M 8.38M
265+
max-vertex-attributes: 32 32
266+
max-vertex-buffer-array-stride: 2.04K 2.04K
267+
max-vertex-buffers: 16 16
268+
min-storage-buffer-offset-alignment: 32 32
269+
min-uniform-buffer-offset-alignment: 32 32
270270

271271
██ pygfx_caches:
272272

‎examples/tests/test_examples.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import pygfx
1313

1414
MAX_TEXTURE_SIZE = 2048
15-
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension2d": MAX_TEXTURE_SIZE})
15+
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension-2d": MAX_TEXTURE_SIZE})
1616

1717
from .testutils import (
1818
ROOT,

‎fastplotlib/graphics/_features/_image.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def __init__(self, data, isolated_buffer: bool = True):
2121
data = self._fix_data(data)
2222

2323
shared = pygfx.renderers.wgpu.get_shared()
24-
self._texture_limit_2d = shared.device.limits["max-texture-dimension2d"]
24+
self._texture_limit_2d = shared.device.limits["max-texture-dimension-2d"]
2525

2626
if isolated_buffer:
2727
# useful if data is read-only, example: memmaps

‎tests/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66

77
def pytest_sessionstart(session):
8-
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension2d": MAX_TEXTURE_SIZE})
8+
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension-2d": MAX_TEXTURE_SIZE})

0 commit comments

Comments
 (0)