[MINOR] Refactoring parser/lops methods w/ inconsistent naming scheme Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/2b86a4d9 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/2b86a4d9 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/2b86a4d9
Branch: refs/heads/master Commit: 2b86a4d92e18f3889d693e47b1ff2c6c84d89180 Parents: 3e54f1a Author: Matthias Boehm <[email protected]> Authored: Sat Jun 2 21:49:48 2018 -0700 Committer: Matthias Boehm <[email protected]> Committed: Sat Jun 2 21:49:48 2018 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/lops/Lop.java | 4 ++-- .../java/org/apache/sysml/lops/compile/Dag.java | 20 ++++++++++---------- .../org/apache/sysml/parser/DMLTranslator.java | 12 ++++++------ .../apache/sysml/parser/IfStatementBlock.java | 4 ++-- .../sysml/parser/WhileStatementBlock.java | 4 ++-- .../runtime/matrix/mapred/GMRCtableBuffer.java | 1 - 6 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/2b86a4d9/src/main/java/org/apache/sysml/lops/Lop.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/Lop.java b/src/main/java/org/apache/sysml/lops/Lop.java index 3d6a4f3..ff2d515 100644 --- a/src/main/java/org/apache/sysml/lops/Lop.java +++ b/src/main/java/org/apache/sysml/lops/Lop.java @@ -162,11 +162,11 @@ public abstract class Lop } - public boolean[] get_reachable() { + public boolean[] getReachable() { return reachable; } - public boolean[] create_reachable(int size) { + public boolean[] createReachable(int size) { reachable = new boolean[size]; return reachable; } http://git-wip-us.apache.org/repos/asf/systemml/blob/2b86a4d9/src/main/java/org/apache/sysml/lops/compile/Dag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/lops/compile/Dag.java b/src/main/java/org/apache/sysml/lops/compile/Dag.java index 791fa01..b1d6865 100644 --- a/src/main/java/org/apache/sysml/lops/compile/Dag.java +++ b/src/main/java/org/apache/sysml/lops/compile/Dag.java @@ -316,7 +316,7 @@ public class Dag<N extends Lop> // - store the constructed reachability information in $u$.reachable[] boolean array for (int i = 0; i < nodearray.length; i++) { dagDFS(nodearray[i], nodearray[i] - .create_reachable(nodearray.length)); + .createReachable(nodearray.length)); } // print the nodes in sorted order @@ -1975,8 +1975,8 @@ public class Dag<N extends Lop> if ( queuedNodes.isEmpty() ) return false; - boolean[] nodeMarked = node.get_reachable(); - boolean[] tmpMarked = tmpNode.get_reachable(); + boolean[] nodeMarked = node.getReachable(); + boolean[] tmpMarked = tmpNode.getReachable(); long nodeid = IDMap.get(node.getID()); long tmpid = IDMap.get(tmpNode.getID()); @@ -3585,7 +3585,7 @@ public class Dag<N extends Lop> */ private static boolean isChild(Lop a, Lop b, Map<Long, Integer> IDMap) { int bID = IDMap.get(b.getID()); - return a.get_reachable()[bID]; + return a.getReachable()[bID]; } /** @@ -3628,7 +3628,7 @@ public class Dag<N extends Lop> return false; int index = IDMap.get(node.getID()); for( Lop cnode : childNodes ) { - if ( (type == ExecLocation.INVALID || cnode.getExecLocation() == type) && cnode.get_reachable()[index]) + if ( (type == ExecLocation.INVALID || cnode.getExecLocation() == type) && cnode.getReachable()[index]) return true; } return false; @@ -3639,7 +3639,7 @@ public class Dag<N extends Lop> return null; int index = IDMap.get(node.getID()); for( Lop cnode : childNodes ) { - if ( cnode.getExecLocation() == type && cnode.get_reachable()[index]) + if ( cnode.getExecLocation() == type && cnode.getReachable()[index]) return cnode; } return null; @@ -3659,7 +3659,7 @@ public class Dag<N extends Lop> return null; for( Lop pn : parentNodes ) { int index = IDMap.get( pn.getID() ); - if ( pn.getExecLocation() == type && node.get_reachable()[index]) + if ( pn.getExecLocation() == type && node.getReachable()[index]) return pn; } return null; @@ -3673,7 +3673,7 @@ public class Dag<N extends Lop> int index = IDMap.get(node.getID()); for( Lop n : nodesVec ) { - if ( n.definesMRJob() && n.get_reachable()[index]) + if ( n.definesMRJob() && n.getReachable()[index]) return true; } return false; @@ -3686,7 +3686,7 @@ public class Dag<N extends Lop> int index = IDMap.get(node.getID()); boolean onlyDatagen = true; for( Lop n : nodesVec ) { - if ( n.definesMRJob() && n.get_reachable()[index] && JobType.findJobTypeFromLop(n) != JobType.DATAGEN ) + if ( n.definesMRJob() && n.getReachable()[index] && JobType.findJobTypeFromLop(n) != JobType.DATAGEN ) onlyDatagen = false; } // return true also when there is no lop in "nodesVec" that defines a MR job. @@ -3731,7 +3731,7 @@ public class Dag<N extends Lop> return false; for( Lop pnode : parentNodes ) { int index = IDMap.get( pnode.getID() ); - if ( node.get_reachable()[index]) + if ( node.getReachable()[index]) return true; } return false; http://git-wip-us.apache.org/repos/asf/systemml/blob/2b86a4d9/src/main/java/org/apache/sysml/parser/DMLTranslator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/DMLTranslator.java b/src/main/java/org/apache/sysml/parser/DMLTranslator.java index 47c28a2..3dce294 100644 --- a/src/main/java/org/apache/sysml/parser/DMLTranslator.java +++ b/src/main/java/org/apache/sysml/parser/DMLTranslator.java @@ -334,7 +334,7 @@ public class DMLTranslator // handle while stmt predicate Lop l = wsb.getPredicateHops().constructLops(); - wsb.set_predicateLops(l); + wsb.setPredicateLops(l); ret |= wsb.updatePredicateRecompilationFlag(); } @@ -355,7 +355,7 @@ public class DMLTranslator // handle if stmt predicate Lop l = isb.getPredicateHops().constructLops(); - isb.set_predicateLops(l); + isb.setPredicateLops(l); ret |= isb.updatePredicateRecompilationFlag(); } @@ -460,7 +460,7 @@ public class DMLTranslator // create DAG for loop predicates pred_dag = new Dag<>(); - ((WhileStatementBlock) sb).get_predicateLops().addToDag(pred_dag); + ((WhileStatementBlock) sb).getPredicateLops().addToDag(pred_dag); // create instructions for loop predicates pred_instruct = new ArrayList<>(); @@ -497,7 +497,7 @@ public class DMLTranslator // create DAG for loop predicates pred_dag = new Dag<>(); - ((IfStatementBlock) sb).get_predicateLops().addToDag(pred_dag); + ((IfStatementBlock) sb).getPredicateLops().addToDag(pred_dag); // create instructions for loop predicates pred_instruct = new ArrayList<>(); @@ -1021,7 +1021,7 @@ public class DMLTranslator if (current instanceof WhileStatementBlock) { WhileStatementBlock wstb = (WhileStatementBlock) current; - wstb.get_predicateLops().resetVisitStatus(); + wstb.getPredicateLops().resetVisitStatus(); if (wstb.getNumStatements() > 1) LOG.debug("While statement block has more than 1 stmt"); WhileStatement ws = (WhileStatement)wstb.getStatement(0); @@ -1033,7 +1033,7 @@ public class DMLTranslator if (current instanceof IfStatementBlock) { IfStatementBlock istb = (IfStatementBlock) current; - istb.get_predicateLops().resetVisitStatus(); + istb.getPredicateLops().resetVisitStatus(); if (istb.getNumStatements() > 1) LOG.debug("If statement block has more than 1 stmt"); IfStatement is = (IfStatement)istb.getStatement(0); http://git-wip-us.apache.org/repos/asf/systemml/blob/2b86a4d9/src/main/java/org/apache/sysml/parser/IfStatementBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/IfStatementBlock.java b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java index 74b496d..c49afe9 100644 --- a/src/main/java/org/apache/sysml/parser/IfStatementBlock.java +++ b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java @@ -452,11 +452,11 @@ public class IfStatementBlock extends StatementBlock return _predicateHops; } - public Lop get_predicateLops() { + public Lop getPredicateLops() { return _predicateLops; } - public void set_predicateLops(Lop predicateLops) { + public void setPredicateLops(Lop predicateLops) { _predicateLops = predicateLops; } http://git-wip-us.apache.org/repos/asf/systemml/blob/2b86a4d9/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java b/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java index ab0eeb1..04400de 100644 --- a/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java +++ b/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java @@ -247,11 +247,11 @@ public class WhileStatementBlock extends StatementBlock return _predicateHops; } - public Lop get_predicateLops() { + public Lop getPredicateLops() { return _predicateLops; } - public void set_predicateLops(Lop predicateLops) { + public void setPredicateLops(Lop predicateLops) { _predicateLops = predicateLops; } http://git-wip-us.apache.org/repos/asf/systemml/blob/2b86a4d9/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java index d485fd3..ec6655a 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java @@ -141,7 +141,6 @@ public class GMRCtableBuffer } else if ( _blockBuffer != null ) { MatrixIndexes key=new MatrixIndexes(1,1); - //DataConverter.writeBinaryBlockMatrixToHDFS(path, job, mat, mc.get_rows(), mc.get_cols(), mc.get_rows_per_block(), mc.get_cols_per_block(), replication); for(Entry<Byte, MatrixBlock> ctable: _blockBuffer.entrySet()) { ArrayList<Integer> resultIDs=ReduceBase.getOutputIndexes(ctable.getKey(), _resultIndexes);
