Merge pull request #145 from PixelgenTechnologies/dev

Release 0.17.1

Author: johandahlberg

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.17.1] - 2024-05-27
+
+### Fixed
+
+* Poor performance when writing many small layouts to pxl file (~45x speed-up). This should almost only
+  impact test scenarios, since most real components should be large enough for this not to be an issue.
+
 ## [0.17.0] - 2024-05-23
 
 ### Added

src/pixelator/pixeldataset/datastores.py

@@ -256,10 +256,13 @@ def read_precomputed_layouts(
     def write_precomputed_layouts(
         self,
         layouts: PreComputedLayouts,
+        collapse_to_single_dataframe: bool = False,
     ) -> None:
         """Write pre-computed layouts to the data store.
 
         :param layouts: The pre-computed layouts to write.
+        :param collapse_to_single_dataframe: Whether to collapse the layouts into
+                                             a single dataframe before writing.
         """
         ...
 
@@ -454,6 +457,7 @@ def write_colocalization(self, colocalization: pd.DataFrame) -> None:
     def write_precomputed_layouts(
         self,
         layouts: Optional[PreComputedLayouts],
+        collapse_to_single_dataframe: bool = False,
     ) -> None:
         """Write pre-computed layouts to the data store."""
         if layouts is None:
@@ -463,15 +467,27 @@ def write_precomputed_layouts(
         self._check_if_writeable(self.LAYOUTS_KEY)
 
         logger.debug("Starting to write layouts...")
-
-        for idx, layouts_to_write in enumerate(layouts.component_iterator()):
-            if idx % 100 == 0:
-                logger.debug("Writing layouts...")
+        # This option is in place to allow collecting all the layouts into
+        # as single dataframe before writing (they will still be written into
+        # partitions), but this is much faster than writing them one by one
+        # for scenarios with many very small layouts.
+        if collapse_to_single_dataframe:
+            logger.debug("Writing from a single dataframe...")
             self.write_dataframe(
-                layouts_to_write,
+                layouts.to_df(),
                 self.LAYOUTS_KEY,
                 partitioning=PreComputedLayouts.DEFAULT_PARTITIONING,
             )
+        else:
+            logger.debug("Writing by iterating components...")
+            for idx, layouts_to_write in enumerate(layouts.component_iterator()):
+                if idx % 100 == 0:
+                    logger.debug("Writing layouts...")
+                self.write_dataframe(
+                    layouts_to_write,
+                    self.LAYOUTS_KEY,
+                    partitioning=PreComputedLayouts.DEFAULT_PARTITIONING,
+                )
 
         logger.debug("Completed writing layouts...")
 
@@ -506,7 +522,16 @@ def save(self, dataset: PixelDataset, force_overwrite: bool = False) -> None:
 
         if dataset.precomputed_layouts is not None:
             logger.debug("Writing precomputed layouts")
-            self.write_precomputed_layouts(dataset.precomputed_layouts)
+            # This speeds things up massively when you have many, very small
+            # layouts, like we do in some test data.
+            try:
+                write_layouts_in_one_go = dataset.adata.obs["vertices"].sum() < 100_000
+            except KeyError:
+                write_layouts_in_one_go = False
+            self.write_precomputed_layouts(
+                dataset.precomputed_layouts,
+                collapse_to_single_dataframe=write_layouts_in_one_go,
+            )
 
         logger.debug("PixelDataset saved to %s", self.path)
 
@@ -560,6 +585,7 @@ def read_dataframe_lazy(self, key: str) -> Optional[pl.LazyFrame]:
     def write_precomputed_layouts(
         self,
         layouts: Optional[PreComputedLayouts],
+        collapse_to_single_dataframe: bool = False,
     ) -> None:
         """Write pre-computed layouts to the data store (NB: Not implemented!)."""
         raise NotImplementedError(