Skip to content

updates related to upstream changes #687

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Jan 6, 2025
Merged

updates related to upstream changes #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5c12b36
use imageio[ffmpeg] instead of pyav (#686)
kushalkolar Dec 25, 2024
0937309
fix typo in the requested limit name of the wgpu device (#679)
jcafhe Dec 25, 2024
298b76e
update to use pygfx.TextureMap
kushalkolar Dec 25, 2024
84192fc
forgot to set imageio[ffmpeg] for all extras
kushalkolar Dec 25, 2024
df9b7fa
migrate to RenderCanvas, remove event_filter stuff for imgui since th…
kushalkolar Dec 26, 2024
17a9233
remove very old irrelevant example
kushalkolar Dec 26, 2024
15764c9
fix docstring
kushalkolar Dec 26, 2024
dad91b9
update examples to use fpl.loop.run()
kushalkolar Dec 26, 2024
62e9097
update API docs
kushalkolar Dec 26, 2024
82b0614
black
kushalkolar Dec 26, 2024
4daa293
import ImageWidget only if imgui is installed
kushalkolar Dec 26, 2024
c8e97ca
enumerate_adapters() -> enumerate_adapters_sync()
kushalkolar Dec 26, 2024
5b2e3e8
remove annoying warnings from cmap
kushalkolar Dec 26, 2024
a7216ea
remove more cmap warnings
kushalkolar Jan 2, 2025
705d94c
black
kushalkolar Jan 2, 2025
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
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion docs/source/api/fastplotlib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ fastplotlib

.. autofunction:: fastplotlib.print_wgpu_report

.. autofunction:: fastplotlib.run
fastplotlib.loop
------------------
See the rendercanvas docs: https://rendercanvas.readthedocs.io/stable/api.html#rendercanvas.BaseLoop
2 changes: 0 additions & 2 deletions docs/source/api/ui/Popup.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ Methods
.. autosummary::
:toctree: Popup_api

Popup.clear_event_filters
Popup.open
Popup.set_event_filter
Popup.update

2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion docs/source/generate_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@

".. autofunction:: fastplotlib.print_wgpu_report\n\n"

".. autofunction:: fastplotlib.run\n"
"fastplotlib.loop\n"
"------------------\n"
"See the rendercanvas docs: https://rendercanvas.readthedocs.io/stable/api.html#rendercanvas.BaseLoop "
)

with open(API_DIR.joinpath("utils.rst"), "w") as f:
Expand Down
64 changes: 32 additions & 32 deletions docs/source/user_guide/gpu.rst
View file
Open in desktop
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/gridplot/gridplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/gridplot/gridplot_non_square.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/gridplot/multigraphic_gridplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,5 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()

2 changes: 1 addition & 1 deletion examples/guis/image_widget_imgui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ def process_image(self):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/guis/imgui_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ def _set_data(self):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/heatmap/heatmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image/image_cmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image/image_rgb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image/image_rgbvminvmax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image/image_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image/image_small.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image/image_vminvmax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
4 changes: 2 additions & 2 deletions examples/image_widget/image_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# test_example = true
# sphinx_gallery_pygfx_docs = 'screenshot'

import glfw
import fastplotlib as fpl
import imageio.v3 as iio # not a fastplotlib dependency, only used for examples

Expand All @@ -31,4 +31,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image_widget/image_widget_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image_widget/image_widget_single_video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/image_widget/image_widget_videos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line/line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line/line_cmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line/line_cmap_more.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line/line_colorslice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line/line_dataslice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_collection_cmap_values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_collection_cmap_values_qualitative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_collection_colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_collection_slicing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@

if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/line_collection/line_stack_3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ def animate_colors(subplot):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/machine_learning/covariance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ def animate():
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
35 changes: 0 additions & 35 deletions examples/misc-dev/large_img.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion examples/misc/cycle_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ def cycle_colors(subplot):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/misc/em_wave_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ def tick(subplot):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/misc/image_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ def update_data(figure_instance):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/misc/line3d_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ def move_marker():
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
2 changes: 1 addition & 1 deletion examples/misc/line_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ def update_line(subplot):
# please see our docs for using fastplotlib interactively in ipython and jupyter
if __name__ == "__main__":
print(__doc__)
fpl.run()
fpl.loop.run()
Loading
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy