Add tests. Minor fixes. Update CI

roaffix · roaffix · commit eadbe9b5685f · 2023-01-24T19:55:53.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,15 +9,18 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.10
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
+
       - name: Test with pytest
-        run: |
-          pytest
+        run: pytest
+
+      - name: Test array_api
+        run: python -m pytest arrayfire/array_api
diff --git a/arrayfire/array_api/_array_object.py b/arrayfire/array_api/_array_object.py
@@ -10,7 +10,7 @@
 from ._dtypes import CShape, Dtype, c_dim_t, float32, supported_dtypes
 from ._utils import Device, PointerSource, to_str
 
-ShapeType = tuple[None | int, ...]
+ShapeType = tuple[int, ...]
 
 
 @dataclass
@@ -30,9 +30,10 @@ class Array:
     arr = ctypes.c_void_p(0)
 
     def __init__(
-            self, x: None | Array | py_array.array | list = None, dtype: None | Dtype = None,
-            pointer_source: PointerSource = PointerSource.host, shape: None | tuple[int] = None,
-            offset: None | ctypes._SimpleCData[int] = None, strides: None | tuple[int, ...] = None) -> None:
+            self, x: None | Array | py_array.array | int | ctypes.c_void_p | list = None, dtype: None | Dtype = None,
+            pointer_source: PointerSource = PointerSource.host, shape: None | ShapeType = None,
+            offset: None | ctypes._SimpleCData[int] = None, strides: None | ShapeType = None) -> None:
+        _no_initial_dtype = False  # HACK, FIXME
 
         if isinstance(dtype, str):
             dtype = _str_to_dtype(dtype)
@@ -69,7 +70,7 @@ def __init__(
             _array_buffer = _ArrayBuffer(x if not isinstance(x, ctypes.c_void_p) else x.value)
 
             if not shape:
-                raise RuntimeError("Expected to receive the initial shape due to the x being a data pointer.")
+                raise TypeError("Expected to receive the initial shape due to the x being a data pointer.")
 
             if _no_initial_dtype:
                 raise TypeError("Expected to receive the initial dtype due to the x being a data pointer.")
@@ -206,7 +207,7 @@ def _metadata_string(dtype: Dtype, dims: None | ShapeType = None) -> str:
         f"Dims: {str(dims) if dims else ''}")
 
 
-def _get_cshape(shape: None | tuple[int], buffer_length: int) -> CShape:
+def _get_cshape(shape: None | ShapeType, buffer_length: int) -> CShape:
     if shape:
         return CShape(*shape)
 
diff --git a/arrayfire/array_api/pytest.ini b/arrayfire/array_api/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
-addopts = --cache-clear --cov=./arrayfire/array_api --flake8 --mypy --isort ./arrayfire/array_api
+addopts = --cache-clear --cov=./arrayfire/array_api --flake8 --isort ./arrayfire/array_api
 console_output_style = classic
 markers = mypy
diff --git a/arrayfire/array_api/tests/test_array.py b/arrayfire/array_api/tests/test_array.py
diff --git a/arrayfire/array_api/tests/test_array_object.py b/arrayfire/array_api/tests/test_array_object.py
@@ -0,0 +1,95 @@
+import pytest
+
+from arrayfire.array_api import Array, float32, int16
+from arrayfire.array_api._dtypes import supported_dtypes
+
+
+def test_empty_array() -> None:
+    array = Array()
+
+    assert array.dtype == float32
+    assert array.ndim == 0
+    assert array.size == 0
+    assert array.shape == ()
+    assert len(array) == 0
+
+
+def test_empty_array_with_nonempty_dtype() -> None:
+    array = Array(dtype=int16)
+
+    assert array.dtype == int16
+    assert array.ndim == 0
+    assert array.size == 0
+    assert array.shape == ()
+    assert len(array) == 0
+
+
+def test_empty_array_with_nonempty_shape() -> None:
+    array = Array(shape=(2, 3))
+
+    assert array.dtype == float32
+    assert array.ndim == 2
+    assert array.size == 6
+    assert array.shape == (2, 3)
+    assert len(array) == 2
+
+
+def test_array_from_1d_list() -> None:
+    array = Array([1, 2, 3])
+
+    assert array.dtype == float32
+    assert array.ndim == 1
+    assert array.size == 3
+    assert array.shape == (3,)
+    assert len(array) == 3
+
+
+def test_array_from_2d_list() -> None:
+    with pytest.raises(TypeError):
+        Array([[1, 2, 3], [1, 2, 3]])
+
+
+def test_array_from_list_with_unsupported_dtype() -> None:
+    for dtype in supported_dtypes:
+        if dtype == float32:
+            continue
+        with pytest.raises(TypeError):
+            Array([1, 2, 3], dtype=dtype)
+
+
+def test_array_from_af_array() -> None:
+    array1 = Array([1])
+    array2 = Array(array1)
+
+    assert array1.dtype == array2.dtype == float32
+    assert array1.ndim == array2.ndim == 1
+    assert array1.size == array2.size == 1
+    assert array1.shape == array2.shape == (1,)
+    assert len(array1) == len(array2) == 1
+
+
+def test_array_from_int_without_shape() -> None:
+    with pytest.raises(TypeError):
+        Array(1)
+
+
+def test_array_from_int_without_dtype() -> None:
+    with pytest.raises(TypeError):
+        Array(1, shape=(1,))
+
+# def test_array_from_int_with_parameters() -> None:  # BUG seg fault
+#     array = Array(1, shape=(1,), dtype=float32)
+
+#     assert array.dtype == float32
+#     assert array.ndim == 1
+#     assert array.size == 1
+#     assert array.shape == (1,)
+#     assert len(array) == 1
+
+
+def test_array_from_unsupported_type() -> None:
+    with pytest.raises(TypeError):
+        Array((5, 5))  # type: ignore[arg-type]
+
+    with pytest.raises(TypeError):
+        Array({1: 2, 3: 4})  # type: ignore[arg-type]
