set maskImage to null when done with it

JaneliaSciComp · Apr 2, 2024 · 462df69 · 462df69
1 parent 55aeb96
commit 462df69
Showing 1 changed file with 38 additions and 34 deletions.
diff --git a/...search-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java b/...search-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java
@@ -357,40 +357,44 @@ List<CompletableFuture<CDMatchEntity<M, T>>> runGradScoreComputations(M mask,
             LOG.error("No image found for {}", mask);
             return Collections.emptyList();
         }
-        ColorDepthSearchAlgorithm<ShapeMatchScore> gradScoreAlgorithm =
-                gradScoreAlgorithmProvider.createColorDepthQuerySearchAlgorithmWithDefaultParams(
-                        maskImage.getImageArray(),
-                        args.maskThreshold,
-                        args.borderSize);
-        Set<ComputeFileType> requiredVariantTypes = gradScoreAlgorithm.getRequiredTargetVariantTypes();
-        return selectedMatches.stream()
-                .map(cdsMatch -> CompletableFuture.supplyAsync(() -> {
-                            long startCalcTime = System.currentTimeMillis();
-                            T matchedTarget = cdsMatch.getMatchedImage();
-                            NeuronMIP<T> matchedTargetImage = CachedMIPsUtils.loadMIP(matchedTarget, ComputeFileType.InputColorDepthImage);
-                            if (NeuronMIPUtils.hasImageArray(matchedTargetImage)) {
-                                LOG.debug("Calculate grad score between {} and {}",
-                                        cdsMatch.getMaskImage(), cdsMatch.getMatchedImage());
-                                ShapeMatchScore gradScore = gradScoreAlgorithm.calculateMatchingScore(
-                                        matchedTargetImage.getImageArray(),
-                                        NeuronMIPUtils.getImageLoaders(
-                                                matchedTarget,
-                                                requiredVariantTypes,
-                                                (n, cft) -> NeuronMIPUtils.getImageArray(CachedMIPsUtils.loadMIP(n, cft))
-                                        )
-                                );
-                                cdsMatch.setGradientAreaGap(gradScore.getGradientAreaGap());
-                                cdsMatch.setHighExpressionArea(gradScore.getHighExpressionArea());
-                                cdsMatch.setNormalizedScore(gradScore.getNormalizedScore());
-                                LOG.debug("Finished calculating negative score between {} and {} in {}ms",
-                                        cdsMatch.getMaskImage(), cdsMatch.getMatchedImage(), System.currentTimeMillis() - startCalcTime);
-                            } else {
-                                cdsMatch.setGradientAreaGap(-1L);
-                            }
-                            return cdsMatch;
-                        },
-                        executor))
-                .collect(Collectors.toList());
+        try {
+            ColorDepthSearchAlgorithm<ShapeMatchScore> gradScoreAlgorithm =
+                    gradScoreAlgorithmProvider.createColorDepthQuerySearchAlgorithmWithDefaultParams(
+                            maskImage.getImageArray(),
+                            args.maskThreshold,
+                            args.borderSize);
+            Set<ComputeFileType> requiredVariantTypes = gradScoreAlgorithm.getRequiredTargetVariantTypes();
+            return selectedMatches.stream()
+                    .map(cdsMatch -> CompletableFuture.supplyAsync(() -> {
+                                long startCalcTime = System.currentTimeMillis();
+                                T matchedTarget = cdsMatch.getMatchedImage();
+                                NeuronMIP<T> matchedTargetImage = CachedMIPsUtils.loadMIP(matchedTarget, ComputeFileType.InputColorDepthImage);
+                                if (NeuronMIPUtils.hasImageArray(matchedTargetImage)) {
+                                    LOG.debug("Calculate grad score between {} and {}",
+                                            cdsMatch.getMaskImage(), cdsMatch.getMatchedImage());
+                                    ShapeMatchScore gradScore = gradScoreAlgorithm.calculateMatchingScore(
+                                            matchedTargetImage.getImageArray(),
+                                            NeuronMIPUtils.getImageLoaders(
+                                                    matchedTarget,
+                                                    requiredVariantTypes,
+                                                    (n, cft) -> NeuronMIPUtils.getImageArray(CachedMIPsUtils.loadMIP(n, cft))
+                                            )
+                                    );
+                                    cdsMatch.setGradientAreaGap(gradScore.getGradientAreaGap());
+                                    cdsMatch.setHighExpressionArea(gradScore.getHighExpressionArea());
+                                    cdsMatch.setNormalizedScore(gradScore.getNormalizedScore());
+                                    LOG.debug("Finished calculating negative score between {} and {} in {}ms",
+                                            cdsMatch.getMaskImage(), cdsMatch.getMatchedImage(), System.currentTimeMillis() - startCalcTime);
+                                } else {
+                                    cdsMatch.setGradientAreaGap(-1L);
+                                }
+                                return cdsMatch;
+                            },
+                            executor))
+                    .collect(Collectors.toList());
+        } finally {
+            maskImage = null;
+        }
     }
 
     private <M extends AbstractNeuronEntity, T extends AbstractNeuronEntity> void updateNormalizedScores(List<CDMatchEntity<M, T>> cdMatches) {