Address memory leaks

1. Delete normalization factor 2. Clean up FFT plans at end of each decon
clij · Apr 10, 2024 · 4877101 · 4877101 · imagesc-bot · Apr 10, 2024
1 parent 3a41c83
commit 4877101
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/net/haesleinhuepf/clijx/plugins/DeconvolveRichardsonLucyFFT.java b/src/main/java/net/haesleinhuepf/clijx/plugins/DeconvolveRichardsonLucyFFT.java
@@ -202,6 +202,10 @@ private static boolean extendAndDeconvolveRichardsonLucyFFT(CLIJ2 clij2, ClearCL
 		clij2.release(psfExtended);
 		clij2.release(inputExtended);
 		clij2.release(deconvolvedExtended);
+
+		if (nonCirculant) {
+			clij2.release(normalization_factor);
+		}
 
 		return true;
 	}
@@ -251,7 +255,9 @@ public static boolean runRichardsonLucyGPU(CLIJ2 clij2, ClearCLBuffer gpuImg,
 						.getDimensions()[1], gpuImg.getDimensions()[2], longPointerImg,
 				longPointerPSF, longPointerOutput, longPointerNormal, l_context, l_queue,
 				l_device);
-
+
+		clij2fftWrapper.cleanup();
+
 		return true;
 	}
 

diff --git a/src/main/java/net/haesleinhuepf/clijx/plugins/clij2fftWrapper.java b/src/main/java/net/haesleinhuepf/clijx/plugins/clij2fftWrapper.java
@@ -52,7 +52,8 @@ public static native int deconv3d_32f_lp_tv(int iterations, float regularization
 		long l_context, long l_queuee, long l_device);
 
 	public static native int diagnostic();
-
+
+	public static native int cleanup();
 
 	public static void load() {
 		Loader.load();