Skip to content

Commit 45df3fd

Browse files
Merge 7e4c6ad into 574e1ca
2 parents 574e1ca + 7e4c6ad commit 45df3fd

File tree

12 files changed

+85
-21
lines changed

12 files changed

+85
-21
lines changed

dpnp/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@
7474
from .dpnp_iface_utils import __all__ as _ifaceutils__all__
7575
from ._version import get_versions
7676
from . import exceptions as exceptions
77+
from . import fft as fft
7778
from . import linalg as linalg
79+
from . import random as random
7880
from . import scipy as scipy
7981

8082
__all__ = _iface__all__
8183
__all__ += _ifaceutils__all__
8284

8385
# add submodules
84-
__all__ += ["exceptions", "linalg", "scipy"]
86+
__all__ += ["exceptions", "fft", "linalg", "random", "scipy"]
8587

8688

8789
__version__ = get_versions()["version"]

dpnp/dpnp_algo/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,5 @@
2727
# THE POSSIBILITY OF SUCH DAMAGE.
2828
# *****************************************************************************
2929

30-
from dpnp.dpnp_algo.dpnp_algo import *
31-
from dpnp.dpnp_algo.dpnp_algo import __all__ as __all__dpnp_algo
32-
33-
__all__ = __all__dpnp_algo
30+
# Internal package
31+
__all__ = []

dpnp/dpnp_array.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
from dpctl.tensor._numpy_helper import AxisError
4242

4343
import dpnp
44-
import dpnp.memory as dpm
44+
45+
from . import memory as dpm
4546

4647

4748
def _get_unwrapped_index_key(key):

dpnp/dpnp_iface.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@
5252
from dpctl.tensor._device import normalize_queue_device
5353

5454
import dpnp
55-
from dpnp.dpnp_algo import *
5655
from dpnp.dpnp_array import dpnp_array
57-
from dpnp.fft import *
58-
from dpnp.memory import *
59-
from dpnp.random import *
6056

6157
__all__ = [
6258
"are_same_logical_tensors",

dpnp/dpnp_iface_bitwise.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
import numpy
4949

5050
import dpnp.backend.extensions.ufunc._ufunc_impl as ufi
51-
from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc
51+
52+
from .dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc
5253

5354
__all__ = [
5455
"binary_repr",

dpnp/dpnp_iface_indexing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
# pylint: disable=no-name-in-module
5959
import dpnp.backend.extensions.indexing._indexing_impl as indexing_ext
6060

61-
# pylint: disable=no-name-in-module
62-
from .dpnp_algo import (
61+
from .dpnp_algo.dpnp_algo import (
6362
dpnp_putmask,
6463
)
6564
from .dpnp_array import dpnp_array

dpnp/dpnp_iface_logic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252

5353
import dpnp
5454
import dpnp.backend.extensions.ufunc._ufunc_impl as ufi
55-
from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc
5655

56+
from .dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc
5757
from .dpnp_utils import get_usm_allocations
5858

5959
__all__ = [

dpnp/dpnp_iface_mathematical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import dpnp
6363
import dpnp.backend.extensions.ufunc._ufunc_impl as ufi
6464

65-
from .dpnp_algo import dpnp_modf
65+
from .dpnp_algo.dpnp_algo import dpnp_modf
6666
from .dpnp_algo.dpnp_elementwise_common import (
6767
DPNPI0,
6868
DPNPAngle,

dpnp/dpnp_iface_sorting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import dpnp
5050

5151
# pylint: disable=no-name-in-module
52-
from .dpnp_algo import (
52+
from .dpnp_algo.dpnp_algo import (
5353
dpnp_partition,
5454
)
5555
from .dpnp_array import dpnp_array

dpnp/fft/__init__.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,26 @@
154154
155155
"""
156156

157-
from dpnp.fft.dpnp_iface_fft import *
158-
from dpnp.fft.dpnp_iface_fft import __all__ as __all__fft
157+
from .dpnp_iface_fft import __all__ as __all__fft
158+
from .dpnp_iface_fft import (
159+
fft,
160+
fft2,
161+
fftfreq,
162+
fftn,
163+
fftshift,
164+
hfft,
165+
ifft,
166+
ifft2,
167+
ifftn,
168+
ifftshift,
169+
ihfft,
170+
irfft,
171+
irfft2,
172+
irfftn,
173+
rfft,
174+
rfft2,
175+
rfftfreq,
176+
rfftn,
177+
)
159178

160179
__all__ = __all__fft

0 commit comments

Comments
 (0)