Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo in the requested limit name of the wgpu device #679

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
test-build-full:
name: Test Linux, notebook + offscreen
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 30
if: ${{ !github.event.pull_request.draft }}
strategy:
fail-fast: false
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Install llvmpipe and lavapipe for offscreen canvas
run: |
sudo apt-get update -y -qq
sudo apt-get install --no-install-recommends -y ffmpeg libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
sudo apt-get install --no-install-recommends -y ffmpeg libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers xorg-dev
- name: Install dev dependencies
run: |
python -m pip install --upgrade pip setuptools
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
test-build-offscreen:
name: Test Linux, only offscreen
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 30
if: ${{ !github.event.pull_request.draft }}
strategy:
fail-fast: false
Expand All @@ -96,7 +96,7 @@ jobs:
- name: Install llvmpipe and lavapipe for offscreen canvas
run: |
sudo apt-get update -y -qq
sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers xorg-dev
- name: Install dev dependencies
run: |
python -m pip install --upgrade pip setuptools
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import imageio.v3 as iio

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

ROOT_DIR = Path(__file__).parents[1].parents[0] # repo root
EXAMPLES_DIR = Path.joinpath(ROOT_DIR, "examples")
Expand Down
64 changes: 32 additions & 32 deletions docs/source/user_guide/gpu.rst
Original file line number Diff line number Diff line change
Expand Up @@ -235,38 +235,38 @@ Example output::

adapter device

max_bind_groups: 8 8
max_bind_groups_plus_vertex_buffers: 0 0
max_bindings_per_bind_group: 1.00K 1.00K
max_buffer_size: 2.14G 2.14G
max_color_attachment_bytes_per_sample: 0 0
max_color_attachments: 0 0
max_compute_invocations_per_workgroup: 1.02K 1.02K
max_compute_workgroup_size_x: 1.02K 1.02K
max_compute_workgroup_size_y: 1.02K 1.02K
max_compute_workgroup_size_z: 1.02K 1.02K
max_compute_workgroup_storage_size: 32.7K 32.7K
max_compute_workgroups_per_dimension: 65.5K 65.5K
max_dynamic_storage_buffers_per_pipeline_layout: 8 8
max_dynamic_uniform_buffers_per_pipeline_layout: 16 16
max_inter_stage_shader_components: 128 128
max_inter_stage_shader_variables: 0 0
max_sampled_textures_per_shader_stage: 8.38M 8.38M
max_samplers_per_shader_stage: 8.38M 8.38M
max_storage_buffer_binding_size: 2.14G 2.14G
max_storage_buffers_per_shader_stage: 8.38M 8.38M
max_storage_textures_per_shader_stage: 8.38M 8.38M
max_texture_array_layers: 2.04K 2.04K
max_texture_dimension1d: 16.3K 16.3K
max_texture_dimension2d: 16.3K 16.3K
max_texture_dimension3d: 2.04K 2.04K
max_uniform_buffer_binding_size: 2.14G 2.14G
max_uniform_buffers_per_shader_stage: 8.38M 8.38M
max_vertex_attributes: 32 32
max_vertex_buffer_array_stride: 2.04K 2.04K
max_vertex_buffers: 16 16
min_storage_buffer_offset_alignment: 32 32
min_uniform_buffer_offset_alignment: 32 32
max-bind-groups: 8 8
max-bind-groups-plus-vertex-buffers: 0 0
max-bindings-per-bind-group: 1.00K 1.00K
max-buffer-size: 2.14G 2.14G
max-color-attachment-bytes-per-sample: 0 0
max-color-attachments: 0 0
max-compute-invocations-per-workgroup: 1.02K 1.02K
max-compute-workgroup-size-x: 1.02K 1.02K
max-compute-workgroup-size-y: 1.02K 1.02K
max-compute-workgroup-size-z: 1.02K 1.02K
max-compute-workgroup-storage-size: 32.7K 32.7K
max-compute-workgroups-per-dimension: 65.5K 65.5K
max-dynamic-storage-buffers-per-pipeline-layout: 8 8
max-dynamic-uniform-buffers-per-pipeline-layout: 16 16
max-inter-stage-shader-components: 128 128
max-inter-stage-shader-variables: 0 0
max-sampled-textures-per-shader-stage: 8.38M 8.38M
max-samplers-per-shader-stage: 8.38M 8.38M
max-storage-buffer-binding-size: 2.14G 2.14G
max-storage-buffers-per-shader-stage: 8.38M 8.38M
max-storage-textures-per-shader-stage: 8.38M 8.38M
max-texture-array-layers: 2.04K 2.04K
max-texture-dimension-1d: 16.3K 16.3K
max-texture-dimension-2d: 16.3K 16.3K
max-texture-dimension-3d: 2.04K 2.04K
max-uniform-buffer-binding-size: 2.14G 2.14G
max-uniform-buffers-per-shader-stage: 8.38M 8.38M
max-vertex-attributes: 32 32
max-vertex-buffer-array-stride: 2.04K 2.04K
max-vertex-buffers: 16 16
min-storage-buffer-offset-alignment: 32 32
min-uniform-buffer-offset-alignment: 32 32

██ pygfx_caches:

Expand Down
2 changes: 1 addition & 1 deletion examples/tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import pygfx

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

from .testutils import (
ROOT,
Expand Down
2 changes: 1 addition & 1 deletion fastplotlib/graphics/_features/_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def __init__(self, data, isolated_buffer: bool = True):
data = self._fix_data(data)

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

if isolated_buffer:
# useful if data is read-only, example: memmaps
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@


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