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

Skip to content

API: Update lib.stride_tricks namespace #24580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 30, 2023
Merged

API: Update lib.stride_tricks namespace #24580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3293164
API: Update lib.stride_tricks namespace
mtsokol Aug 29, 2023
6e12461
Apply review comments
mtsokol Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions numpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@
from . import lib
from .lib import (
DataSource, apply_along_axis, apply_over_axes,
array_split, broadcast_arrays, broadcast_shapes,
broadcast_to, c_, column_stack, diag_indices,
array_split, c_, column_stack, diag_indices,
diag_indices_from, dsplit, dstack,
emath, expand_dims, fill_diagonal,
fromregex, get_array_wrap, genfromtxt,
Expand Down Expand Up @@ -230,6 +229,9 @@
from .lib._utils_impl import (
byte_bounds, show_runtime, get_include, info
)
from .lib._stride_tricks_impl import (
broadcast_arrays, broadcast_shapes, broadcast_to
)
from . import matrixlib as _mat
from .matrixlib import (
asmatrix, bmat, matrix
Expand Down Expand Up @@ -299,6 +301,7 @@
set(lib._ufunclike_impl.__all__) |
set(lib._arraypad_impl.__all__) |
set(lib._utils_impl.__all__) |
set(lib._stride_tricks_impl.__all__) |
{"show_config", "__version__"}
)

Expand Down
2 changes: 1 addition & 1 deletion numpy/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ from numpy.lib.shape_base import (
put_along_axis as put_along_axis,
)

from numpy.lib.stride_tricks import (
from numpy.lib._stride_tricks_impl import (
broadcast_to as broadcast_to,
broadcast_arrays as broadcast_arrays,
broadcast_shapes as broadcast_shapes,
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _count_reduce_items(arr, axis, keepdims=False, where=True):
# axis and full sum is more excessive than needed.

# guarded to protect circular imports
from numpy.lib.stride_tricks import broadcast_to
from numpy.lib._stride_tricks_impl import broadcast_to
# count True values in (potentially broadcasted) boolean mask
items = umr_sum(broadcast_to(where, arr.shape), axis, nt.intp, None,
keepdims)
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/tests/test_mem_overlap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ def __array__(self):

def view_element_first_byte(x):
"""Construct an array viewing the first byte of each element of `x`"""
from numpy.lib.stride_tricks import DummyArray
from numpy.lib._stride_tricks_impl import DummyArray
interface = dict(x.__array_interface__)
interface['typestr'] = '|b1'
interface['descr'] = [('', '|b1')]
Expand Down
3 changes: 1 addition & 2 deletions numpy/lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from . import _nanfunctions_impl
from . import _function_base_impl
from . import shape_base
from . import _stride_tricks_impl
from . import stride_tricks
from . import _twodim_base_impl
from . import _ufunclike_impl
Expand All @@ -38,7 +39,6 @@

from .index_tricks import *
from .shape_base import *
from .stride_tricks import *
from .polynomial import *
from .npyio import *
from .arrayterator import Arrayterator
Expand All @@ -50,7 +50,6 @@
__all__ = ['emath']
__all__ += index_tricks.__all__
__all__ += shape_base.__all__
__all__ += stride_tricks.__all__
__all__ += polynomial.__all__
__all__ += npyio.__all__

Expand Down
6 changes: 0 additions & 6 deletions numpy/lib/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@ from numpy.lib.shape_base import (
put_along_axis as put_along_axis,
)

from numpy.lib.stride_tricks import (
broadcast_to as broadcast_to,
broadcast_arrays as broadcast_arrays,
broadcast_shapes as broadcast_shapes,
)

from numpy.core.multiarray import (
add_docstring as add_docstring,
tracemalloc_domain as tracemalloc_domain,
Expand Down
4 changes: 3 additions & 1 deletion numpy/lib/_function_base_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,9 @@ def _parse_input_dimensions(args, input_core_dims):
ndim = arg.ndim - len(core_dims)
dummy_array = np.lib.stride_tricks.as_strided(0, arg.shape[:ndim])
broadcast_args.append(dummy_array)
broadcast_shape = np.lib.stride_tricks._broadcast_shape(*broadcast_args)
broadcast_shape = np.lib._stride_tricks_impl._broadcast_shape(
*broadcast_args
)
return broadcast_shape, dim_sizes


Expand Down
Loading