Fix tests

Author: adonath

array_api_compat/_internal.py

@@ -44,14 +44,29 @@ def wrapped_f(*args, **kwargs):
     return inner
 
 
-def _get_all_public_members(module, filter_=None):
-    """Get all public members of a module."""
-    try:
-        return getattr(module, '__all__')
-    except AttributeError:
-        pass
+def _get_all_public_members(module, exclude=None, extend_all=False):
+    """Get all public members of a module.
     
-    if filter_ is None:
-        filter_ = lambda name: name.startswith('_') # noqa: E731
+    Parameters
+    ----------
+    module : module
+        The module to get members from.
+    exclude : callable, optional
+        A callable that takes a name and returns True if the name should be
+        excluded from the list of members.
+    extend_all : bool, optional
+        If True, extend the module's __all__ attribute with the members of the
+        module derive from dir(module)
+    """
+    members = getattr(module, '__all__', [])
+
+    if members and not extend_all:
+        return members
+
+    if exclude is None:
+        exclude = lambda name: name.startswith('_') # noqa: E731
+
+    members += [_ for _  in dir(module) if not exclude(_)]
 
-    return map(filter_, dir(module))
+    # remove duplicates
+    return list(set(members))

array_api_compat/torch/__init__.py

@@ -1,26 +1,26 @@
 # Several names are not included in the above import *
-import torch
+import torch as _torch
 from torch import *  # noqa: F401, F403
 
 from .._internal import _get_all_public_members
 
 
-def filter_(name):
+def exlcude(name):
     if (
         name.startswith("_")
         or name.endswith("_")
         or "cuda" in name
         or "cpu" in name
         or "backward" in name
     ):
-        return False
-    return True
+        return True
+    return False
 
 
-_torch_all = _get_all_public_members(torch, filter_=filter_)
+_torch_all = _get_all_public_members(_torch, exclude=exlcude, extend_all=True)
 
 for _name in _torch_all:
-    globals()[_name] = getattr(torch, _name)
+    globals()[_name] = getattr(_torch, _name)
 
 
 from ..common._helpers import (  # noqa: E402

tests/test_array_namespace.py

@@ -5,22 +5,22 @@
 
 
 @pytest.mark.parametrize("library", ["cupy", "numpy", "torch"])
-@pytest.mark.parametrize("api_version", [None, '2021.12'])
+@pytest.mark.parametrize("api_version", [None, "2021.12"])
 def test_array_namespace(library, api_version):
     lib = pytest.importorskip(library)
 
     array = lib.asarray([1.0, 2.0, 3.0])
     namespace = array_api_compat.array_namespace(array, api_version=api_version)
 
-    if 'array_api' in library:
+    if "array_api" in library:
         assert namespace == lib
     else:
         assert namespace == getattr(array_api_compat, library)
 
 
 def test_array_namespace_errors():
     np = pytest.importorskip("numpy")
-    
+
     pytest.raises(TypeError, lambda: array_namespace([1]))
     pytest.raises(TypeError, lambda: array_namespace())
 
@@ -31,10 +31,12 @@ def test_array_namespace_errors():
 
 def test_array_namespace_errors_torch():
     torch = pytest.importorskip("torch")
-    
+    np = pytest.importorskip("numpy")
+
     y = torch.asarray([1, 2])
+    x = np.asarray([1, 2])
     pytest.raises(TypeError, lambda: array_namespace(x, y))
-    pytest.raises(ValueError, lambda: array_namespace(x, api_version='2022.12'))
+    pytest.raises(ValueError, lambda: array_namespace(x, api_version="2022.12"))
 
 
 def test_get_namespace():

tests/test_isdtype.py

@@ -5,8 +5,6 @@
 
 import pytest
 
-from ._helpers import import_
-
 # Check the known dtypes by their string names
 
 def _spec_dtypes(library):