fastremap 1.17.0__tar.gz → 1.17.1__tar.gz

{fastremap-1.17.0 → fastremap-1.17.1}/ChangeLog

@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+1.17.1
+------
+
+* fixtest: promote fit\_dtype in testing
+* fix: fit\_dtype is used externally
+* docs: add collaborators
+
 1.17.0
 ------
 

{fastremap-1.17.0/fastremap.egg-info → fastremap-1.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fastremap
-Version: 1.17.0
+Version: 1.17.1
 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
@@ -26,6 +26,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{fastremap-1.17.0 → fastremap-1.17.1}/automated_test.py

@@ -302,94 +302,94 @@ def test_ascontiguousarray(dtype, dim):
 
 @pytest.mark.parametrize("dtype", [ np.uint8, np.uint16, np.uint32, np.uint64 ])
 def test_fit_dtype_uint(dtype):
-  assert fastremap.fastremap._fit_dtype(dtype, 0) == np.uint8
-  assert fastremap.fastremap._fit_dtype(dtype, 255) == np.uint8
-  assert fastremap.fastremap._fit_dtype(dtype, 256) == np.uint16
-  assert fastremap.fastremap._fit_dtype(dtype, 10000) == np.uint16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**16 - 1) == np.uint16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**16) == np.uint32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**32) == np.uint64
-  assert fastremap.fastremap._fit_dtype(dtype, 2**64 - 1) == np.uint64
+  assert fastremap.fit_dtype(dtype, 0) == np.uint8
+  assert fastremap.fit_dtype(dtype, 255) == np.uint8
+  assert fastremap.fit_dtype(dtype, 256) == np.uint16
+  assert fastremap.fit_dtype(dtype, 10000) == np.uint16
+  assert fastremap.fit_dtype(dtype, 2**16 - 1) == np.uint16
+  assert fastremap.fit_dtype(dtype, 2**16) == np.uint32
+  assert fastremap.fit_dtype(dtype, 2**32) == np.uint64
+  assert fastremap.fit_dtype(dtype, 2**64 - 1) == np.uint64
 
   try:
-    fastremap.fastremap._fit_dtype(dtype, -1)
+    fastremap.fit_dtype(dtype, -1)
     assert False 
   except ValueError:
     pass
 
   try:
-    fastremap.fastremap._fit_dtype(dtype, 2**64)
+    fastremap.fit_dtype(dtype, 2**64)
   except ValueError:
     pass
 
 @pytest.mark.parametrize("dtype", [ np.int8, np.int16, np.int32, np.int64 ])
 def test_fit_dtype_int(dtype):
-  assert fastremap.fastremap._fit_dtype(dtype, 0) == np.int8
-  assert fastremap.fastremap._fit_dtype(dtype, 127) == np.int8
-  assert fastremap.fastremap._fit_dtype(dtype, -128) == np.int8
-  assert fastremap.fastremap._fit_dtype(dtype, 128) == np.int16
-  assert fastremap.fastremap._fit_dtype(dtype, 10000) == np.int16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**15 - 1) == np.int16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**15) == np.int32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**32) == np.int64
-  assert fastremap.fastremap._fit_dtype(dtype, 2**63 - 1) == np.int64
+  assert fastremap.fit_dtype(dtype, 0) == np.int8
+  assert fastremap.fit_dtype(dtype, 127) == np.int8
+  assert fastremap.fit_dtype(dtype, -128) == np.int8
+  assert fastremap.fit_dtype(dtype, 128) == np.int16
+  assert fastremap.fit_dtype(dtype, 10000) == np.int16
+  assert fastremap.fit_dtype(dtype, 2**15 - 1) == np.int16
+  assert fastremap.fit_dtype(dtype, 2**15) == np.int32
+  assert fastremap.fit_dtype(dtype, 2**32) == np.int64
+  assert fastremap.fit_dtype(dtype, 2**63 - 1) == np.int64
 
   try:
-    fastremap.fastremap._fit_dtype(dtype, 2**63)
+    fastremap.fit_dtype(dtype, 2**63)
   except ValueError:
     pass
 
   try:
-    fastremap.fastremap._fit_dtype(dtype, -2**63)
+    fastremap.fit_dtype(dtype, -2**63)
   except ValueError:
     pass
 
 @pytest.mark.parametrize("dtype", [ np.float16, np.float32, np.float64 ])
 def test_fit_dtype_float(dtype):
-  assert fastremap.fastremap._fit_dtype(dtype, 0) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 127) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 128) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 10000) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**15 - 1) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**15) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**32) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**63 - 1) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, -2**63) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**128) == np.float64
-
-  assert fastremap.fastremap._fit_dtype(dtype, 0, exotics=True) == np.float16
-  assert fastremap.fastremap._fit_dtype(dtype, 127, exotics=True) == np.float16
-  assert fastremap.fastremap._fit_dtype(dtype, 128, exotics=True) == np.float16
-  assert fastremap.fastremap._fit_dtype(dtype, 10000, exotics=True) == np.float16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**15 - 1, exotics=True) == np.float16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**15, exotics=True) == np.float16
-  assert fastremap.fastremap._fit_dtype(dtype, 2**32, exotics=True) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, 2**63 - 1, exotics=True) == np.float32
-  assert fastremap.fastremap._fit_dtype(dtype, -2**63, exotics=True) == np.float32
+  assert fastremap.fit_dtype(dtype, 0) == np.float32
+  assert fastremap.fit_dtype(dtype, 127) == np.float32
+  assert fastremap.fit_dtype(dtype, 128) == np.float32
+  assert fastremap.fit_dtype(dtype, 10000) == np.float32
+  assert fastremap.fit_dtype(dtype, 2**15 - 1) == np.float32
+  assert fastremap.fit_dtype(dtype, 2**15) == np.float32
+  assert fastremap.fit_dtype(dtype, 2**32) == np.float32
+  assert fastremap.fit_dtype(dtype, 2**63 - 1) == np.float32
+  assert fastremap.fit_dtype(dtype, -2**63) == np.float32
+  assert fastremap.fit_dtype(dtype, 2**128) == np.float64
+
+  assert fastremap.fit_dtype(dtype, 0, exotics=True) == np.float16
+  assert fastremap.fit_dtype(dtype, 127, exotics=True) == np.float16
+  assert fastremap.fit_dtype(dtype, 128, exotics=True) == np.float16
+  assert fastremap.fit_dtype(dtype, 10000, exotics=True) == np.float16
+  assert fastremap.fit_dtype(dtype, 2**15 - 1, exotics=True) == np.float16
+  assert fastremap.fit_dtype(dtype, 2**15, exotics=True) == np.float16
+  assert fastremap.fit_dtype(dtype, 2**32, exotics=True) == np.float32
+  assert fastremap.fit_dtype(dtype, 2**63 - 1, exotics=True) == np.float32
+  assert fastremap.fit_dtype(dtype, -2**63, exotics=True) == np.float32
 
 @pytest.mark.parametrize("dtype", [ np.csingle, np.cdouble ])
 @pytest.mark.parametrize("sign", [ 1, -1, 1j, -1j ])
 def test_fit_dtype_float(dtype, sign):
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 0+0j) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 127) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 127) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 128) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 128) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 10000) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 10000) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 2**15 - 1) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 2**15) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 2**32) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 2**63 - 1) == np.csingle
-  assert fastremap.fastremap._fit_dtype(dtype, -2**63) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 0+0j) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 127) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 127) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 128) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 128) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 10000) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 10000) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 2**15 - 1) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 2**15) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 2**32) == np.csingle
+  assert fastremap.fit_dtype(dtype, sign * 2**63 - 1) == np.csingle
+  assert fastremap.fit_dtype(dtype, -2**63) == np.csingle
   
   try:
-    fastremap.fastremap._fit_dtype(dtype, sign * 2**128)
+    fastremap.fit_dtype(dtype, sign * 2**128)
     assert False
   except ValueError:
     pass
 
-  assert fastremap.fastremap._fit_dtype(dtype, sign * 2**128, exotics=True) == np.cdouble
+  assert fastremap.fit_dtype(dtype, sign * 2**128, exotics=True) == np.cdouble
 
 def test_minmax():
   volume = np.random.randint(-500, 500, size=(128,128,128))

{fastremap-1.17.0 → fastremap-1.17.1}/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-1.17.0 → fastremap-1.17.1}/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]]:

{fastremap-1.17.0 → fastremap-1.17.1}/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.

{fastremap-1.17.0 → fastremap-1.17.1/fastremap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fastremap
-Version: 1.17.0
+Version: 1.17.1
 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
@@ -26,6 +26,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

fastremap-1.17.1/fastremap.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "d754c45", "is_release": true}

fastremap-1.17.0/fastremap.egg-info/pbr.json

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