large-image-source-nd2 1.33.4.dev13__tar.gz → 1.33.4.dev17__tar.gz

{large_image_source_nd2-1.33.4.dev13 → large_image_source_nd2-1.33.4.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-source-nd2
-Version: 1.33.4.dev13
+Version: 1.33.4.dev17
 Summary: An nd2 (NIS Elements) tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,11 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.33.4.dev13
+Requires-Dist: large-image>=1.33.4.dev17
 Requires-Dist: dask[array]
 Requires-Dist: nd2[legacy]>=0.2.3
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.33.4.dev13; extra == "girder"
+Requires-Dist: girder-large-image>=1.33.4.dev17; extra == "girder"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{large_image_source_nd2-1.33.4.dev13 → large_image_source_nd2-1.33.4.dev17}/large_image_source_nd2/__init__.py

@@ -321,9 +321,15 @@ class ND2FileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             fc //= self._nd2sizes[axis]
             tileframe = tileframe[fp // fc]
             fp = fp % fc
-        with self._tileLock:
-            # Have dask use single-threaded since we are using a lock anyway.
-            tile = tileframe[y0:y1:step, x0:x1:step].compute(scheduler='single-threaded').copy()
+        # We had done
+        #   with self._tileLock:
+        #       # Have dask use single-threaded since we are using a lock anyway.
+        #       tile = tileframe[y0:y1:step, x0:x1:step].compute(scheduler='single-threaded').copy()
+        # but this is no longer necessary.  We could limit the number of thread
+        # workers used by dask, but this doesn't actually change much.  We
+        # could also use scheduler='processes', but this fails to close handles
+        # a certain way and prints a lot of warnings and is slower.
+        tile = tileframe[y0:y1:step, x0:x1:step].compute().copy()
         return self._outputTile(tile, TILE_FORMAT_NUMPY, x, y, z,
                                 pilImageAllowed, numpyAllowed, **kwargs)
 

{large_image_source_nd2-1.33.4.dev13 → large_image_source_nd2-1.33.4.dev17}/large_image_source_nd2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-source-nd2
-Version: 1.33.4.dev13
+Version: 1.33.4.dev17
 Summary: An nd2 (NIS Elements) tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,11 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.33.4.dev13
+Requires-Dist: large-image>=1.33.4.dev17
 Requires-Dist: dask[array]
 Requires-Dist: nd2[legacy]>=0.2.3
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.33.4.dev13; extra == "girder"
+Requires-Dist: girder-large-image>=1.33.4.dev17; extra == "girder"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

large_image_source_nd2-1.33.4.dev17/large_image_source_nd2.egg-info/requires.txt

@@ -0,0 +1,6 @@
+large-image>=1.33.4.dev17
+dask[array]
+nd2[legacy]>=0.2.3
+
+[girder]
+girder-large-image>=1.33.4.dev17

large_image_source_nd2-1.33.4.dev13/large_image_source_nd2.egg-info/requires.txt

@@ -1,6 +0,0 @@
-large-image>=1.33.4.dev13
-dask[array]
-nd2[legacy]>=0.2.3
-
-[girder]
-girder-large-image>=1.33.4.dev13