Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e275ece

Browse files
mtsokolmtsokol
committed
API: Update lib.stride_tricks namespace
1 parent 5ba26f0 commit e275ece

12 files changed

+646
-640
lines changed

‎numpy/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@
184184
from . import lib
185185
from .lib import (
186186
DataSource, apply_along_axis, apply_over_axes,
187-
array_split, broadcast_arrays, broadcast_shapes,
188-
broadcast_to, byte_bounds, c_, column_stack, diag, diag_indices,
187+
array_split, byte_bounds, c_, column_stack, diag, diag_indices,
189188
diag_indices_from, diagflat, dsplit, dstack,
190189
ediff1d, emath, expand_dims, eye, fill_diagonal, fix,
191190
fliplr, flipud, fromregex, get_array_wrap, genfromtxt,
@@ -221,6 +220,9 @@
221220
iscomplexobj, isrealobj, imag, iscomplex, isreal, nan_to_num, real,
222221
real_if_close, typename, mintypecode, common_type
223222
)
223+
from .lib._stride_tricks_impl import (
224+
broadcast_arrays, broadcast_shapes, broadcast_to
225+
)
224226
from . import matrixlib as _mat
225227
from .matrixlib import (
226228
asmatrix, bmat, matrix
@@ -285,6 +287,7 @@
285287
set(lib._nanfunctions_impl.__all__) |
286288
set(lib._function_base_impl.__all__) |
287289
set(lib._type_check_impl.__all__) |
290+
set(lib._stride_tricks_impl.__all__) |
288291
{"show_config", "__version__"}
289292
)
290293

‎numpy/__init__.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ from numpy.lib.shape_base import (
537537
put_along_axis as put_along_axis,
538538
)
539539

540-
from numpy.lib.stride_tricks import (
540+
from numpy.lib._stride_tricks_impl import (
541541
broadcast_to as broadcast_to,
542542
broadcast_arrays as broadcast_arrays,
543543
broadcast_shapes as broadcast_shapes,

‎numpy/core/_methods.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def _count_reduce_items(arr, axis, keepdims=False, where=True):
8282
# axis and full sum is more excessive than needed.
8383

8484
# guarded to protect circular imports
85-
from numpy.lib.stride_tricks import broadcast_to
85+
from numpy.lib._stride_tricks_impl import broadcast_to
8686
# count True values in (potentially broadcasted) boolean mask
8787
items = umr_sum(broadcast_to(where, arr.shape), axis, nt.intp, None,
8888
keepdims)

‎numpy/lib/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from . import _nanfunctions_impl
2525
from . import _function_base_impl
2626
from . import shape_base
27+
from . import _stride_tricks_impl
2728
from . import stride_tricks
2829
from . import twodim_base
2930
from . import ufunclike
@@ -38,7 +39,6 @@
3839

3940
from .index_tricks import *
4041
from .shape_base import *
41-
from .stride_tricks import *
4242
from .twodim_base import *
4343
from .ufunclike import *
4444

@@ -56,7 +56,6 @@
5656
__all__ = ['emath']
5757
__all__ += index_tricks.__all__
5858
__all__ += shape_base.__all__
59-
__all__ += stride_tricks.__all__
6059
__all__ += twodim_base.__all__
6160
__all__ += ufunclike.__all__
6261
__all__ += arraypad.__all__

‎numpy/lib/__init__.pyi

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,6 @@ from numpy.lib.shape_base import (
104104
put_along_axis as put_along_axis,
105105
)
106106

107-
from numpy.lib.stride_tricks import (
108-
broadcast_to as broadcast_to,
109-
broadcast_arrays as broadcast_arrays,
110-
broadcast_shapes as broadcast_shapes,
111-
)
112-
113107
from numpy.lib.twodim_base import (
114108
diag as diag,
115109
diagflat as diagflat,

‎numpy/lib/_function_base_impl.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,9 @@ def _parse_input_dimensions(args, input_core_dims):
20942094
ndim = arg.ndim - len(core_dims)
20952095
dummy_array = np.lib.stride_tricks.as_strided(0, arg.shape[:ndim])
20962096
broadcast_args.append(dummy_array)
2097-
broadcast_shape = np.lib.stride_tricks._broadcast_shape(*broadcast_args)
2097+
broadcast_shape = np.lib._stride_tricks_impl._broadcast_shape(
2098+
*broadcast_args
2099+
)
20982100
return broadcast_shape, dim_sizes
20992101

21002102

0 commit comments

Comments
 (0)