-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path2_03_HW1_concurrentMultiply2.patch
More file actions
245 lines (232 loc) · 9.82 KB
/
Copy path2_03_HW1_concurrentMultiply2.patch
File metadata and controls
245 lines (232 loc) · 9.82 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
Index: src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java (date 1508268723000)
+++ src/main/java/ru/javaops/masterjava/matrix/MatrixUtil.java (revision )
@@ -1,134 +1,39 @@
package ru.javaops.masterjava.matrix;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
import java.util.concurrent.*;
-import java.util.stream.Collectors;
import java.util.stream.IntStream;
-/**
- * gkislin
- * 03.07.2016
- */
public class MatrixUtil {
- public static int[][] concurrentMultiply(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException, ExecutionException {
- final int matrixSize = matrixA.length;
- final int[][] matrixC = new int[matrixSize][matrixSize];
-
- class ColumnMultipleResult {
- private final int col;
- private final int[] columnC;
-
- private ColumnMultipleResult(int col, int[] columnC) {
- this.col = col;
- this.columnC = columnC;
- }
- }
-
- final CompletionService<ColumnMultipleResult> completionService = new ExecutorCompletionService<>(executor);
-
- for (int j = 0; j < matrixSize; j++) {
- final int col = j;
- final int[] columnB = new int[matrixSize];
- for (int k = 0; k < matrixSize; k++) {
- columnB[k] = matrixB[k][col];
- }
- completionService.submit(() -> {
- final int[] columnC = new int[matrixSize];
-
- for (int row = 0; row < matrixSize; row++) {
- final int[] rowA = matrixA[row];
- int sum = 0;
- for (int k = 0; k < matrixSize; k++) {
- sum += rowA[k] * columnB[k];
- }
- columnC[row] = sum;
- }
- return new ColumnMultipleResult(col, columnC);
- });
- }
-
- for (int i = 0; i < matrixSize; i++) {
- ColumnMultipleResult res = completionService.take().get();
- for (int k = 0; k < matrixSize; k++) {
- matrixC[k][res.col] = res.columnC[k];
- }
- }
- return matrixC;
- }
-
- public static int[][] concurrentMultiplyCayman(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException, ExecutionException {
- final int matrixSize = matrixA.length;
- final int[][] matrixResult = new int[matrixSize][matrixSize];
- final int threadCount = Runtime.getRuntime().availableProcessors();
- final int maxIndex = matrixSize * matrixSize;
- final int cellsInThread = maxIndex / threadCount;
- final int[][] matrixBFinal = new int[matrixSize][matrixSize];
-
- for (int i = 0; i < matrixSize; i++) {
- for (int j = 0; j < matrixSize; j++) {
- matrixBFinal[i][j] = matrixB[j][i];
- }
- }
-
- Set<Callable<Boolean>> threads = new HashSet<>();
- int fromIndex = 0;
- for (int i = 1; i <= threadCount; i++) {
- final int toIndex = i == threadCount ? maxIndex : fromIndex + cellsInThread;
- final int firstIndexFinal = fromIndex;
- threads.add(() -> {
- for (int j = firstIndexFinal; j < toIndex; j++) {
- final int row = j / matrixSize;
- final int col = j % matrixSize;
-
- int sum = 0;
- for (int k = 0; k < matrixSize; k++) {
- sum += matrixA[row][k] * matrixBFinal[col][k];
- }
- matrixResult[row][col] = sum;
- }
- return true;
- });
- fromIndex = toIndex;
- }
- executor.invokeAll(threads);
- return matrixResult;
- }
-
- public static int[][] concurrentMultiplyDarthVader(int[][] matrixA, int[][] matrixB, ExecutorService executor)
+ public static int[][] concurrentMultiplyStreams(int[][] matrixA, int[][] matrixB, int threadNumber)
throws InterruptedException, ExecutionException {
final int matrixSize = matrixA.length;
final int[][] matrixC = new int[matrixSize][matrixSize];
- List<Callable<Void>> tasks = IntStream.range(0, matrixSize)
- .parallel()
- .mapToObj(i -> new Callable<Void>() {
- private final int[] tempColumn = new int[matrixSize];
+ new ForkJoinPool(threadNumber).submit(
+ () -> IntStream.range(0, matrixSize)
+ .parallel()
+ .forEach(row -> {
+ final int[] rowA = matrixA[row];
+ final int[] rowC = matrixC[row];
- @Override
- public Void call() throws Exception {
- for (int c = 0; c < matrixSize; c++) {
- tempColumn[c] = matrixB[c][i];
- }
- for (int j = 0; j < matrixSize; j++) {
- int row[] = matrixA[j];
- int sum = 0;
- for (int k = 0; k < matrixSize; k++) {
- sum += tempColumn[k] * row[k];
+ for (int idx = 0; idx < matrixSize; idx++) {
+ final int elA = rowA[idx];
+ final int[] rowB = matrixB[idx];
+ for (int col = 0; col < matrixSize; col++) {
+ rowC[col] += elA * rowB[col];
+ }
}
- matrixC[j][i] = sum;
- }
- return null;
- }
- })
- .collect(Collectors.toList());
+ })).get();
- executor.invokeAll(tasks);
return matrixC;
}
- public static int[][] concurrentMultiply2(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException, ExecutionException {
+ public static int[][] concurrentMultiply(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException, ExecutionException {
final int matrixSize = matrixA.length;
final int[][] matrixC = new int[matrixSize][];
@@ -161,7 +66,30 @@
return matrixC;
}
- // Optimized by https://habrahabr.ru/post/114797/
+ public static int[][] concurrentMultiply2(int[][] matrixA, int[][] matrixB, ExecutorService executor) throws InterruptedException {
+ final int matrixSize = matrixA.length;
+ final int[][] matrixC = new int[matrixSize][matrixSize];
+ final CountDownLatch latch = new CountDownLatch(matrixSize);
+
+ for (int row = 0; row < matrixSize; row++) {
+ final int[] rowA = matrixA[row];
+ final int[] rowC = matrixC[row];
+
+ executor.submit(() -> {
+ for (int idx = 0; idx < matrixSize; idx++) {
+ final int elA = rowA[idx];
+ final int[] rowB = matrixB[idx];
+ for (int col = 0; col < matrixSize; col++) {
+ rowC[col] += elA * rowB[col];
+ }
+ }
+ latch.countDown();
+ });
+ }
+ latch.await();
+ return matrixC;
+ }
+
public static int[][] singleThreadMultiplyOpt(int[][] matrixA, int[][] matrixB) {
final int matrixSize = matrixA.length;
final int[][] matrixC = new int[matrixSize][matrixSize];
@@ -183,6 +111,25 @@
}
return matrixC;
}
+
+ public static int[][] singleThreadMultiplyOpt2(int[][] matrixA, int[][] matrixB) {
+ final int matrixSize = matrixA.length;
+ final int[][] matrixC = new int[matrixSize][matrixSize];
+
+ for (int row = 0; row < matrixSize; row++) {
+ final int[] rowA = matrixA[row];
+ final int[] rowC = matrixC[row];
+
+ for (int idx = 0; idx < matrixSize; idx++) {
+ final int elA = rowA[idx];
+ final int[] rowB = matrixB[idx];
+ for (int col = 0; col < matrixSize; col++) {
+ rowC[col] += elA * rowB[col];
+ }
+ }
+ }
+ return matrixC;
+ }
public static int[][] create(int size) {
int[][] matrix = new int[size][size];
Index: src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java (date 1508268723000)
+++ src/main/java/ru/javaops/masterjava/matrix/MainMatrix.java (revision )
@@ -4,10 +4,6 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-/**
- * gkislin
- * 03.07.2016
- */
public class MainMatrix {
private static final int MATRIX_SIZE = 1000;
private static final int THREAD_NUMBER = 10;
@@ -30,7 +26,7 @@
singleThreadSum += duration;
start = System.currentTimeMillis();
- final int[][] concurrentMatrixC = MatrixUtil.concurrentMultiply(matrixA, matrixB, executor);
+ final int[][] concurrentMatrixC = MatrixUtil.concurrentMultiplyStreams(matrixA, matrixB, Runtime.getRuntime().availableProcessors() - 1);
duration = (System.currentTimeMillis() - start) / 1000.;
out("Concurrent thread time, sec: %.3f", duration);
concurrentThreadSum += duration;