Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion arrayfire/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "float32", "float64",
"complex64", "complex128", "bool"]

from .array.array_object import Array
from .dtypes import bool, complex64, complex128, float32, float64, int16, int32, int64, uint8, uint16, uint32, uint64
from .library.array_object import Array
3 changes: 0 additions & 3 deletions arrayfire/array/__init__.py

This file was deleted.

2 changes: 1 addition & 1 deletion arrayfire/dtypes/functions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Tuple, Union

from ..array.array_object import Array
from ..library.array_object import Array
from . import Dtype

# TODO implement functions
Expand Down
3 changes: 3 additions & 0 deletions arrayfire/library/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
__all__ = ["Array"]

from .array_object import Array
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from ..dtypes import bool as af_bool
from ..dtypes import float32 as af_float32
from ..dtypes.helpers import Dtype, c_api_value_to_dtype, str_to_dtype
from ..library.device import PointerSource
from .device import PointerSource

# TODO use int | float in operators -> remove bool | complex support

Expand Down
2 changes: 1 addition & 1 deletion arrayfire/library/operators.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Callable

from .. import backend
from ..array.array_object import Array
from .array_object import Array


class return_copy:
Expand Down
2 changes: 1 addition & 1 deletion arrayfire/library/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Tuple, Union

from ..array.array_object import Array
from .array_object import Array

# TODO implement functions

Expand Down
2 changes: 1 addition & 1 deletion tests/array_object/test_initialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import pytest

from arrayfire.array.array_object import Array
from arrayfire.dtypes import Dtype, float32, int16
from arrayfire.library.array_object import Array

# TODO add tests for array arguments: device, offset, strides
# TODO add tests for all supported dtypes on initialisation
Expand Down
2 changes: 1 addition & 1 deletion tests/array_object/test_methods.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from arrayfire.array.array_object import Array
from arrayfire.library.array_object import Array

# TODO add more tests for different dtypes

Expand Down
2 changes: 1 addition & 1 deletion tests/array_object/test_operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import pytest

from arrayfire.array.array_object import Array
from arrayfire.dtypes import bool as af_bool
from arrayfire.library.array_object import Array

Operator = Callable[[Union[int, float, Array], Union[int, float, Array]], Array]

Expand Down
2 changes: 1 addition & 1 deletion tests/test_operators.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Any

from arrayfire.array.array_object import Array
from arrayfire.library import operators
from arrayfire.library.array_object import Array


class TestArithmeticOperators:
Expand Down