Skip to content

Update deps #533

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
kushalkolar merged 8 commits into from
Jun 19, 2024
+7 −7
Merged

Update deps #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57702ac
ndarray.ptp -> np.ptp for numpy v2
kushalkolar Jun 18, 2024
eecb5a3
Merge branch 'main' of https://github.com/fastplotlib/fastplotlib
kushalkolar Jun 18, 2024
ddf13bd
Merge branch 'main' of https://github.com/fastplotlib/fastplotlib
kushalkolar Jun 18, 2024
d1c9c31
Merge branch 'main' of https://github.com/fastplotlib/fastplotlib
kushalkolar Jun 18, 2024
6e8c06b
pin to wgpu<0.16.0, set pygfx max ver pin
kushalkolar Jun 18, 2024
3647a63
pin wgpu max version for release
kushalkolar Jun 18, 2024
5629a7f
another instance of reverting info to get_adapter_info
kushalkolar Jun 19, 2024
2a62f20
typo
kushalkolar Jun 19, 2024
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
4 changes: 2 additions & 2 deletions docs/source/user_guide/gpu.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.info)
pprint.pprint(a.request_adapter_info())

General description of the fields:
* vendor: GPU manufacturer
Expand Down Expand Up @@ -267,7 +267,7 @@ to ``fpl.select_adapter()``::
# get info or summary of all adapters to pick an adapter
import pprint
for a in fpl.enumerate_adapters():
pprint.pprint(a.info)
pprint.pprint(a.request_adapter_info())

# example, pick adapter at index 2
chosen_gpu = fpl.enumerate_adapters()[2]
Expand Down
2 changes: 1 addition & 1 deletion examples/tests/testutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def get_wgpu_backend():
"""
Query the configured wgpu backend driver.
"""
code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.info; print(info['adapter_type'], info['backend_type'])"
code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.request_adapter_info(); print(info['adapter_type'], info['backend_type'])"
result = subprocess.run(
[
sys.executable,
Expand Down
4 changes: 2 additions & 2 deletions fastplotlib/utils/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.info for a in adapters]
adapters_info = [a.request_adapter_info() for a in adapters]

default_adapter_info = wgpu.gpu.request_adapter().info
default_adapter_info = wgpu.gpu.request_adapter().request_adapter_info()
default_ix = adapters_info.index(default_adapter_info)

if len(adapters) > 0:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

install_requires = [
"numpy>=1.23.0",
"wgpu>=0.16.0",
"pygfx>=0.1.14",
"wgpu<0.16.0",
"pygfx>=0.1.14,<=0.2.0",
]


Expand Down