You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2018/04/21 01:28:04 UTC
[1/3] systemml git commit: [HOTFIX][SYSTEMML-2259] Fix correctness
new dense-sparse MV mult ops
Repository: systemml
Updated Branches:
refs/heads/master 4c7640b87 -> 54c52ab3c
[HOTFIX][SYSTEMML-2259] Fix correctness new dense-sparse MV mult ops
This patch fixes the newly introduced dense-sparse MV mult special case,
for inputs where the dense input has a rows of varing number of
non-zeros (instead of a mix of empty and full dense rows).
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/a1513d3a
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/a1513d3a
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/a1513d3a
Branch: refs/heads/master
Commit: a1513d3a1f1e11c89e6dc3644df8fa29769e382e
Parents: 4c7640b
Author: Matthias Boehm <mb...@gmail.com>
Authored: Fri Apr 20 17:19:03 2018 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Fri Apr 20 17:19:03 2018 -0700
----------------------------------------------------------------------
.../org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/a1513d3a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
index 79b4c36..8310e72 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
@@ -470,8 +470,10 @@ public class LibMatrixBincell
double bval = b[i];
if( bval != 0 ) {
for( int j=0; j<clen; j++ ) {
+ double aval = a[aix+j];
+ if( aval == 0 ) continue;
indexes[pos] = j;
- vals[pos] = a[aix+j] * bval;
+ vals[pos] = aval * bval;
pos++;
}
}
[3/3] systemml git commit: [SYSTEMML-2265] Fix correctness sparse
aggregate w/ sparse-unsafe ops
Posted by mb...@apache.org.
[SYSTEMML-2265] Fix correctness sparse aggregate w/ sparse-unsafe ops
The recently modified sparse block estimates (see SYSTEMML-2263) changed
the used data format for a number of tests, which revealed long existing
but hidden issues. This particular patch fixes an issue of incorrect
results for sparse aggregate operations with sparse-unsafe operations
such as mean and var over sparse inputs.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/54c52ab3
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/54c52ab3
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/54c52ab3
Branch: refs/heads/master
Commit: 54c52ab3c4b8c1d176a17ada497209a8477077f2
Parents: f3b8b88
Author: Matthias Boehm <mb...@gmail.com>
Authored: Fri Apr 20 18:24:23 2018 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Fri Apr 20 18:24:23 2018 -0700
----------------------------------------------------------------------
.../sysml/runtime/codegen/SpoofOperator.java | 8 ++--
.../sysml/runtime/matrix/data/LibMatrixAgg.java | 46 ++++++++++----------
2 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/54c52ab3/src/main/java/org/apache/sysml/runtime/codegen/SpoofOperator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/codegen/SpoofOperator.java b/src/main/java/org/apache/sysml/runtime/codegen/SpoofOperator.java
index f6b225d..4b75b2e 100644
--- a/src/main/java/org/apache/sysml/runtime/codegen/SpoofOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/codegen/SpoofOperator.java
@@ -301,10 +301,10 @@ public abstract class SpoofOperator implements Serializable
//move to next row if necessary
if( rowIndex > currRowIndex ) {
currRowIndex = rowIndex;
- currColPos = mdat.getSparseBlock().pos(currRowIndex);
- currLen = mdat.getSparseBlock().size(currRowIndex) + currColPos;
- indexes = mdat.getSparseBlock().indexes(currRowIndex);
- values = mdat.getSparseBlock().values(currRowIndex);
+ currColPos = sblock.pos(currRowIndex);
+ currLen = sblock.size(currRowIndex) + currColPos;
+ indexes = sblock.indexes(currRowIndex);
+ values = sblock.values(currRowIndex);
}
//move to next colpos if necessary
while( currColPos < currLen && indexes[currColPos]<colIndex )
http://git-wip-us.apache.org/repos/asf/systemml/blob/54c52ab3/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
index 6d2b768..8de89c3 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
@@ -29,6 +29,8 @@ import java.util.concurrent.Future;
import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.codegen.SpoofOperator.SideInput;
+import org.apache.sysml.runtime.codegen.SpoofOperator.SideInputSparseCell;
import org.apache.sysml.runtime.controlprogram.caching.MatrixObject.UpdateType;
import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
import org.apache.sysml.runtime.functionobjects.Builtin;
@@ -897,37 +899,35 @@ public class LibMatrixAgg
cmValues[i][j] = new CM_COV_Object();
//column vector or matrix
- if( target.sparse ) //SPARSE target
- {
+ if( target.sparse ) { //SPARSE target
+ //note: we create a sparse side input for a linear scan (w/o binary search)
+ //over the sparse representation despite the sparse-unsafe operations
SparseBlock a = target.sparseBlock;
+ SideInputSparseCell sa = new SideInputSparseCell(
+ new SideInput(null, target, target.clen));
- for( int i=0; i < groups.getNumRows(); i++ )
- {
+ for( int i=0; i < groups.getNumRows(); i++ ) {
int g = (int) groups.quickGetValue(i, 0);
- if ( g > numGroups )
+ if( g > numGroups ) continue;
+
+ //sparse unsafe correction empty row
+ if( a.isEmpty(i) ){
+ w = (weights != null) ? weights.quickGetValue(i,0) : w;
+ for( int j=cl; j<cu; j++ )
+ cmFn.execute(cmValues[g-1][j-cl], 0, w);
continue;
+ }
- if( !a.isEmpty(i) )
- {
- int pos = a.pos(i);
- int len = a.size(i);
- int[] aix = a.indexes(i);
- double[] avals = a.values(i);
- int j = (cl==0) ? 0 : a.posFIndexGTE(i,cl);
- j = (j >= 0) ? pos+j : pos+len;
-
- for( ; j<pos+len && aix[j]<cu; j++ ) //for each nnz
- {
- if ( weights != null )
- w = weights.quickGetValue(i, 0);
- cmFn.execute(cmValues[g-1][aix[j]-cl], avals[j], w);
- }
- //TODO sparse unsafe correction
+ //process non-empty row
+ for( int j=cl; j<cu; j++ ) {
+ double d = sa.getValue(i, j);
+ if ( weights != null )
+ w = weights.quickGetValue(i,0);
+ cmFn.execute(cmValues[g-1][j-cl], d, w);
}
}
}
- else //DENSE target
- {
+ else { //DENSE target
DenseBlock a = target.getDenseBlock();
for( int i=0; i < groups.getNumRows(); i++ ) {
int g = (int) groups.quickGetValue(i, 0);
[2/3] systemml git commit: [SYSTEMML-2264] Fix correctness sparse
colMins w/ dense cols of neg vals
Posted by mb...@apache.org.
[SYSTEMML-2264] Fix correctness sparse colMins w/ dense cols of neg vals
The recently modified sparse block estimates (see SYSTEMML-2263) changes
various the format for a number of tests, which revealed long existing
but hidden issues. This particular patch fixes special cases of sparse
colMins operations with dense columns containing negative values, which
so far gave incorrect results of 0 in case of multi-threaded operations.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/f3b8b88f
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/f3b8b88f
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/f3b8b88f
Branch: refs/heads/master
Commit: f3b8b88fefc8b0f9bb730717bcd9ff7a6ae7780d
Parents: a1513d3
Author: Matthias Boehm <mb...@gmail.com>
Authored: Fri Apr 20 17:19:21 2018 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Fri Apr 20 17:19:21 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/f3b8b88f/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
index 5d66ff8..6d2b768 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
@@ -2519,7 +2519,7 @@ public class LibMatrixAgg
// in order to know if for example a colMax of -8 is true or need
// to be replaced with a 0 because there was a missing nonzero.
for( int i=0; i<n; i++ )
- if( cnt[i] < m ) //no dense column
+ if( cnt[i] < ru-rl ) //no dense column
c[i] = builtin.execute(c[i], 0);
}