diff --git a/arrayfire/__init__.py b/arrayfire/__init__.py index 9775705..d4b54e8 100644 --- a/arrayfire/__init__.py +++ b/arrayfire/__init__.py @@ -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 diff --git a/arrayfire/array/__init__.py b/arrayfire/array/__init__.py deleted file mode 100755 index a040af0..0000000 --- a/arrayfire/array/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -__all__ = ["Array"] - -from .array_object import Array diff --git a/arrayfire/dtypes/functions.py b/arrayfire/dtypes/functions.py index 865980c..a08619f 100644 --- a/arrayfire/dtypes/functions.py +++ b/arrayfire/dtypes/functions.py @@ -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 diff --git a/arrayfire/library/__init__.py b/arrayfire/library/__init__.py index e69de29..a040af0 100755 --- a/arrayfire/library/__init__.py +++ b/arrayfire/library/__init__.py @@ -0,0 +1,3 @@ +__all__ = ["Array"] + +from .array_object import Array diff --git a/arrayfire/array/array_object.py b/arrayfire/library/array_object.py similarity index 97% rename from arrayfire/array/array_object.py rename to arrayfire/library/array_object.py index 600668d..f5b643c 100755 --- a/arrayfire/array/array_object.py +++ b/arrayfire/library/array_object.py @@ -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 diff --git a/arrayfire/library/operators.py b/arrayfire/library/operators.py index 4d27fdd..6644aea 100644 --- a/arrayfire/library/operators.py +++ b/arrayfire/library/operators.py @@ -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: diff --git a/arrayfire/library/utils.py b/arrayfire/library/utils.py index 7a787bc..195111d 100644 --- a/arrayfire/library/utils.py +++ b/arrayfire/library/utils.py @@ -1,6 +1,6 @@ from typing import Tuple, Union -from ..array.array_object import Array +from .array_object import Array # TODO implement functions diff --git a/tests/array_object/test_initialization.py b/tests/array_object/test_initialization.py index 207a852..6d69c07 100644 --- a/tests/array_object/test_initialization.py +++ b/tests/array_object/test_initialization.py @@ -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 diff --git a/tests/array_object/test_methods.py b/tests/array_object/test_methods.py index 15a8c17..20fde2d 100644 --- a/tests/array_object/test_methods.py +++ b/tests/array_object/test_methods.py @@ -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 diff --git a/tests/array_object/test_operators.py b/tests/array_object/test_operators.py index 290ce6d..1d7256a 100644 --- a/tests/array_object/test_operators.py +++ b/tests/array_object/test_operators.py @@ -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] diff --git a/tests/test_operators.py b/tests/test_operators.py index 252eaa4..1e34a22 100644 --- a/tests/test_operators.py +++ b/tests/test_operators.py @@ -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: