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.6 by jsr166, Sat Feb 16 20:50:29 2013 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.*;
#	Line 11 | Line 11 | import java.util.concurrent.TimeUnit;
11
12		/**
13		* Divide and Conquer matrix multiply demo
14	<	**/
15	<
14	>	*/
15		public class MatrixMultiply {
16
17		/** for time conversion */
#	Line 20 | Line 19 | public class MatrixMultiply {
19
20		static final int DEFAULT_GRANULARITY = 32;
21
22	<	/** The quadrant size at which to stop recursing down
22	>	/**
23	>	* The quadrant size at which to stop recursing down
24		* and instead directly multiply the matrices.
25		* Must be a power of two. Minimum value is 2.
26	<	**/
26	>	*/
27		static int granularity = DEFAULT_GRANULARITY;
28
29		public static void main(String[] args) throws Exception {
#	Line 56 | Line 56 | public class MatrixMultiply {
56		return;
57		}
58
59	<	ForkJoinPool pool = procs == 0? new ForkJoinPool() :
59	>	ForkJoinPool pool = (procs == 0) ? new ForkJoinPool() :
60		new ForkJoinPool(procs);
61		System.out.println("procs: " + pool.getParallelism() +
62		" n: " + n + " granularity: " + granularity +
#	Line 111 | Line 111 | public class MatrixMultiply {
111		*  A21 | A22     B21 | B21     A21*B11 | A21*B21     A22*B21 | A22*B22
112		* </pre>
113		*/
114	–
115	–
114		static class Multiplier extends RecursiveAction {
115		final float[][] A;   // Matrix A
116		final int aRow;      // first row    of current quadrant of A
#	Line 193 | Line 191 | public class MatrixMultiply {
191		* Note that the results are added into C, not just set into C.
192		* This works well here because Java array elements
193		* are created with all zero values.
194	<	**/
197	<
194	>	*/
195		void multiplyStride2() {
196		for (int j = 0; j < size; j+=2) {
197		for (int i = 0; i < size; i +=2) {

Diff Legend

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