diff --git a/dpnp/__init__.py b/dpnp/__init__.py index df9cfeadbee6..564045cb46e9 100644 --- a/dpnp/__init__.py +++ b/dpnp/__init__.py @@ -74,14 +74,16 @@ from .dpnp_iface_utils import __all__ as _ifaceutils__all__ from ._version import get_versions from . import exceptions as exceptions +from . import fft as fft from . import linalg as linalg +from . import random as random from . import scipy as scipy __all__ = _iface__all__ __all__ += _ifaceutils__all__ # add submodules -__all__ += ["exceptions", "linalg", "scipy"] +__all__ += ["exceptions", "fft", "linalg", "random", "scipy"] __version__ = get_versions()["version"] diff --git a/dpnp/dpnp_algo/__init__.py b/dpnp/dpnp_algo/__init__.py index a4bafb21574a..b5590d7076d3 100644 --- a/dpnp/dpnp_algo/__init__.py +++ b/dpnp/dpnp_algo/__init__.py @@ -27,7 +27,5 @@ # THE POSSIBILITY OF SUCH DAMAGE. # ***************************************************************************** -from dpnp.dpnp_algo.dpnp_algo import * -from dpnp.dpnp_algo.dpnp_algo import __all__ as __all__dpnp_algo - -__all__ = __all__dpnp_algo +# Internal package +__all__ = [] diff --git a/dpnp/dpnp_array.py b/dpnp/dpnp_array.py index beba058a998c..fe386bb7bd4e 100644 --- a/dpnp/dpnp_array.py +++ b/dpnp/dpnp_array.py @@ -41,7 +41,8 @@ from dpctl.tensor._numpy_helper import AxisError import dpnp -import dpnp.memory as dpm + +from . import memory as dpm def _get_unwrapped_index_key(key): diff --git a/dpnp/dpnp_iface.py b/dpnp/dpnp_iface.py index af944bffab19..3ff1abfcb25e 100644 --- a/dpnp/dpnp_iface.py +++ b/dpnp/dpnp_iface.py @@ -52,11 +52,7 @@ from dpctl.tensor._device import normalize_queue_device import dpnp -from dpnp.dpnp_algo import * from dpnp.dpnp_array import dpnp_array -from dpnp.fft import * -from dpnp.memory import * -from dpnp.random import * __all__ = [ "are_same_logical_tensors", diff --git a/dpnp/dpnp_iface_bitwise.py b/dpnp/dpnp_iface_bitwise.py index e823863b43c7..c7948af32e57 100644 --- a/dpnp/dpnp_iface_bitwise.py +++ b/dpnp/dpnp_iface_bitwise.py @@ -48,7 +48,8 @@ import numpy import dpnp.backend.extensions.ufunc._ufunc_impl as ufi -from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc + +from .dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc __all__ = [ "binary_repr", diff --git a/dpnp/dpnp_iface_indexing.py b/dpnp/dpnp_iface_indexing.py index 97f50a1c1489..9b38e9ec9b87 100644 --- a/dpnp/dpnp_iface_indexing.py +++ b/dpnp/dpnp_iface_indexing.py @@ -58,8 +58,7 @@ # pylint: disable=no-name-in-module import dpnp.backend.extensions.indexing._indexing_impl as indexing_ext -# pylint: disable=no-name-in-module -from .dpnp_algo import ( +from .dpnp_algo.dpnp_algo import ( dpnp_putmask, ) from .dpnp_array import dpnp_array diff --git a/dpnp/dpnp_iface_logic.py b/dpnp/dpnp_iface_logic.py index 3ee993487877..9041c2726fff 100644 --- a/dpnp/dpnp_iface_logic.py +++ b/dpnp/dpnp_iface_logic.py @@ -52,8 +52,8 @@ import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi -from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc +from .dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc from .dpnp_utils import get_usm_allocations __all__ = [ diff --git a/dpnp/dpnp_iface_mathematical.py b/dpnp/dpnp_iface_mathematical.py index 6fe165632aea..8c968074a5aa 100644 --- a/dpnp/dpnp_iface_mathematical.py +++ b/dpnp/dpnp_iface_mathematical.py @@ -62,7 +62,7 @@ import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi -from .dpnp_algo import dpnp_modf +from .dpnp_algo.dpnp_algo import dpnp_modf from .dpnp_algo.dpnp_elementwise_common import ( DPNPI0, DPNPAngle, diff --git a/dpnp/dpnp_iface_sorting.py b/dpnp/dpnp_iface_sorting.py index 2579ec84dad2..a96f2c78f550 100644 --- a/dpnp/dpnp_iface_sorting.py +++ b/dpnp/dpnp_iface_sorting.py @@ -49,7 +49,7 @@ import dpnp # pylint: disable=no-name-in-module -from .dpnp_algo import ( +from .dpnp_algo.dpnp_algo import ( dpnp_partition, ) from .dpnp_array import dpnp_array diff --git a/dpnp/fft/__init__.py b/dpnp/fft/__init__.py index 68a0803deddb..f76296d71b6e 100644 --- a/dpnp/fft/__init__.py +++ b/dpnp/fft/__init__.py @@ -154,7 +154,26 @@ """ -from dpnp.fft.dpnp_iface_fft import * -from dpnp.fft.dpnp_iface_fft import __all__ as __all__fft +from .dpnp_iface_fft import __all__ as __all__fft +from .dpnp_iface_fft import ( + fft, + fft2, + fftfreq, + fftn, + fftshift, + hfft, + ifft, + ifft2, + ifftn, + ifftshift, + ihfft, + irfft, + irfft2, + irfftn, + rfft, + rfft2, + rfftfreq, + rfftn, +) __all__ = __all__fft diff --git a/dpnp/random/__init__.py b/dpnp/random/__init__.py index 178e5d6bd38a..6bb112a42c33 100644 --- a/dpnp/random/__init__.py +++ b/dpnp/random/__init__.py @@ -27,9 +27,58 @@ # THE POSSIBILITY OF SUCH DAMAGE. # ***************************************************************************** -from .dpnp_iface_random import * from .dpnp_iface_random import __all__ as __all__random -from .dpnp_random_state import * +from .dpnp_iface_random import ( + beta, + binomial, + bytes, + chisquare, + choice, + dirichlet, + exponential, + f, + gamma, + geometric, + gumbel, + hypergeometric, + laplace, + logistic, + lognormal, + logseries, + multinomial, + multivariate_normal, + negative_binomial, + noncentral_chisquare, + noncentral_f, + normal, + pareto, + permutation, + poisson, + power, + rand, + randint, + randn, + random, + random_integers, + random_sample, + ranf, + rayleigh, + sample, + seed, + shuffle, + standard_cauchy, + standard_exponential, + standard_gamma, + standard_normal, + standard_t, + triangular, + uniform, + vonmises, + wald, + weibull, + zipf, +) +from .dpnp_random_state import RandomState from .dpnp_random_state import __all__ as __all__random_state __all__ = __all__random diff --git a/dpnp/random/dpnp_iface_random.py b/dpnp/random/dpnp_iface_random.py index 40d5daa51e3f..3b1294a3be63 100644 --- a/dpnp/random/dpnp_iface_random.py +++ b/dpnp/random/dpnp_iface_random.py @@ -42,7 +42,6 @@ import numpy import dpnp -from dpnp.dpnp_algo import * from dpnp.dpnp_utils import * from .dpnp_algo_random import *