multithreaded execution, specific ArrayList

saalfeldlab · Aug 16, 2023 · 2484afb · 2484afb
1 parent 829abde
commit 2484afb
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java b/...ava-client/src/main/java/org/janelia/render/client/newsolver/AffineDistributedSolver.java
@@ -3,7 +3,10 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Function;
 
 import org.janelia.render.client.newsolver.blockfactories.ZBlockFactory;
@@ -45,7 +48,7 @@ public static void main( final String[] args ) throws IOException
                     "--stack", "v5_acquire_trimmed",
                     "--targetStack", "v5_acquire_trimmed_test",
 //                    "--minZ", "1234",
-                    "--maxZ", "3001",
+                    "--maxZ", "1001",
 
 //                    "--completeTargetStack",
 //                    "--visualizeResults",
@@ -80,15 +83,30 @@ public static void main( final String[] args ) throws IOException
 		final ArrayList< ? extends AffineAlignBlockWorker<?, ?, ZBlockFactory > > workers =
 				solverSetup.setupSolve( cmdLineSetup.blockModel(), cmdLineSetup.stitchingModel() );
 
-		try
+		final ExecutorService taskExecutor = Executors.newFixedThreadPool( cmdLineSetup.threadsGlobal );
+
+		taskExecutor.submit( () ->
+			workers.parallelStream().forEach( worker ->
+			{
+				try
+				{
+					worker.run();
+				}
+				catch (IOException | ExecutionException | InterruptedException | NoninvertibleModelException e)
+				{
+					e.printStackTrace();
+					System.exit( 1 );
+				}
+			}));
+
+		taskExecutor.shutdown();
+
+		for ( final AffineAlignBlockWorker<?, ?, ZBlockFactory > worker : workers )
 		{
-			workers.get( 0 ).run();
-			System.out.println( workers.get( 0 ).getBlockDataList().size() );
-
-		} catch (IOException | ExecutionException | InterruptedException | NoninvertibleModelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			List<?> blockData = worker.getBlockDataList();
 		}
+
+		System.out.println( workers.get( 0 ).getBlockDataList().size() );
 	}
 
 	public < M extends Model< M > & Affine2D< M >, S extends Model< S > & Affine2D< S > >

diff --git a/render-ws-java-client/src/main/java/org/janelia/render/client/newsolver/solvers/Worker.java b/render-ws-java-client/src/main/java/org/janelia/render/client/newsolver/solvers/Worker.java
@@ -1,7 +1,7 @@
 package org.janelia.render.client.newsolver.solvers;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.ArrayList;
 import java.util.concurrent.ExecutionException;
 
 import org.janelia.render.client.RenderDataClient;
@@ -58,5 +58,5 @@ public Worker(
 	/**
 	 * @return - the result(s) of the solve, multiple ones if they were not connected
 	 */
-	public abstract List< BlockData< M, R, P, F > > getBlockDataList();
+	public abstract ArrayList< BlockData< M, R, P, F > > getBlockDataList();
 }
diff --git a/.../main/java/org/janelia/render/client/newsolver/solvers/affine/AffineAlignBlockWorker.java b/.../main/java/org/janelia/render/client/newsolver/solvers/affine/AffineAlignBlockWorker.java
@@ -86,8 +86,8 @@ public class AffineAlignBlockWorker< M extends Model< M > & Affine2D< M >, S ext
 	//final double blockMaxAllowedError;
 
 	final AffineBlockDataWrapper< M, S, F > inputSolveItem;
-	private List< AffineBlockDataWrapper< M, S, F > > solveItems;
-	private List< BlockData< M, AffineModel2D, FIBSEMAlignmentParameters< M, S >, F > > result;
+	private ArrayList< AffineBlockDataWrapper< M, S, F > > solveItems;
+	private ArrayList< BlockData< M, AffineModel2D, FIBSEMAlignmentParameters< M, S >, F > > result;
 
 	// to filter matches
 	final MatchFilter matchFilter;
@@ -133,7 +133,7 @@ public AffineAlignBlockWorker(
 	}
 
 	@Override
-	public List< BlockData< M, AffineModel2D, FIBSEMAlignmentParameters< M, S >, F > > getBlockDataList()
+	public ArrayList< BlockData< M, AffineModel2D, FIBSEMAlignmentParameters< M, S >, F > > getBlockDataList()
 	{
 		return result;
 	}
@@ -837,7 +837,7 @@ protected void stitchSectionsAndCreateGroupedTiles(
 		}
 	}
 
-	protected List< AffineBlockDataWrapper< M, S, F > > splitSolveItem( final AffineBlockDataWrapper< M, S, F > inputSolveItem, final int startId )
+	protected ArrayList< AffineBlockDataWrapper< M, S, F > > splitSolveItem( final AffineBlockDataWrapper< M, S, F > inputSolveItem, final int startId )
 	{
 		// assigning new id's to the solve items (they collide for now with other workers, fix upon merging)
 		int id = startId + 1;

diff --git a/...nelia/render/client/newsolver/solvers/intensity/AffineIntensityCorrectionBlockWorker.java b/...nelia/render/client/newsolver/solvers/intensity/AffineIntensityCorrectionBlockWorker.java
@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -112,7 +113,7 @@ private void addFilters(final ResolvedTileSpecCollection tileSpecs, final Map<St
 	 * @return - the result(s) of the solve, multiple ones if they were not connected
 	 */
 	@Override
-	public List<BlockData<M, M, FIBSEMIntensityCorrectionParameters<M>, F>> getBlockDataList() {
+	public ArrayList<BlockData<M, M, FIBSEMIntensityCorrectionParameters<M>, F>> getBlockDataList() {
 		return null;
 	}