Jun 10, 2023 · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
      cd array-api-tests
    displayName: 'Set API'
  - script: |
      export ARRAY_API_TESTS_MODULE=onnx_array_api.array_api.onnx_numpy
      cd array-api-tests
      python -m pytest -xv array_api_tests/test_creation_functions.py::test_zeros
    displayName: "test_creation_functions.py::test_zeros"
  - script: |
      export ARRAY_API_TESTS_MODULE=onnx_array_api.array_api.onnx_numpy
      cd array-api-tests
      python -m pytest -x array_api_tests
    displayName: "all tests"

diff --git a/onnx_array_api/array_api/_onnx_common.py b/onnx_array_api/array_api/_onnx_common.py
 from typing import Any, Optional
 import numpy as np
 from ..npx.npx_types import DType
 from ..npx.npx_array_api import BaseArrayApi
 from ..npx.npx_functions import (
    copy as copy_inline,
 )


 def template_asarray(
    TEagerTensor: type,
    a: Any,
    dtype: Optional[DType] = None,
    order: Optional[str] = None,
    like: Any = None,
    copy: bool = False,
 ) -> Any:
    """
    Converts anything into an array.
    """
    if order not in ("C", None):
        raise NotImplementedError(f"asarray is not implemented for order={order!r}.")
    if like is not None:
        raise NotImplementedError(
            f"asarray is not implemented for like != None (type={type(like)})."
        )
    if isinstance(a, BaseArrayApi):
        if copy:
            if dtype is None:
                return copy_inline(a)
            return copy_inline(a).astype(dtype=dtype)
        if dtype is None:
            return a
        return a.astype(dtype=dtype)

    if isinstance(a, int):
        v = TEagerTensor(np.array(a, dtype=np.int64))
    elif isinstance(a, float):
        v = TEagerTensor(np.array(a, dtype=np.float32))
    elif isinstance(a, bool):
        v = TEagerTensor(np.array(a, dtype=np.bool_))
    elif isinstance(a, str):
        v = TEagerTensor(np.array(a, dtype=np.str_))
    else:
        raise RuntimeError(f"Unexpected type {type(a)} for the first input.")
    if dtype is not None:
        vt = v.astype(dtype=dtype)
    else:
        vt = v
    return vt
diff --git a/onnx_array_api/array_api/onnx_numpy.py b/onnx_array_api/array_api/onnx_numpy.py
 from typing import Any, Optional
 import numpy as np
 from onnx import TensorProto
 from ..npx.npx_array_api import BaseArrayApi
 from ..npx.npx_functions import (
    all,
    abs,
    absolute,
    astype,
    copy as copy_inline,
    equal,
    isdtype,
    reshape,
 from ..npx.npx_functions import zeros as generic_zeros
 from ..npx.npx_numpy_tensors import EagerNumpyTensor
 from ..npx.npx_types import DType, ElemType, TensorType, OptParType
 from ._onnx_common import template_asarray
 from . import _finalize_array_api

 __all__ = [
    """
    Converts anything into an array.
    """
    if order not in ("C", None):
        raise NotImplementedError(f"asarray is not implemented for order={order!r}.")
    if like is not None:
        raise NotImplementedError(
            f"asarray is not implemented for like != None (type={type(like)})."
        )
    if isinstance(a, BaseArrayApi):
        if copy:
            if dtype is None:
                return copy_inline(a)
            return copy_inline(a).astype(dtype=dtype)
        if dtype is None:
            return a
        return a.astype(dtype=dtype)

    if isinstance(a, int):
        v = EagerNumpyTensor(np.array(a, dtype=np.int64))
    elif isinstance(a, float):
        v = EagerNumpyTensor(np.array(a, dtype=np.float32))
    elif isinstance(a, bool):
        v = EagerNumpyTensor(np.array(a, dtype=np.bool_))
    elif isinstance(a, str):
        v = EagerNumpyTensor(np.array(a, dtype=np.str_))
    else:
        raise RuntimeError(f"Unexpected type {type(a)} for the first input.")
    if dtype is not None:
        vt = v.astype(dtype=dtype)
    else:
        vt = v
    return vt
    return template_asarray(
        EagerNumpyTensor, a, dtype=dtype, order=order, like=like, copy=copy
    )


 def zeros(
diff --git a/onnx_array_api/array_api/onnx_ort.py b/onnx_array_api/array_api/onnx_ort.py
 """
 Array API valid for an :class:`EagerOrtTensor`.
 """
 from typing import Optional, Any
 from ..ort.ort_tensors import EagerOrtTensor
 from ..npx.npx_types import DType
 from ..npx.npx_functions import (
    all,
    abs,
    reshape,
    take,
 )
 from ._onnx_common import template_asarray
 from . import _finalize_array_api

 __all__ = [
    "all",
    "abs",
    "absolute",
    "asarray",
    "astype",
    "equal",
    "isdtype",
 ]


 def asarray(
    a: Any,
    dtype: Optional[DType] = None,
    order: Optional[str] = None,
    like: Any = None,
    copy: bool = False,
 ) -> EagerOrtTensor:
    """
    Converts anything into an array.
    """
    return template_asarray(
        EagerOrtTensor, a, dtype=dtype, order=order, like=like, copy=copy
    )


 def _finalize():
    from . import onnx_ort
Original file line number	Diff line number	Diff line change
Expand Up		@@ -127,9 +127,13 @@ jobs:
		cd array-api-tests
		displayName: 'Set API'
		- script: \|
		export ARRAY_API_TESTS_MODULE=onnx_array_api.array_api.onnx_numpy
		cd array-api-tests
		python -m pytest -xv array_api_tests/test_creation_functions.py::test_zeros
		displayName: "test_creation_functions.py::test_zeros"
		- script: \|
		export ARRAY_API_TESTS_MODULE=onnx_array_api.array_api.onnx_numpy
		cd array-api-tests
		python -m pytest -x array_api_tests
		displayName: "all tests"

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,50 @@
		from typing import Any, Optional
		import numpy as np
		from ..npx.npx_types import DType
		from ..npx.npx_array_api import BaseArrayApi
		from ..npx.npx_functions import (
		copy as copy_inline,
		)


		def template_asarray(
		TEagerTensor: type,
		a: Any,
		dtype: Optional[DType] = None,
		order: Optional[str] = None,
		like: Any = None,
		copy: bool = False,
		) -> Any:
		"""
		Converts anything into an array.
		"""
		if order not in ("C", None):
		raise NotImplementedError(f"asarray is not implemented for order={order!r}.")
		if like is not None:
		raise NotImplementedError(
		f"asarray is not implemented for like != None (type={type(like)})."
		)
		if isinstance(a, BaseArrayApi):
		if copy:
		if dtype is None:
		return copy_inline(a)
		return copy_inline(a).astype(dtype=dtype)
		if dtype is None:
		return a
		return a.astype(dtype=dtype)

		if isinstance(a, int):
		v = TEagerTensor(np.array(a, dtype=np.int64))
		elif isinstance(a, float):
		v = TEagerTensor(np.array(a, dtype=np.float32))
		elif isinstance(a, bool):
		v = TEagerTensor(np.array(a, dtype=np.bool_))
		elif isinstance(a, str):
		v = TEagerTensor(np.array(a, dtype=np.str_))
		else:
		raise RuntimeError(f"Unexpected type {type(a)} for the first input.")
		if dtype is not None:
		vt = v.astype(dtype=dtype)
		else:
		vt = v
		return vt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,13 +4,11 @@
		from typing import Any, Optional
		import numpy as np
		from onnx import TensorProto
		from ..npx.npx_array_api import BaseArrayApi
		from ..npx.npx_functions import (
		all,
		abs,
		absolute,
		astype,
		copy as copy_inline,
		equal,
		isdtype,
		reshape,
Expand All		@@ -19,6 +17,7 @@
		from ..npx.npx_functions import zeros as generic_zeros
		from ..npx.npx_numpy_tensors import EagerNumpyTensor
		from ..npx.npx_types import DType, ElemType, TensorType, OptParType
		from ._onnx_common import template_asarray
		from . import _finalize_array_api

		__all__ = [
Expand All		@@ -45,36 +44,9 @@ def asarray(
		"""
		Converts anything into an array.
		"""
		if order not in ("C", None):
		raise NotImplementedError(f"asarray is not implemented for order={order!r}.")
		if like is not None:
		raise NotImplementedError(
		f"asarray is not implemented for like != None (type={type(like)})."
		)
		if isinstance(a, BaseArrayApi):
		if copy:
		if dtype is None:
		return copy_inline(a)
		return copy_inline(a).astype(dtype=dtype)
		if dtype is None:
		return a
		return a.astype(dtype=dtype)

		if isinstance(a, int):
		v = EagerNumpyTensor(np.array(a, dtype=np.int64))
		elif isinstance(a, float):
		v = EagerNumpyTensor(np.array(a, dtype=np.float32))
		elif isinstance(a, bool):
		v = EagerNumpyTensor(np.array(a, dtype=np.bool_))
		elif isinstance(a, str):
		v = EagerNumpyTensor(np.array(a, dtype=np.str_))
		else:
		raise RuntimeError(f"Unexpected type {type(a)} for the first input.")
		if dtype is not None:
		vt = v.astype(dtype=dtype)
		else:
		vt = v
		return vt
		return template_asarray(
		EagerNumpyTensor, a, dtype=dtype, order=order, like=like, copy=copy
		)


		def zeros(
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,9 @@
		"""
		Array API valid for an :class:`EagerOrtTensor`.
		"""
		from typing import Optional, Any
		from ..ort.ort_tensors import EagerOrtTensor
		from ..npx.npx_types import DType
		from ..npx.npx_functions import (
		all,
		abs,
Expand All		@@ -11,12 +14,14 @@
		reshape,
		take,
		)
		from ._onnx_common import template_asarray
		from . import _finalize_array_api

		__all__ = [
		"all",
		"abs",
		"absolute",
		"asarray",
		"astype",
		"equal",
		"isdtype",
Expand All		@@ -25,6 +30,21 @@
		]


		def asarray(
		a: Any,
		dtype: Optional[DType] = None,
		order: Optional[str] = None,
		like: Any = None,
		copy: bool = False,
		) -> EagerOrtTensor:
		"""
		Converts anything into an array.
		"""
		return template_asarray(
		EagerOrtTensor, a, dtype=dtype, order=order, like=like, copy=copy
		)


		def _finalize():
		from . import onnx_ort

Expand Down