Fix that using WGPUPY_WGPU_ADAPTER_NAME fails (#779)

Author: almarklein

tests/test_wgpu_native_basics.py

@@ -364,6 +364,24 @@ def test_adapter_destroy():
     assert adapter._internal is None
 
 
+@mark.skipif(not can_use_wgpu_lib, reason="Needs wgpu lib")
+def test_adapter_by_name():
+    ori = os.environ.get("WGPUPY_WGPU_ADAPTER_NAME", None)
+    try:
+        os.environ["WGPUPY_WGPU_ADAPTER_NAME"] = " "
+
+        promise = wgpu.gpu.request_adapter_async()
+        adapter = promise.sync_wait()
+        assert adapter
+        assert promise._title == "adapter by name"
+
+    finally:
+        if ori is None:
+            os.environ.pop("WGPUPY_WGPU_ADAPTER_NAME")
+        else:
+            os.environ["WGPUPY_WGPU_ADAPTER_NAME"] = ori
+
+
 def test_get_memoryview_and_address():
     get_memoryview_and_address = (
         wgpu.backends.wgpu_native._helpers.get_memoryview_and_address

wgpu/backends/wgpu_native/_api.py

@@ -485,12 +485,12 @@ def request_adapter_async(
         # We chose the variable name WGPUPY_WGPU_ADAPTER_NAME instead WGPU_ADAPTER_NAME
         # to avoid a clash
         if adapter_name := os.getenv(("WGPUPY_WGPU_ADAPTER_NAME")):
-            adapters = self._enumerate_adapters()
-            adapters_llvm = [a for a in adapters if adapter_name in a.summary]
-            if not adapters_llvm:
+            adapters = self._enumerate_adapters(loop)
+            adapters = [a for a in adapters if adapter_name in a.summary]
+            if not adapters:
                 raise ValueError(f"Adapter with name '{adapter_name}' not found.")
-            promise = GPUPromise("llm adapter", None, loop=loop)
-            promise._wgpu_set_input(adapters_llvm[0])
+            promise = GPUPromise("adapter by name", None, loop=loop)
+            promise._wgpu_set_input(adapters[0])
 
             return promise