adjust to latest wgpu (#542)

kushalkolar · web-flow · commit 598fc29770b8 · 2024-06-28T12:03:29.000-04:00
* ndarray.ptp -&gt; np.ptp for numpy v2

* a.request_adapter_infot() -&gt; a.info

* update min wgpu and pygfx versions
diff --git 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
@@ -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.request_adapter_info())
+        pprint.pprint(a.info)
 
     # example, pick adapter at index 2
     chosen_gpu = fpl.enumerate_adapters()[2]
diff --git a/examples/tests/testutils.py b/examples/tests/testutils.py
@@ -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.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/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/setup.py b/setup.py
@@ -4,8 +4,8 @@
 
 install_requires = [
     "numpy>=1.23.0",
-    "wgpu<0.16.0",
-    "pygfx>=0.1.14,<=0.2.0",
+    "wgpu>=0.16.0",
+    "pygfx>=0.3.0",
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ def get_wgpu_backend():`
`31`	`31`	`"""`
`32`	`32`	`Query the configured wgpu backend driver.`
`33`	`33`	`"""`
`34`		`- code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.request_adapter_info(); print(info['adapter_type'], info['backend_type'])"`
	`34`	`+ code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.info; print(info['adapter_type'], info['backend_type'])"`
`35`	`35`	`result = subprocess.run(`
`36`	`36`	`[`
`37`	`37`	`sys.executable,`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`install_requires = [`
`6`	`6`	`"numpy>=1.23.0",`
`7`		`- "wgpu<0.16.0",`
`8`		`- "pygfx>=0.1.14,<=0.2.0",`
	`7`	`+ "wgpu>=0.16.0",`
	`8`	`+ "pygfx>=0.3.0",`
`9`	`9`	`]`
`10`	`10`
`11`	`11`