dcnum 0.11.4__tar.gz → 0.11.6__tar.gz

{dcnum-0.11.4 → dcnum-0.11.6}/CHANGELOG

@@ -1,3 +1,7 @@
+0.11.6
+ - enh: add more debugging messages for feature extraction workers
+0.11.5
+ - setup: fix bad package discovery
 0.11.4
  - fix: properly handle empty logs
 0.11.3

{dcnum-0.11.4 → dcnum-0.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcnum
-Version: 0.11.4
+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.4 → dcnum-0.11.6}/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.4'
-__version_tuple__ = version_tuple = (0, 11, 4)
+__version__ = version = '0.11.6'
+__version_tuple__ = version_tuple = (0, 11, 6)

{dcnum-0.11.4 → dcnum-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-0.11.4 → dcnum-0.11.6}/dcnum/write/queue_collector_thread.py

@@ -183,12 +183,14 @@ 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
             # has analyzed at least `write_threshold` frames (not events).
-            self.logger.debug(f"Current frane: {cur_frame}")
+            self.logger.debug(f"Current frame: {cur_frame}")
 
             # Create an event stash
             stash = EventStash(
@@ -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.4 → dcnum-0.11.6}/dcnum.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcnum
-Version: 0.11.4
+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.6/dcnum.egg-info/top_level.txt

@@ -0,0 +1 @@
+dcnum

{dcnum-0.11.4 → dcnum-0.11.6}/pyproject.toml

@@ -40,9 +40,6 @@ tracker = "https://github.com/DC-Analysis/dcnum/issues"
 documentation = "https://dcnum.readthedocs.io/en/stable/"
 changelog = "https://dcnum.readthedocs.io/en/stable/sec_changelog.html"
 
-[tool.setuptools.packages]
-find = {}
-
 [tool.setuptools_scm]
 write_to = "dcnum/_version.py"
 version_scheme = "post-release"

dcnum-0.11.4/dcnum.egg-info/top_level.txt

@@ -1,4 +0,0 @@
-dcnum
-dist
-docs
-tests