diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-09 10:08:24 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-09 10:08:24 +0000 |
| commit | 11dfc5a64dd8bbcb7fca7d608a23b513316de6cc (patch) | |
| tree | c951c2e3730ad2a88de39e9d5ca40303e22d2c91 /test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala | |
| parent | f2ecbd04691b1914e2f77c60afc2b296aa6826ae (diff) | |
| download | scala-11dfc5a64dd8bbcb7fca7d608a23b513316de6cc.tar.gz scala-11dfc5a64dd8bbcb7fca7d608a23b513316de6cc.tar.bz2 scala-11dfc5a64dd8bbcb7fca7d608a23b513316de6cc.zip | |
Made parallel collections serializable.
No review.
Diffstat (limited to 'test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala')
| -rw-r--r-- | test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala index 3c1cc47088..29d6ff7580 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala @@ -15,6 +15,7 @@ object MatrixMultiplication extends Companion { class MatrixMultiplication(sz: Int, p: Int, what: String) extends Resettable(sz, p, what, new Cont(_), new Array[Any](_), classOf[Cont]) { def companion = MatrixMultiplication + collection.parallel.tasksupport.environment = forkjoinpool val a = Matrix.unit[Int](sz) val b = Matrix.unit[Int](sz) @@ -39,7 +40,6 @@ extends Resettable(sz, p, what, new Cont(_), new Array[Any](_), classOf[Cont]) { def assignProduct(a: Matrix[T], b: Matrix[T]) = { val range = ParRange(0, n * n, 1, false) - range.tasksupport.environment = forkjoinpool for (i <- range) this(i / n, i % n) = calcProduct(a, b, i / n, i % n); } |