From 7da85904070935be7613ed73ee6d96d607f353f0 Mon Sep 17 00:00:00 2001
From: Cristian Goina <goinac@hhmi.org>
Date: Tue, 2 Apr 2024 12:25:04 -0400
Subject: [PATCH] log partition id

---
 .../cmd/CalculateGradientScoresCmd.java       | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/colormipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java b/colormipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java
index 68630834..e7808f2f 100644
--- a/colormipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java
+++ b/colormipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java
@@ -143,12 +143,14 @@ private void calculateAllGradientScores() {
         // partition matches and process all partitions concurrently
         ItemsHandling.partitionCollection(matchesMasksToProcess, args.processingPartitionSize).entrySet().stream().parallel()
                 .forEach(indexedPartition -> {
+                    int partitionId = indexedPartition.getKey(); // unbox it
+                    List<String> partionMasks = indexedPartition.getValue();
                     LOG.info("Start processing partition {} ({} items)",
-                            indexedPartition.getKey(),
-                            indexedPartition.getValue().size());
+                            partitionId,
+                            partionMasks.size());
                     long startProcessingPartitionTime = System.currentTimeMillis();
                     // process each item from the current partition sequentially 
-                    indexedPartition.getValue().forEach(maskIdToProcess -> {
+                    partionMasks.forEach(maskIdToProcess -> {
                         // read all matches for the current mask
                         List<CDMatchEntity<EMNeuronEntity, LMNeuronEntity>> cdMatchesForMask = getCDMatchesForMask(cdMatchesReader, maskIdToProcess);
                         long nPublishedLines = cdMatchesForMask.stream()
@@ -156,7 +158,8 @@ private void calculateAllGradientScores() {
                                 .distinct()
                                 .count();
                         // calculate the grad scores
-                        LOG.info("Calculate grad scores for {} matches ({} lines) of {} - memory usage {}M out of {}M",
+                        LOG.info("Partition {} - calculate grad scores for {} matches ({} lines) of {} - memory usage {}M out of {}M",
+                                partitionId,
                                 cdMatchesForMask.size(), nPublishedLines, maskIdToProcess,
                                 (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / _1M + 1, // round up
                                 (Runtime.getRuntime().totalMemory() / _1M));
@@ -164,20 +167,24 @@ private void calculateAllGradientScores() {
                                 gradScoreAlgorithmProvider,
                                 cdMatchesForMask,
                                 executor);
-                        LOG.info("Completed grad scores for {} matches of {} - memory usage {}M out of {}M",
+                        LOG.info("Partition {} - completed grad scores for {} matches of {} - memory usage {}M out of {}M",
+                                partitionId,
                                 cdMatchesWithGradScores.size(), maskIdToProcess,
                                 (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / _1M + 1, // round up
                                 (Runtime.getRuntime().totalMemory() / _1M));
                         long writtenUpdates = updateCDMatches(cdMatchesWithGradScores);
-                        LOG.info("Updated {} grad scores for {} matches of {}", writtenUpdates, cdMatchesWithGradScores.size(), maskIdToProcess);
+                        LOG.info("Partition {} - updated {} grad scores for {} matches of {}",
+                                partitionId,
+                                writtenUpdates, cdMatchesWithGradScores.size(), maskIdToProcess);
                         if (StringUtils.isNotBlank(args.processingTag)) {
                             long updatesWithProcessedTag = updateProcessingTag(cdMatchesForMask);
-                            LOG.info("Set processing tag {} for {} mips", args.getProcessingTag(), updatesWithProcessedTag);
+                            LOG.info("Partition {} - set processing tag {} for {} mips",
+                                    partitionId, args.getProcessingTag(), updatesWithProcessedTag);
                         }
                     });
                     LOG.info("Finished partition {} ({} items) in {}s - memory usage {}M out of {}M",
-                            indexedPartition.getKey(),
-                            indexedPartition.getValue().size(),
+                            partitionId,
+                            partionMasks.size(),
                             (System.currentTimeMillis() - startProcessingPartitionTime) / 1000.,
                             (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / _1M + 1, // round up
                             (Runtime.getRuntime().totalMemory() / _1M));