dcnum 0.11.5__py3-none-any.whl → 0.11.6__py3-none-any.whl

dcnum/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.11.5'
-__version_tuple__ = version_tuple = (0, 11, 5)
+__version__ = version = '0.11.6'
+__version_tuple__ = version_tuple = (0, 11, 6)

dcnum/feat/queue_event_extractor.py

@@ -257,7 +257,21 @@ class QueueEventExtractor:
                 if self.finalize_extraction.value:
                     # The manager told us that there is nothing more coming.
                     self.logger.debug(
-                        f"Finalizing worker {self} with PID {os.getpid()}")
+                        f"Finalizing worker {self} with PID {os.getpid()}. "
+                        f"{self.event_queue.qsize()} events are still queued.")
+                    # Tell the queue background thread to flush all data to
+                    # the queue. The background thread will quit once it has
+                    # flushed all buffered data to the pipe.
+                    self.event_queue.close()
+                    self.logger.debug(
+                        f"Closed event queue from Process PID {os.getpid()}")
+                    # Join the queue background thread. It blocks until the
+                    # background thread exits, ensuring that all data in the
+                    # buffer has been flushed to the pipe.
+                    self.event_queue.join_thread()
+                    self.logger.debug(
+                        f"Joined event queue background thread from"
+                        f"Process PID {os.getpid()}")
                     break
             else:
                 try:

dcnum/write/queue_collector_thread.py

@@ -183,7 +183,9 @@ class QueueCollectorThread(threading.Thread):
                 continue
 
             if len(cur_nevents) == 0:
-                self.logger.warning("Encountered empty nevents array!")
+                self.logger.info(
+                    "Reached the end of the current dataset (frame "
+                    f"{cur_frame + 1} of {len(self.feat_nevents)}).")
                 break
 
             # We have reached the writer threshold. This means the extractor
@@ -214,6 +216,7 @@ class QueueCollectorThread(threading.Thread):
                 try:
                     idx, events = self.event_queue.get(timeout=.3)
                 except queue.Empty:
+                    # No time.sleep here, because we are using timeout above.
                     continue
                 if cur_frame <= idx < cur_frame + self.write_threshold:
                     stash.add_events(index=idx, events=events)
@@ -253,6 +256,8 @@ class QueueCollectorThread(threading.Thread):
 
             # Write the number of events.
             self.writer_dq.append(("nevents",
+                                   # Get nevents for each event from the
+                                   # frame-based cur_nevents array.
                                    np.array(stash.feat_nevents)[
                                        indices - stash.index_offset]
                                    ))
@@ -261,4 +266,4 @@ class QueueCollectorThread(threading.Thread):
             self.written_frames += stash.num_frames
 
             # Increment current frame index.
-            cur_frame += self.write_threshold
+            cur_frame += len(cur_nevents)

{dcnum-0.11.5.dist-info → dcnum-0.11.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcnum
-Version: 0.11.5
+Version: 0.11.6
 Summary: numerics toolbox for imaging deformability cytometry
 Author: Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>

{dcnum-0.11.5.dist-info → dcnum-0.11.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
 dcnum/__init__.py,sha256=hcawIKS7utYiOyVhOAX9t7K3xYzP1b9862VV0b6qSrQ,74
-dcnum/_version.py,sha256=jiK_H5XzS5m5RjvdJPS7TjMLp9xoI0RwBjbJNoggUgQ,162
+dcnum/_version.py,sha256=3Gew5At6W5w-3RNIQtvr0brz3P-MJACFL9J-IorkINc,162
 dcnum/feat/__init__.py,sha256=0oX765AyfL1BcVt-FI6R_i6x5LgYYLeyO5lkxSauI0Y,299
 dcnum/feat/event_extractor_manager_thread.py,sha256=54eCKbLBkv3U7RLGfqtiMB1CnqHNKcTm9vJE84qu9X8,5681
 dcnum/feat/gate.py,sha256=UEHbj3hkMWNm4tlY8Tz8sOsruhByjJxgO1s-ztQ7WTw,6235
-dcnum/feat/queue_event_extractor.py,sha256=_CwtEcJ-zzChkiPbRHC-WdVNy9sNWOYTzZPd2oEvtrU,11493
+dcnum/feat/queue_event_extractor.py,sha256=8IJZ6_2Snv0qr79hxKF-FPw9tBvTxbaLaZMYQyIZHyc,12375
 dcnum/feat/feat_background/__init__.py,sha256=mL8QJYK6m3hxTqF6Cuosu__Fm5tZUMa-hTgSGcNw9AE,458
 dcnum/feat/feat_background/base.py,sha256=YCkkxgl19dslqmbkbtMv8CH6oUrrdHmoheBlpDQZHa0,5021
 dcnum/feat/feat_background/bg_roll_median.py,sha256=3zwXlNE-CWu30RI8s3Z_ihKUPUVi_cm3yAaXIHlMz7Y,13626
@@ -31,10 +31,10 @@ dcnum/segm/segmenter_gpu.py,sha256=F-6H425eQc9B2-k5PURJziU5uQubdF96GTkoysD2JDM,1
 dcnum/segm/segmenter_manager_thread.py,sha256=xtuk7gnk7xhoRoV_J97rrv7IR3JgeRvVewCDT-chqpk,5172
 dcnum/write/__init__.py,sha256=Oy-ORTyzUUswsaJvd0C6LyXtOgAY0iTIRqFNU9d7M8Y,160
 dcnum/write/deque_writer_thread.py,sha256=UUn5OYxDvckvhLw3llLYu7y8MI7RfsOhdJhMonKKB3k,1625
-dcnum/write/queue_collector_thread.py,sha256=sFOeb2Mt4i8ID_SoABmNDDlVtXqCm9qvdz5PnhE9AK4,11088
+dcnum/write/queue_collector_thread.py,sha256=mO4sSDB9gQW9ttugqAFFEcXlxz2E5QDjQcdZU_NT-BY,11404
 dcnum/write/writer.py,sha256=aUg_F1Ocs_wkV47lJJgkqGa8IRFhHH30NI7q0VxBNUA,3092
-dcnum-0.11.5.dist-info/LICENSE,sha256=YRChA1C8A2E-amJbudwMcbTCZy_HzmeY0hMIvduh1MM,1089
-dcnum-0.11.5.dist-info/METADATA,sha256=sz4TVML0tpLIpLpqWYwErdhbWQcoI3WJH5fvg3zwfBQ,2180
-dcnum-0.11.5.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-dcnum-0.11.5.dist-info/top_level.txt,sha256=Hmh38rgG_MFTVDpUDGuO2HWTSq80P585Het4COQzFTg,6
-dcnum-0.11.5.dist-info/RECORD,,
+dcnum-0.11.6.dist-info/LICENSE,sha256=YRChA1C8A2E-amJbudwMcbTCZy_HzmeY0hMIvduh1MM,1089
+dcnum-0.11.6.dist-info/METADATA,sha256=5nNFMRnm1iAuuK_hX7m0alvm-P_ISS7FEGQrbNKI828,2180
+dcnum-0.11.6.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+dcnum-0.11.6.dist-info/top_level.txt,sha256=Hmh38rgG_MFTVDpUDGuO2HWTSq80P585Het4COQzFTg,6
+dcnum-0.11.6.dist-info/RECORD,,