Repository: incubator-systemml Updated Branches: refs/heads/master d25ba0d8c -> 5baebe4f7
[SYSTEMML-504] Fix core libmatrixmult (no rhs parallel on ultra-sparse) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/5baebe4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/5baebe4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/5baebe4f Branch: refs/heads/master Commit: 5baebe4f7da5018d7e655630a21ea21a730c04b1 Parents: d25ba0d Author: Matthias Boehm <[email protected]> Authored: Wed Feb 17 00:04:13 2016 -0800 Committer: Matthias Boehm <[email protected]> Committed: Wed Feb 17 10:03:19 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/5baebe4f/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java index 056e58a..52e6b3f 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java @@ -3867,7 +3867,7 @@ public class LibMatrixMult //parallelize over rows in rhs matrix if number of rows in lhs/output is very small return (m1.rlen==1 && LOW_LEVEL_OPTIMIZATION && m2.clen>1 && !(m1.isUltraSparse()||m2.isUltraSparse())) || (m1.rlen<=16 && LOW_LEVEL_OPTIMIZATION && m2.clen>1 && m2.rlen > m1.rlen - && ( !m1.sparse && !m2.sparse || m1.sparse && !m2.sparse ) //dense-dense / sparse/dense + && ( !m1.isUltraSparse() && !m2.sparse ) //dense-dense / sparse/dense && (long)k * 8 * m1.rlen * m2.clen < MEM_OVERHEAD_THRESHOLD ); }
