ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/loops/MatrixMultiply.java

Comparing jsr166/src/test/loops/MatrixMultiply.java (file contents):
Revision 1.2 by jsr166, Mon Sep 20 20:42:37 2010 UTC vs.
Revision 1.7 by jsr166, Wed Dec 31 16:44:01 2014 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7		//import jsr166y.*;
8		import java.util.concurrent.*;
9	–	import java.util.concurrent.TimeUnit;
9
10
11		/**
12		* Divide and Conquer matrix multiply demo
13	<	**/
15	<
13	>	*/
14		public class MatrixMultiply {
15
16		/** for time conversion */
#	Line 20 | Line 18 | public class MatrixMultiply {
18
19		static final int DEFAULT_GRANULARITY = 32;
20
21	<	/** The quadrant size at which to stop recursing down
21	>	/**
22	>	* The quadrant size at which to stop recursing down
23		* and instead directly multiply the matrices.
24		* Must be a power of two. Minimum value is 2.
25	<	**/
25	>	*/
26		static int granularity = DEFAULT_GRANULARITY;
27
28		public static void main(String[] args) throws Exception {
#	Line 56 | Line 55 | public class MatrixMultiply {
55		return;
56		}
57
58	<	ForkJoinPool pool = procs == 0? new ForkJoinPool() :
58	>	ForkJoinPool pool = (procs == 0) ? new ForkJoinPool() :
59		new ForkJoinPool(procs);
60		System.out.println("procs: " + pool.getParallelism() +
61		" n: " + n + " granularity: " + granularity +
#	Line 111 | Line 110 | public class MatrixMultiply {
110		*  A21 | A22     B21 | B21     A21*B11 | A21*B21     A22*B21 | A22*B22
111		* </pre>
112		*/
114	–
115	–
113		static class Multiplier extends RecursiveAction {
114		final float[][] A;   // Matrix A
115		final int aRow;      // first row    of current quadrant of A
#	Line 193 | Line 190 | public class MatrixMultiply {
190		* Note that the results are added into C, not just set into C.
191		* This works well here because Java array elements
192		* are created with all zero values.
193	<	**/
197	<
193	>	*/
194		void multiplyStride2() {
195		for (int j = 0; j < size; j+=2) {
196		for (int i = 0; i < size; i +=2) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines