You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by mb...@apache.org on 2021/09/19 20:48:24 UTC
[systemds] branch master updated: [MINOR] Fix robustness
sparsity-related component tests
This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new f80c238 [MINOR] Fix robustness sparsity-related component tests
f80c238 is described below
commit f80c238cf7a3e4b5baa9bee59f4320b4b3e5a366
Author: Matthias Boehm <mb...@gmail.com>
AuthorDate: Sun Sep 19 22:48:09 2021 +0200
[MINOR] Fix robustness sparsity-related component tests
---
src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java | 2 +-
.../java/org/apache/sysds/test/component/matrix/CumsumprodTest.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
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 a86a878..6c7cb0a 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
@@ -1191,7 +1191,7 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab
denseToSparse(true);
}
- private void denseToSparse(boolean allowCSR)
+ public void denseToSparse(boolean allowCSR)
{
DenseBlock a = getDenseBlock();
diff --git a/src/test/java/org/apache/sysds/test/component/matrix/CumsumprodTest.java b/src/test/java/org/apache/sysds/test/component/matrix/CumsumprodTest.java
index 2aa9fb9..8faf7d1 100644
--- a/src/test/java/org/apache/sysds/test/component/matrix/CumsumprodTest.java
+++ b/src/test/java/org/apache/sysds/test/component/matrix/CumsumprodTest.java
@@ -39,6 +39,8 @@ public class CumsumprodTest {
@Test
public void testCumsumprodSparseMCSR() {
MatrixBlock A = MatrixBlock.randOperations(1000, 2, 0.05, 0, 10, "uniform", 7);
+ if( !A.isInSparseFormat() )
+ A.denseToSparse(false);
A = new MatrixBlock(A, SparseBlock.Type.MCSR, true);
UnaryOperator uop = new UnaryOperator(Builtin.getBuiltinFnObject("ucumk+*"), 1, false);
MatrixBlock B = A.unaryOperations(uop, new MatrixBlock());
@@ -48,6 +50,8 @@ public class CumsumprodTest {
@Test
public void testCumsumprodSparseCSR() {
MatrixBlock A = MatrixBlock.randOperations(1000, 2, 0.05, 0, 10, "uniform", 7);
+ if( !A.isInSparseFormat() )
+ A.denseToSparse(false);
A = new MatrixBlock(A, SparseBlock.Type.CSR, true);
UnaryOperator uop = new UnaryOperator(Builtin.getBuiltinFnObject("ucumk+*"), 1, false);
MatrixBlock B = A.unaryOperations(uop, new MatrixBlock());
@@ -57,6 +61,8 @@ public class CumsumprodTest {
@Test
public void testCumsumprodSparseCOO() {
MatrixBlock A = MatrixBlock.randOperations(1000, 2, 0.05, 0, 10, "uniform", 7);
+ if( !A.isInSparseFormat() )
+ A.denseToSparse(false);
A = new MatrixBlock(A, SparseBlock.Type.COO, true);
UnaryOperator uop = new UnaryOperator(Builtin.getBuiltinFnObject("ucumk+*"), 1, false);
MatrixBlock B = A.unaryOperations(uop, new MatrixBlock());