fastremap 1.17.0__cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 1.17.2__cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

fastremap/__init__.py

@@ -2,6 +2,7 @@ from .fastremap import (
     ascontiguousarray,
     asfortranarray,
     component_map,
+    fit_dtype,
     foreground,
     indices,
     inverse_component_map,
@@ -26,6 +27,7 @@ __all__ = [
     "ascontiguousarray",
     "asfortranarray",
     "component_map",
+    "fit_dtype",
     "foreground",
     "indices",
     "inverse_component_map",

fastremap/fastremap.pyi

@@ -441,6 +441,13 @@ def ascontiguousarray(arr: NDArray[Any]) -> NDArray[Any]:
     """
     ...
 
+def fit_dtype(
+    dtype:DTypeLike, 
+    value:Union[int, float, np.integer, np.unsignedinteger, np.complexfloating, np.floating], 
+    exotics:bool = False,
+) -> DTypeLike:
+    ...
+
 def minmax(
     arr: NDArray[Any],
 ) -> tuple[Union[int, float, None], Union[int, float, None]]:
@@ -458,7 +465,7 @@ def pixel_pairs(labels: NDArray[Any]) -> int:
     """
     ...
 
-def foreground(arr: NDArray[Any]) -> int:
+def foreground(arr: NDArray[np.integer]) -> int:
     """Returns the number of non-zero voxels in an array."""
     ...
 

fastremap/fastremap.pyx

@@ -292,7 +292,7 @@ def refit(arr, value=None, increase_only=False, exotics=False):
     else:
       value = min_value
 
-  dtype = _fit_dtype(arr.dtype, value, exotics=exotics)
+  dtype = fit_dtype(arr.dtype, value, exotics=exotics)
 
   if increase_only and np.dtype(dtype).itemsize <= np.dtype(arr.dtype).itemsize:
     return arr
@@ -300,7 +300,7 @@ def refit(arr, value=None, increase_only=False, exotics=False):
     return arr
   return arr.astype(dtype)
 
-def _fit_dtype(dtype, value, exotics=False):
+def fit_dtype(dtype, value, exotics=False):
   """
   Find the smallest dtype of the 
   same kind that will fit a given value.
@@ -973,9 +973,18 @@ def _unique_via_shifted_array(labels, min_label=None, max_label=None, return_ind
   if min_label is None or max_label is None:
     min_label, max_label = minmax(labels)
 
-  labels -= min_label
-  uniq, idx, counts, inverse = _unique_via_array(labels, max_label - min_label + 1, return_index, return_inverse)
-  labels += min_label
+  if labels.flags.writeable:
+    labels -= min_label
+    arr = labels
+  else:
+    arr = labels - min_label
+
+  uniq, idx, counts, inverse = _unique_via_array(arr, max_label - min_label + 1, return_index, return_inverse)
+  del arr
+
+  if labels.flags.writeable:
+    labels += min_label
+
   uniq += min_label
   return uniq, idx, counts, inverse
 
@@ -990,7 +999,7 @@ def _unique_via_renumber(labels, return_index=False, return_inverse=False):
     uniq.sort()
     return uniq, idx, counts, inverse
 
-  uniq, idx2 = np.unique(uniq, return_index=return_index)
+  uniq, idx2 = np.unique(uniq, return_index=True)
   if idx is not None:
     idx = idx[idx2]
   if counts is not None:

{fastremap-1.17.0.dist-info → fastremap-1.17.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastremap
-Version: 1.17.0
+Version: 1.17.2
 Summary: Remap, mask, renumber, unique, and in-place transposition of 3D labeled images. Point cloud too.
 Home-page: https://github.com/seung-lab/fastremap/
 Author: William Silversmith

fastremap-1.17.2.dist-info/RECORD

@@ -0,0 +1,15 @@
+fastremap/__init__.py,sha256=OgcsmS2SUE7W1fDcPQEQEba-zmOyZQ6ezZBnYglHTNc,814
+fastremap/ipt.hpp,sha256=aTS5-ftA8r0vGhJ1T5lE2xZwKCE1oCzgTbbNgIfehhM,7907
+fastremap/ska_flat_hash_map.hpp,sha256=eny2nkM5ME8SxYobjFgoypKjchpP1gLq8zI-S3EFYDw,61579
+fastremap/fastremap.pyi,sha256=vsAuGtadHq0l9yxpZpjAnv0EPhIWytYLVWpISUwISrw,15087
+fastremap/fastremap.pyx,sha256=q2jCUyzB3Un9glI1BBowkLnKTV-d98COsqBTJWGl9jU,45163
+fastremap/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastremap/fastremap.cpython-39-aarch64-linux-gnu.so,sha256=YAO9nhRsgVkXAKPNIWQAm7Ev410iqvyxQFtBJ7_KQUk,29365384
+fastremap/fastremap.pxd,sha256=lHTRtJC_SuDBuOGFtEx3zf7WTCAWuQ0oumwC9IdiuLk,3966
+fastremap-1.17.2.dist-info/METADATA,sha256=6Y0U4bh3nuaTAIpQMkolhrg_fA0vI4djjF7-Q54gDFs,10294
+fastremap-1.17.2.dist-info/RECORD,,
+fastremap-1.17.2.dist-info/top_level.txt,sha256=D-q4-YJbbk7QpuU8fxH9rFQEjV_W6wpdruzTTDV4N5s,10
+fastremap-1.17.2.dist-info/pbr.json,sha256=z-ahicM-bsw4Dwxh-QOB5RSgxodG7zN9H-J0_kKaSjc,47
+fastremap-1.17.2.dist-info/WHEEL,sha256=E40XJ3Kqr2LLs8cXTJwKscwWQko6dRKCfXO_6R_FbDI,149
+fastremap-1.17.2.dist-info/licenses/AUTHORS,sha256=Ws46nzS0P0zeAhwmIyTMrr02oD05yxM2KafJD07G5vQ,243
+fastremap-1.17.2.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652

{fastremap-1.17.0.dist-info → fastremap-1.17.2.dist-info}/licenses/AUTHORS

@@ -1,4 +1,5 @@
 Andreas Schwab <schwab@linux-m68k.org>
+Matthew Vine <32849887+MattTheCuber@users.noreply.github.com>
 Max <maxme1@users.noreply.github.com>
 William Silversmith <william.silvermsith@gmail.com>
 William Silversmith <william.silversmith@gmail.com>

fastremap-1.17.2.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "1fec0d5", "is_release": false}

fastremap-1.17.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-fastremap/ska_flat_hash_map.hpp,sha256=eny2nkM5ME8SxYobjFgoypKjchpP1gLq8zI-S3EFYDw,61579
-fastremap/fastremap.pyi,sha256=BtOaLT8CMKu9dljUB_WnhZs97_e-NVZlExdOLrLcEaI,14897
-fastremap/fastremap.pyx,sha256=12Ys8lgn_RHRwipHyrvbvR__qLJgse5X1IhFlkd_zjs,45047
-fastremap/fastremap.cpython-39-aarch64-linux-gnu.so,sha256=7vHyHjJTt_4Q6moWBspBLeOAedJP4jyHv_HbIB9AjtA,29368288
-fastremap/__init__.py,sha256=hB8qCFtoI0dJgCziFURiIjHLjuTjA2lU-HNNzcM0W-g,782
-fastremap/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastremap/ipt.hpp,sha256=aTS5-ftA8r0vGhJ1T5lE2xZwKCE1oCzgTbbNgIfehhM,7907
-fastremap/fastremap.pxd,sha256=lHTRtJC_SuDBuOGFtEx3zf7WTCAWuQ0oumwC9IdiuLk,3966
-fastremap-1.17.0.dist-info/WHEEL,sha256=E40XJ3Kqr2LLs8cXTJwKscwWQko6dRKCfXO_6R_FbDI,149
-fastremap-1.17.0.dist-info/top_level.txt,sha256=D-q4-YJbbk7QpuU8fxH9rFQEjV_W6wpdruzTTDV4N5s,10
-fastremap-1.17.0.dist-info/RECORD,,
-fastremap-1.17.0.dist-info/pbr.json,sha256=dR1UpQuiiTyrZ7Y1PMguAEXlAjPBXmHM_DXmzrK1gbY,47
-fastremap-1.17.0.dist-info/METADATA,sha256=P86CEeEBDSz3Dj-at8iRQ4wies_I0m6FNlQKTyXJxpU,10294
-fastremap-1.17.0.dist-info/licenses/AUTHORS,sha256=0qY4uhbaHN_67hMxvSqBeiQ6xhA_-u4dSDXlDdJ09Lk,181
-fastremap-1.17.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652

fastremap-1.17.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "1b389a3", "is_release": false}