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

Skip to content

Commit b73a5ae

Browse files
ngoldbaumngoldbaum
authored
Merge pull request #24580 from mtsokol/lib-stride-tricks-namespace
API: Update `lib.stride_tricks` namespace
2 parents a115ed3 + 6e12461 commit b73a5ae

14 files changed

+646
-643
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, c_, column_stack, diag_indices,
187+
array_split, c_, column_stack, diag_indices,
189188
diag_indices_from, dsplit, dstack,
190189
emath, expand_dims, fill_diagonal,
191190
fromregex, get_array_wrap, genfromtxt,
@@ -230,6 +229,9 @@
230229
from .lib._utils_impl import (
231230
byte_bounds, show_runtime, get_include, info
232231
)
232+
from .lib._stride_tricks_impl import (
233+
broadcast_arrays, broadcast_shapes, broadcast_to
234+
)
233235
from . import matrixlib as _mat
234236
from .matrixlib import (
235237
asmatrix, bmat, matrix
@@ -299,6 +301,7 @@
299301
set(lib._ufunclike_impl.__all__) |
300302
set(lib._arraypad_impl.__all__) |
301303
set(lib._utils_impl.__all__) |
304+
set(lib._stride_tricks_impl.__all__) |
302305
{"show_config", "__version__"}
303306
)
304307

‎numpy/__init__.pyi

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

539-
from numpy.lib.stride_tricks import (
539+
from numpy.lib._stride_tricks_impl import (
540540
broadcast_to as broadcast_to,
541541
broadcast_arrays as broadcast_arrays,
542542
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/core/tests/test_mem_overlap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ def __array__(self):
568568

569569
def view_element_first_byte(x):
570570
"""Construct an array viewing the first byte of each element of `x`"""
571-
from numpy.lib.stride_tricks import DummyArray
571+
from numpy.lib._stride_tricks_impl import DummyArray
572572
interface = dict(x.__array_interface__)
573573
interface['typestr'] = '|b1'
574574
interface['descr'] = [('', '|b1')]

‎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_impl
2930
from . import _ufunclike_impl
@@ -38,7 +39,6 @@
3839

3940
from .index_tricks import *
4041
from .shape_base import *
41-
from .stride_tricks import *
4242
from .polynomial import *
4343
from .npyio import *
4444
from .arrayterator import Arrayterator
@@ -50,7 +50,6 @@
5050
__all__ = ['emath']
5151
__all__ += index_tricks.__all__
5252
__all__ += shape_base.__all__
53-
__all__ += stride_tricks.__all__
5453
__all__ += polynomial.__all__
5554
__all__ += npyio.__all__
5655

‎numpy/lib/__init__.pyi

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ from numpy.lib.shape_base import (
8989
put_along_axis as put_along_axis,
9090
)
9191

92-
from numpy.lib.stride_tricks import (
93-
broadcast_to as broadcast_to,
94-
broadcast_arrays as broadcast_arrays,
95-
broadcast_shapes as broadcast_shapes,
96-
)
97-
9892
from numpy.core.multiarray import (
9993
add_docstring as add_docstring,
10094
tracemalloc_domain as tracemalloc_domain,

‎numpy/lib/_function_base_impl.py

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

20992101

0 commit comments

Comments
 (0)