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/09/18 20:07:01 UTC
systemml git commit: [MINOR] Fix codegen register allocation w/
dynamic buffer mgmt
Repository: systemml
Updated Branches:
refs/heads/master d2894feea -> 0e323ec26
[MINOR] Fix codegen register allocation w/ dynamic buffer mgmt
This patch fixes minor warnings and a bug in determining the minimum
number of vector intermediates in case of dynamic buffer management,
which did not show up before because we're using static buffer
management by default.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/0e323ec2
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/0e323ec2
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/0e323ec2
Branch: refs/heads/master
Commit: 0e323ec26c4e7d3a11b96c83d5d1047a956d44ae
Parents: d2894fe
Author: Matthias Boehm <mb...@gmail.com>
Authored: Tue Sep 18 22:02:03 2018 +0200
Committer: mboehm <mb...@129.27.16.41>
Committed: Tue Sep 18 22:05:49 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/sysml/hops/codegen/template/TemplateUtils.java | 2 +-
.../java/org/apache/sysml/hops/rewrite/HopDagPatternMatcher.java | 1 -
src/main/java/org/apache/sysml/parser/ParForStatementBlock.java | 1 +
.../java/org/apache/sysml/runtime/matrix/data/DenseBlockLDRB.java | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/0e323ec2/src/main/java/org/apache/sysml/hops/codegen/template/TemplateUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateUtils.java b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateUtils.java
index 8b6db37..676a674 100644
--- a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateUtils.java
+++ b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateUtils.java
@@ -531,7 +531,7 @@ public class TemplateUtils
public static void getAllParents(CNode node, Map<Long, Set<Long>> parents) {
for( CNode c : node.getInput() ) {
- if( !parents.containsKey(c) )
+ if( !parents.containsKey(c.getID()) )
parents.put(c.getID(), new HashSet<>());
parents.get(c.getID()).add(node.getID());
getAllParents(c, parents);
http://git-wip-us.apache.org/repos/asf/systemml/blob/0e323ec2/src/main/java/org/apache/sysml/hops/rewrite/HopDagPatternMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/rewrite/HopDagPatternMatcher.java b/src/main/java/org/apache/sysml/hops/rewrite/HopDagPatternMatcher.java
index 7c70b7b..51b1812 100644
--- a/src/main/java/org/apache/sysml/hops/rewrite/HopDagPatternMatcher.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/HopDagPatternMatcher.java
@@ -24,7 +24,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.sysml.api.DMLScript;
import org.apache.sysml.conf.ConfigurationManager;
import org.apache.sysml.hops.AggUnaryOp;
import org.apache.sysml.hops.Hop;
http://git-wip-us.apache.org/repos/asf/systemml/blob/0e323ec2/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
index 6882102..8e8f4fd 100644
--- a/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
@@ -1849,6 +1849,7 @@ public class ParForStatementBlock extends ForStatementBlock
public String toString() {
return _name;
}
+ @SuppressWarnings("unlikely-arg-type")
public static boolean contains(Collection<ResultVar> list, String varName) {
//helper function which is necessary because list.contains checks
//varName.equals(rvar) which always returns false because it not a string
http://git-wip-us.apache.org/repos/asf/systemml/blob/0e323ec2/src/main/java/org/apache/sysml/runtime/matrix/data/DenseBlockLDRB.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/DenseBlockLDRB.java b/src/main/java/org/apache/sysml/runtime/matrix/data/DenseBlockLDRB.java
index 725bdbe..fda1b30 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/DenseBlockLDRB.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/DenseBlockLDRB.java
@@ -59,7 +59,6 @@ public class DenseBlockLDRB extends DenseBlock
reset(rlen, clen, blen, v);
}
- @SuppressWarnings("resource")
private void reset(int rlen, int clen, int blen, double v) {
long llen = (long) rlen * clen;
int numPart = (int)Math.ceil((double)rlen / blen);