From 1ff29b986dec48e3c07b72cb407548e7b3d33ce1 Mon Sep 17 00:00:00 2001 From: ohrechykha Date: Tue, 10 Sep 2024 15:03:47 +0300 Subject: [PATCH] further ignores + adding equal_nan in np.unique instances --- src/ragged/__init__.py | 2 +- src/ragged/_spec_set_functions.py | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ragged/__init__.py b/src/ragged/__init__.py index ea238aa..02af4d1 100644 --- a/src/ragged/__init__.py +++ b/src/ragged/__init__.py @@ -130,7 +130,7 @@ nonzero, where, ) -from ._spec_set_functions import ( # pylint: disable=W0622 +from ._spec_set_functions import ( # pylint: disable=R0401 unique_all, unique_counts, unique_inverse, diff --git a/src/ragged/_spec_set_functions.py b/src/ragged/_spec_set_functions.py index 26f2241..ed0a2db 100644 --- a/src/ragged/_spec_set_functions.py +++ b/src/ragged/_spec_set_functions.py @@ -55,7 +55,7 @@ def unique_all(x: array, /) -> tuple[array, array, array, array]: if isinstance(x, ragged.array): if x.ndim == 0: return unique_all_result( - values=ragged.array(np.unique(x._impl)), # pylint: disable=W0212 + values=ragged.array(np.unique(x._impl, equal_nan=False)), # pylint: disable=W0212 indices=ragged.array([0]), inverse_indices=ragged.array([0]), counts=ragged.array([1]), @@ -116,7 +116,7 @@ def unique_counts(x: array, /) -> tuple[array, array]: if isinstance(x, ragged.array): if x.ndim == 0: return unique_counts_result( - values=ragged.array(np.unique(x._impl)), + values=ragged.array(np.unique(x._impl, equal_nan=False)), # pylint: disable=W0212 counts=ragged.array([1]), # pylint: disable=W0212 ) else: @@ -125,7 +125,9 @@ def unique_counts(x: array, /) -> tuple[array, array]: return unique_counts_result( values=ragged.array([]), counts=ragged.array([]) ) - values, counts = np.unique(x_flat.layout.data, return_counts=True) # pylint: disable=E1101 + values, counts = np.unique( + x_flat.layout.data, return_counts=True, equal_nan=False + ) # pylint: disable=E1101 return unique_counts_result( values=ragged.array(values), counts=ragged.array(counts) ) @@ -163,7 +165,7 @@ def unique_inverse(x: array, /) -> tuple[array, array]: if isinstance(x, ragged.array): if x.ndim == 0: return unique_inverse_result( - values=ragged.array(np.unique(x._impl)), # pylint: disable=W0212 + values=ragged.array(np.unique(x._impl, equal_nan=False)), # pylint: disable=W0212 inverse_indices=ragged.array([0]), ) else: @@ -172,7 +174,9 @@ def unique_inverse(x: array, /) -> tuple[array, array]: return unique_inverse_result( values=ragged.array([]), inverse_indices=ragged.array([]) ) - values, inverse_indices = np.unique(x_flat.layout.data, return_inverse=True) # pylint: disable=E1101 + values, inverse_indices = np.unique( + x_flat.layout.data, return_inverse=True, equal_nan=False + ) # pylint: disable=E1101 return unique_inverse_result( values=ragged.array(values), @@ -200,13 +204,13 @@ def unique_values(x: array, /) -> array: """ if isinstance(x, ragged.array): if x.ndim == 0: - return ragged.array(np.unique(x._impl)) # pylint: disable=W0212 + return ragged.array(np.unique(x._impl, equal_nan=False)) # pylint: disable=W0212 else: x_flat = ak.ravel(x._impl) # pylint: disable=W0212 if isinstance(x_flat.layout, ak.contents.EmptyArray): # pylint: disable=E1101 return ragged.array([]) - return ragged.array(np.unique(x_flat.layout.data)) # pylint: disable=E1101 + return ragged.array(np.unique(x_flat.layout.data, equal_nan=False)) # pylint: disable=E1101 else: err = f"Expected ragged type but got {type(x)}" # type: ignore[unreachable] raise TypeError(err)