This is an automated email from the ASF dual-hosted git repository. baunsgaard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/systemds.git
commit 148092c8f15278dd6c87fbf0321c4c3902b34a7e Author: baunsgaard <[email protected]> AuthorDate: Mon Dec 13 17:20:49 2021 +0100 [MINOR] Revert processAddRow to not use compressed Previously I added binaryMVRow op for compressed, in processAddRow, but since then extra checks were added to binary row risking removing the output in this special case, to make it consistent for now I revert to use uncompressed operations. --- .../java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java | 9 ++++----- src/test/java/org/apache/sysds/test/TestUtils.java | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java index 922f7ab..65af775 100644 --- a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java +++ b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java @@ -48,7 +48,6 @@ import org.apache.sysds.lops.MapMultChain.ChainType; import org.apache.sysds.runtime.DMLRuntimeException; import org.apache.sysds.runtime.compress.CompressedMatrixBlock; import org.apache.sysds.runtime.compress.DMLCompressionException; -import org.apache.sysds.runtime.compress.lib.CLALibBinaryCellOp; import org.apache.sysds.runtime.controlprogram.caching.CacheBlock; import org.apache.sysds.runtime.controlprogram.caching.MatrixObject.UpdateType; import org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; @@ -3805,10 +3804,10 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab for( MatrixBlock in : inputs ) { if( in.isEmptyBlock(false) ) continue; - if(in instanceof CompressedMatrixBlock){ - in = CLALibBinaryCellOp.binaryMVRow((CompressedMatrixBlock) in,c, null, new BinaryOperator(Plus.getPlusFnObject()), false); - } - else if( in.isInSparseFormat() ) { + if(in instanceof CompressedMatrixBlock) + in = CompressedMatrixBlock.getUncompressed(in, "ProcessAddRow"); + + if( in.isInSparseFormat() ) { SparseBlock a = in.getSparseBlock(); if( a.isEmpty(i) ) continue; LibMatrixMult.vectAdd(a.values(i), c, a.indexes(i), a.pos(i), cix, a.size(i)); diff --git a/src/test/java/org/apache/sysds/test/TestUtils.java b/src/test/java/org/apache/sysds/test/TestUtils.java index 125de36..a0ba5bf 100644 --- a/src/test/java/org/apache/sysds/test/TestUtils.java +++ b/src/test/java/org/apache/sysds/test/TestUtils.java @@ -918,7 +918,7 @@ public class TestUtils continue; if(sba.size(i) != sbe.size(i)) - fail(message+"\nNumber of values are not equal in row: " + i); + fail(message+"\nNumber of values are not equal in row: " + i +"\nactual:"+ sba.get(i) +"\nexpected:"+ sbe.get(i)); final double[] e = sbe.values(i); final double[] a = sba.values(i);
