You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/12/16 19:35:21 UTC
[3/3] incubator-systemml git commit: [SYSTEMML-1153] Remove unused
methods from project
[SYSTEMML-1153] Remove unused methods from project
Remove selected unreferenced methods, which removes ~3300 LOC from 98 files.
Closes #316.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/1ab2d7e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/1ab2d7e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/1ab2d7e6
Branch: refs/heads/master
Commit: 1ab2d7e68344f7fb30933eacd8520261e1c6c5b0
Parents: 6ffb6ac
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Fri Dec 16 11:27:52 2016 -0800
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Fri Dec 16 11:27:52 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/sysml/api/DMLScript.java | 19 --
.../api/monitoring/SparkMonitoringUtil.java | 15 +-
.../java/org/apache/sysml/conf/DMLConfig.java | 54 +----
.../sysml/debug/DMLBreakpointManager.java | 86 +-------
.../sysml/debug/DMLDebuggerInterface.java | 6 -
.../java/org/apache/sysml/debug/DebugState.java | 14 +-
.../org/apache/sysml/hops/ConvolutionOp.java | 55 +----
src/main/java/org/apache/sysml/hops/Hop.java | 125 +----------
.../org/apache/sysml/hops/OptimizerUtils.java | 44 +---
.../sysml/hops/cost/CostEstimationWrapper.java | 20 --
.../apache/sysml/hops/cost/CostEstimator.java | 25 +--
.../sysml/hops/recompile/RecompileStatus.java | 17 +-
.../apache/sysml/hops/recompile/Recompiler.java | 7 +-
.../sysml/hops/rewrite/HopRewriteUtils.java | 27 +--
src/main/java/org/apache/sysml/lops/Lop.java | 4 -
.../org/apache/sysml/lops/PartialAggregate.java | 7 +-
.../java/org/apache/sysml/lops/Ternary.java | 15 --
.../java/org/apache/sysml/lops/Transform.java | 26 ---
.../java/org/apache/sysml/lops/compile/Dag.java | 8 +-
.../org/apache/sysml/lops/compile/JobType.java | 16 --
.../sysml/parser/ConditionalPredicate.java | 19 +-
.../org/apache/sysml/parser/DMLProgram.java | 10 +-
.../org/apache/sysml/parser/DMLTranslator.java | 9 -
.../org/apache/sysml/parser/DataIdentifier.java | 33 ---
.../apache/sysml/parser/FunctionStatement.java | 22 +-
.../org/apache/sysml/parser/IfStatement.java | 32 +--
.../apache/sysml/parser/IndexedIdentifier.java | 29 ---
.../sysml/parser/LiveVariableAnalysis.java | 5 -
.../apache/sysml/parser/OutputStatement.java | 4 -
.../ParameterizedBuiltinFunctionExpression.java | 6 +-
.../java/org/apache/sysml/parser/Statement.java | 20 --
.../org/apache/sysml/parser/StatementBlock.java | 16 +-
.../org/apache/sysml/parser/VariableSet.java | 7 +-
.../parser/common/CommonSyntacticValidator.java | 17 --
.../parser/common/CustomErrorListener.java | 8 -
.../sysml/runtime/compress/ColGroupBitmap.java | 14 +-
.../runtime/compress/PlanningBinPacker.java | 59 -----
.../estim/CompressedSizeEstimatorSample.java | 4 -
.../runtime/compress/utils/ConverterUtils.java | 16 --
.../compress/utils/LinearAlgebraUtils.java | 164 --------------
.../ExternalFunctionProgramBlock.java | 25 ---
.../runtime/controlprogram/ForProgramBlock.java | 6 +-
.../controlprogram/LocalVariableMap.java | 44 +---
.../runtime/controlprogram/ProgramBlock.java | 10 +-
.../controlprogram/WhileProgramBlock.java | 6 +-
.../controlprogram/caching/CacheStatistics.java | 19 +-
.../context/ExecutionContext.java | 26 +--
.../context/SparkExecutionContext.java | 12 --
.../controlprogram/parfor/LocalParWorker.java | 10 +-
.../controlprogram/parfor/LocalTaskQueue.java | 12 --
.../controlprogram/parfor/ParWorker.java | 6 -
.../controlprogram/parfor/ProgramConverter.java | 17 --
.../runtime/controlprogram/parfor/Task.java | 18 --
.../parfor/opt/CostEstimator.java | 55 -----
.../parfor/opt/CostEstimatorRuntime.java | 13 --
.../controlprogram/parfor/opt/OptNode.java | 57 +----
.../parfor/opt/OptTreeConverter.java | 119 -----------
.../parfor/opt/OptTreePlanMappingRuntime.java | 11 +-
.../parfor/opt/OptimizationWrapper.java | 141 +-----------
.../controlprogram/parfor/opt/Optimizer.java | 60 ------
.../parfor/opt/OptimizerRuleBased.java | 44 +---
.../controlprogram/parfor/opt/PerfTestTool.java | 95 +--------
.../parfor/opt/ProgramRecompiler.java | 161 +-------------
.../parfor/stat/InfrastructureAnalyzer.java | 29 +--
.../parfor/stat/StatisticMonitor.java | 12 +-
.../controlprogram/parfor/util/IDHandler.java | 32 ---
.../sysml/runtime/functionobjects/Builtin.java | 44 +---
.../functionobjects/OffsetColumnIndex.java | 7 +-
.../runtime/instructions/InstructionUtils.java | 24 +--
.../runtime/instructions/MRJobInstruction.java | 213 -------------------
.../runtime/instructions/cp/CPOperand.java | 17 +-
.../instructions/cp/VariableCPInstruction.java | 20 --
...ReturnParameterizedBuiltinSPInstruction.java | 4 -
.../instructions/spark/UnarySPInstruction.java | 10 -
.../spark/utils/RDDAggregateUtils.java | 106 ---------
.../instructions/spark/utils/SparkUtils.java | 202 +-----------------
.../sysml/runtime/io/FrameReaderFactory.java | 14 --
.../apache/sysml/runtime/io/WriterTextCSV.java | 86 --------
.../runtime/matrix/data/LibMatrixReorg.java | 17 +-
.../runtime/matrix/data/MatrixIndexes.java | 11 -
.../matrix/data/OperationsOnMatrixValues.java | 8 +-
.../runtime/matrix/data/SparseBlockFactory.java | 4 -
.../sysml/runtime/matrix/data/SparseRow.java | 19 +-
.../runtime/matrix/data/TaggedMatrixValue.java | 8 -
.../matrix/data/hadoopfix/MultipleInputs.java | 24 ---
.../matrix/mapred/FrameReblockBuffer.java | 76 -------
.../runtime/matrix/mapred/MMCJMRInputCache.java | 7 -
.../matrix/mapred/MRJobConfiguration.java | 86 +-------
.../sysml/runtime/matrix/mapred/MapperBase.java | 27 ---
.../matrix/mapred/PartialAggregator.java | 7 -
.../matrix/sort/CompactOutputFormat.java | 10 -
.../apache/sysml/runtime/transform/TfUtils.java | 8 -
.../sysml/runtime/util/LocalFileUtils.java | 43 +---
.../sysml/runtime/util/MapReduceTool.java | 59 -----
.../apache/sysml/runtime/util/RandNPair.java | 4 -
.../sysml/runtime/util/UniformPRNGenerator.java | 4 -
.../sysml/runtime/util/UtilFunctions.java | 75 +------
.../sysml/yarn/ropt/YarnOptimizerUtils.java | 40 ----
98 files changed, 76 insertions(+), 3332 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/api/DMLScript.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/DMLScript.java b/src/main/java/org/apache/sysml/api/DMLScript.java
index 3df1320..bc6bacb 100644
--- a/src/main/java/org/apache/sysml/api/DMLScript.java
+++ b/src/main/java/org/apache/sysml/api/DMLScript.java
@@ -227,25 +227,6 @@ public class DMLScript
}
}
- public static boolean executeScript( String[] args )
- throws DMLException
- {
- Configuration conf = new Configuration(ConfigurationManager.getCachedJobConf());
- return executeScript( conf, args );
- }
-
- public static String executeScript( Configuration conf, String[] args, boolean suppress)
- throws DMLException
- {
- _suppressPrint2Stdout = suppress;
- try {
- boolean ret = executeScript(conf, args);
- return Boolean.toString(ret);
- } catch(DMLScriptException e) {
- return e.getMessage();
- }
- }
-
/**
* Single entry point for all public invocation alternatives (e.g.,
* main, executeScript, JaqlUdf etc)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java b/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
index 82a0fa2..42a1f32 100644
--- a/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
+++ b/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
@@ -263,20 +263,7 @@ public class SparkMonitoringUtil {
}
}
-
- /**
- * Useful to avoid passing large String through Py4J
- * @param fileName the file name
- * @throws DMLRuntimeException if DMLRuntimeException occurs
- * @throws IOException if IOException occurs
- */
- public void saveRuntimeInfoInJSONFormat(String fileName) throws DMLRuntimeException, IOException {
- String json = getRuntimeInfoInJSONFormat();
- BufferedWriter bw = new BufferedWriter(new FileWriter(fileName));
- bw.write(json);
- bw.close();
- }
-
+
public String getRuntimeInfoInJSONFormat() throws DMLRuntimeException, IOException {
StringBuilder retVal = new StringBuilder("{\n");
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/conf/DMLConfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/conf/DMLConfig.java b/src/main/java/org/apache/sysml/conf/DMLConfig.java
index 4a70313..ec3a30d 100644
--- a/src/main/java/org/apache/sysml/conf/DMLConfig.java
+++ b/src/main/java/org/apache/sysml/conf/DMLConfig.java
@@ -145,41 +145,7 @@ public class DMLConfig
{
_xmlRoot = root;
}
-
- public void merge(DMLConfig otherConfig)
- throws ParseException
- {
- if (otherConfig == null)
- return;
-
- try {
- // for each element in otherConfig, either overwrite existing value OR add to defaultConfig
- NodeList otherConfigNodeList = otherConfig._xmlRoot.getChildNodes();
- if (otherConfigNodeList != null && otherConfigNodeList.getLength() > 0){
- for (int i=0; i<otherConfigNodeList.getLength(); i++){
- org.w3c.dom.Node optionalConfigNode = otherConfigNodeList.item(i);
-
- if (optionalConfigNode.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE){
-
- // try to find optional config node in default config node
- String paramName = optionalConfigNode.getNodeName();
- String paramValue = ((Element)optionalConfigNode).getFirstChild().getNodeValue();
-
- if (_xmlRoot.getElementsByTagName(paramName) != null)
- LOG.info("Updating " + paramName + " with value " + paramValue);
- else
- LOG.info("Defining new attribute" + paramName + " with value " + paramValue);
- DMLConfig.setTextValue(_xmlRoot, paramName, paramValue);
- }
-
- }
- } // end if (otherConfigNodeList != null && otherConfigNodeList.getLength() > 0){
- } catch (Exception e){
- LOG.error("Failed in merge default config file with optional config file",e);
- throw new ParseException("ERROR: error merging config file " + otherConfig._fileName + " with " + _fileName);
- }
- }
-
+
/**
* Method to parse configuration
* @throws ParserConfigurationException
@@ -458,23 +424,7 @@ public class DMLConfig
elem.getFirstChild().setNodeValue(String.valueOf(mrMem));
}
}
-
- @SuppressWarnings("deprecation")
- public void makeQualifiedScratchSpacePath()
- throws IOException
- {
- NodeList list2 = _xmlRoot.getElementsByTagName(SCRATCH_SPACE);
- if (list2 != null && list2.getLength() > 0) {
- Element elem = (Element) list2.item(0);
-
- FileSystem fs = FileSystem.get(ConfigurationManager.getCachedJobConf());
- String fname = elem.getFirstChild().getNodeValue();
- Path path = new Path(fname).makeQualified(fs);
-
- elem.getFirstChild().setNodeValue(path.toString());
- }
- }
-
+
public static String getDefaultTextValue( String key ) {
return _defaultVals.get( key );
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java b/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
index 4151398..2ec3744 100644
--- a/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
+++ b/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
@@ -46,20 +46,6 @@ public class DMLBreakpointManager {
}
/**
- * Returns size of active DML breakpoints
- * @return size Size of active breakpoints
- */
- public static int getBreakpointsSize()
- {
- int size = 0;
- for (Integer lineNumber : breakpoints.keySet()) {
- if (breakpoints.get(lineNumber).getBPInstructionStatus() != BPINSTRUCTION_STATUS.INVISIBLE)
- size++;
- }
- return size;
- }
-
- /**
* Returns breakpoint instruction at a particular line number (if any)
* @param lineNumber Location of breakpoint
* @return Breakpoint instruction at indicated line number (if any)
@@ -71,52 +57,6 @@ public class DMLBreakpointManager {
}
/**
- * Returns breakpoint instruction with given breakpoint id
- * @param location Breakpoint id
- * @return Breakpoint instruction at indicated id
- */
- public static BreakPointInstruction getBreakpointAtIndex(int location) {
- int index = 1;
- for (Integer lineNumber : breakpoints.keySet()) {
- if (index++ == location) {
- return breakpoints.get(lineNumber);
- }
- }
- return null;
- }
-
- /**
- * Returns breakpoint line number with given breakpoint id
- * @param location Breakpoint id
- * @return Breakpoint instruction line number (-1 if not found)
- */
- public static int getBreakpointLineNumber(int location) {
- int index = 1;
- for (Integer lineNumber : breakpoints.keySet()) {
- if (index++ == location) {
- return lineNumber;
- }
- }
- return -1;
- }
-
- /**
- * Returns breakpoint identifier with given line number
- * @param lineNum Line number Location of breakpoint in DML script
- * @return Breakpoint id within all breakpoints (-1 if not found)
- */
- public static int getBreakpointID(int lineNum) {
- int bpID=1;
- for (Integer lineNumber : breakpoints.keySet()) {
- if (lineNum == lineNumber) {
- return bpID;
- }
- bpID++;
- }
- return -1;
- }
-
- /**
* Insert a breakpoint instruction into list of existing breakpoints.
*
* @param breakpoint the breakpoint instruction
@@ -156,20 +96,7 @@ public class DMLBreakpointManager {
System.out.format("Breakpoint updated at %s, line %d.\n", breakpoints.get(lineNumber).getBPInstructionLocation(), lineNumber);
}
}
-
- /**
- * Updates breakpoint status for a given breakpoint id
- * @param location Breakpoint identifier
- * @param status Current breakpoint status
- */
- public static void updateBreakpointID(int location, BPINSTRUCTION_STATUS status) {
- int lineNumber = getBreakpointLineNumber(location);
- if (lineNumber != -1) {
- breakpoints.get(lineNumber).setBPInstructionStatus(status);
- System.out.format("Breakpoint updated at %s, line %d.\n", breakpoints.get(lineNumber).getBPInstructionLocation(), lineNumber);
- }
- }
-
+
/**
* Removes breakpoint instruction at given line number
* @param lineNumber Location for inserting breakpoint
@@ -181,15 +108,4 @@ public class DMLBreakpointManager {
System.out.format("Breakpoint deleted at %s, line %d.\n", breakpoints.get(lineNumber).getBPInstructionLocation(), lineNumber);
}
}
-
- /**
- * Removes breakpoint instruction at given location
- * @param location Breakpoint instruction id
- * @param status Current breakpoint status
- */
- public static void removeBreakpointIndex(int location, BPINSTRUCTION_STATUS status) {
- int lineNumber = getBreakpointLineNumber(location);
- if (lineNumber != -1)
- breakpoints.get(lineNumber).setBPInstructionStatus(status);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
index f5f22cd..0750562 100644
--- a/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
@@ -179,12 +179,6 @@ public class DMLDebuggerInterface
System.out.flush();
}
- public void writeToStandardError(String errStr) {
- System.err.print(errStr);
- System.err.flush();
- }
-
-
public void writelnToStandardError(String errStr) {
System.err.println(errStr);
System.err.flush();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/debug/DebugState.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DebugState.java b/src/main/java/org/apache/sysml/debug/DebugState.java
index 80b14e7..0294d7f 100644
--- a/src/main/java/org/apache/sysml/debug/DebugState.java
+++ b/src/main/java/org/apache/sysml/debug/DebugState.java
@@ -154,19 +154,7 @@ public class DebugState
return null;
return callStack.pop();
}
-
- /**
- * Get stack frame at indicated location (if any)
- * @param location Frame position in call stack
- * @return Stack frame at specified location
- */
- protected DMLFrame getFrame(int location) {
- if (location < 0 || location >= callStack.size()) {
- return null;
- }
- return callStack.elementAt(location);
- }
-
+
/**
* Get current call stack (if any)
* @return Stack callStack
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
index 1477139..a00feb7 100644
--- a/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
+++ b/src/main/java/org/apache/sysml/hops/ConvolutionOp.java
@@ -119,51 +119,7 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop
public void setOp(ConvOp op) {
this.op = op;
}
-
- public static Lop constructFusedConvolutionLops(ExecType et,
- ArrayList<Hop> inputs,
- ConvOp op, ConvolutionOp primaryOp,
- long rlen, long clen) throws HopsException, LopsException {
- int expectedNumInputs = 13;
- if(op == ConvOp.MAX_POOLING_BACKWARD
- || op == ConvOp.DIRECT_CONV2D
- || op == ConvOp.DIRECT_CONV2D_BACKWARD_FILTER
- || op == ConvOp.DIRECT_CONV2D_BACKWARD_DATA) {
- expectedNumInputs = 14;
- }
-
- if(inputs.size() != expectedNumInputs) {
- throw new HopsException("Incorrect number of inputs for " + op.name());
- }
-
- Lop in = inputs.get(0).constructLops();
- int numThreads = et == ExecType.CP ? OptimizerUtils.getConstrainedNumThreads(primaryOp.getMaxNumThreads()) : 1;
- ConvolutionTransform transform1 = new ConvolutionTransform( in,
- HopsConv2Lops.get(op), primaryOp.getDataType(), primaryOp.getValueType(), et, numThreads);
-
- // setOutputDimensions(transform1);
- transform1.getOutputParameters().setDimensions(
- rlen, clen, primaryOp.getRowsInBlock(), primaryOp.getColsInBlock(), -1, primaryOp.getUpdateType());
-
- // setLineNumbers(transform1);
- transform1.setAllPositions(primaryOp.getBeginLine(), primaryOp.getBeginColumn(), primaryOp.getEndLine(), primaryOp.getEndColumn());
-
- in.addOutput(transform1);
-
- // stride1, stride2, padding1, padding2
- // input_shape1, input_shape2, input_shape3, input_shape4,
- // filter_shape1, filter_shape2, filter_shape3, filter_shape4
- for( int i=1; i < inputs.size(); i++ )
- {
- Lop ltmp = inputs.get(i).constructLops();
- transform1.addInput(ltmp);
- //if(i == 1 && expectedNumInputs == 14)
- ltmp.addOutput(transform1);
- }
- transform1.setLevel(); //force order of added lops
- return transform1;
- }
-
+
public Lop constructConvolutionLops(ExecType et, ArrayList<Hop> inputs) throws HopsException, LopsException {
int expectedNumInputs = 13;
if(op == ConvOp.MAX_POOLING_BACKWARD
@@ -383,14 +339,7 @@ public class ConvolutionOp extends Hop implements MultiThreadedHop
}
return params;
}
-
- long getExtractedVal(long val1, long val2) {
- if(val1 == -1 || val2 == -1) {
- return -1;
- }
- return val1*val2;
- }
-
+
public static long getExtractedVal(long val1, long val2, long val3) {
if(val1 == -1 || val2 == -1 || val3 == -1) {
return -1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/Hop.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/Hop.java b/src/main/java/org/apache/sysml/hops/Hop.java
index 674536d..4202fe3 100644
--- a/src/main/java/org/apache/sysml/hops/Hop.java
+++ b/src/main/java/org/apache/sysml/hops/Hop.java
@@ -32,16 +32,15 @@ import org.apache.sysml.lops.Checkpoint;
import org.apache.sysml.lops.Compression;
import org.apache.sysml.lops.Data;
import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.lops.LopsException;
import org.apache.sysml.lops.ReBlock;
import org.apache.sysml.lops.UnaryCP;
-import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.parser.Expression.DataType;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
import org.apache.sysml.runtime.controlprogram.caching.MatrixObject.UpdateType;
import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
-import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
@@ -225,11 +224,7 @@ public abstract class Hop
public void setRequiresCompression(boolean flag) {
_requiresCompression = flag;
}
-
- public boolean requiresCompression() {
- return _requiresCompression;
- }
-
+
public boolean hasMatrixInputWithDifferentBlocksizes()
{
for( Hop c : getInput() ) {
@@ -728,22 +723,6 @@ public abstract class Hop
*/
protected abstract long[] inferOutputCharacteristics( MemoTable memo );
-
-
- /**
- * This function is used only for sanity check.
- * Returns true if estimates for all the hops in the DAG rooted at the current
- * hop are computed. Returns false if any of the hops have INVALID estimate.
- *
- * @return true if estimates computed for all hops rooted at current hop
- */
- public boolean checkEstimates() {
- boolean childStatus = true;
- for (Hop h : this.getInput())
- childStatus = childStatus && h.checkEstimates();
- return childStatus && (_memEstimate != OptimizerUtils.INVALID_SIZE);
- }
-
/**
* Recursively computes memory estimates for all the Hops in the DAG rooted at the
* current hop pointed by <code>this</code>.
@@ -810,17 +789,6 @@ public abstract class Hop
return _input;
}
- /**
- * Create bidirectional links
- *
- * @param h high-level operator
- */
- public void addInput( Hop h )
- {
- _input.add(h);
- h._parent.add(this);
- }
-
public long getRowsInBlock() {
return _rows_in_block;
}
@@ -934,22 +902,6 @@ public abstract class Hop
this.setVisited(VisitStatus.DONE);
}
- public void checkParentChildPointers( )
- throws HopsException
- {
- if( getVisited() == VisitStatus.DONE )
- return;
-
- for( Hop in : getInput() )
- {
- if( !in.getParent().contains(this) )
- throw new HopsException("Parent-Child pointers incorrect.");
- in.checkParentChildPointers();
- }
-
- setVisited(VisitStatus.DONE);
- }
-
public void printMe() throws HopsException {
if (LOG.isDebugEnabled()) {
StringBuilder s = new StringBuilder("");
@@ -1387,11 +1339,7 @@ public abstract class Hop
HopsOpOp2String.put(OpOp2.RBIND, "rbind");
HopsOpOp2String.put(OpOp2.SOLVE, "solve");
}
-
- public static String getOpOp2String( OpOp2 op ) {
- return HopsOpOp2String.get(op);
- }
-
+
protected static final HashMap<Hop.OpOp3, String> HopsOpOp3String;
static {
HopsOpOp3String = new HashMap<Hop.OpOp3, String>();
@@ -1454,33 +1402,6 @@ public abstract class Hop
HopsData2String.put(DataOpTypes.TRANSIENTWRITE, "TWrite");
HopsData2String.put(DataOpTypes.TRANSIENTREAD, "TRead");
}
-
- public static boolean isFunction(OpOp2 op)
- {
- return op == OpOp2.MIN || op == OpOp2.MAX ||
- op == OpOp2.LOG;// || op == OpOp2.CONCAT; //concat is || in Netezza
- }
-
- public static boolean isSupported(OpOp2 op)
- {
- return op != OpOp2.INVALID && op != OpOp2.QUANTILE &&
- op != OpOp2.INTERQUANTILE && op != OpOp2.IQM;
- }
-
- public static boolean isFunction(OpOp1 op)
- {
- return op == OpOp1.SIN || op == OpOp1.TAN || op == OpOp1.COS ||
- op == OpOp1.ABS || op == OpOp1.EXP || op == OpOp1.LOG ||
- op == OpOp1.ROUND || op == OpOp1.SQRT;
- }
-
- public static boolean isBooleanOperation(OpOp2 op)
- {
- return op == OpOp2.AND || op == OpOp2.EQUAL ||
- op == OpOp2.GREATER || op == OpOp2.GREATEREQUAL ||
- op == OpOp2.LESS || op == OpOp2.LESSEQUAL ||
- op == OpOp2.OR;
- }
public static OpOp2 getOpOp2ForOuterVectorOperation(String op)
{
@@ -1505,17 +1426,7 @@ public abstract class Hop
return null;
}
-
- public static ValueType getResultValueType(ValueType vt1, ValueType vt2)
- {
- if(vt1 == ValueType.STRING || vt2 == ValueType.STRING)
- return ValueType.STRING;
- else if(vt1 == ValueType.DOUBLE || vt2 == ValueType.DOUBLE)
- return ValueType.DOUBLE;
- else
- return ValueType.INT;
- }
-
+
/////////////////////////////////////
// methods for dynamic re-compilation
/////////////////////////////////////
@@ -1534,12 +1445,7 @@ public abstract class Hop
{
_requiresRecompile = true;
}
-
- public void unsetRequiresRecompile()
- {
- _requiresRecompile = false;
- }
-
+
/**
* Update the output size information for this hop.
*/
@@ -1778,21 +1684,6 @@ public abstract class Hop
return ret;
}
- public String constructBaseDir()
- {
- StringBuilder sb = new StringBuilder();
- sb.append( ConfigurationManager.getScratchSpace() );
- sb.append( Lop.FILE_SEPARATOR );
- sb.append( Lop.PROCESS_PREFIX );
- sb.append( DMLScript.getUUID() );
- sb.append( Lop.FILE_SEPARATOR );
- sb.append( Lop.FILE_SEPARATOR );
- sb.append( ProgramConverter.CP_ROOT_THREAD_ID );
- sb.append( Lop.FILE_SEPARATOR );
-
- return sb.toString();
- }
-
/**
* Clones the attributes of that and copies it over to this.
*
@@ -1871,11 +1762,7 @@ public abstract class Hop
public String printErrorLocation(){
return "ERROR: line " + _beginLine + ", column " + _beginColumn + " -- ";
}
-
- public String printWarningLocation(){
- return "WARNING: line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
-
+
/**
* Sets the linenumbers of this hop to a given lop.
*
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/OptimizerUtils.java b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
index 2aa421b..a7525a5 100644
--- a/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
@@ -37,7 +37,6 @@ import org.apache.sysml.lops.Checkpoint;
import org.apache.sysml.lops.Lop;
import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.lops.compile.Dag;
-import org.apache.sysml.parser.Expression.DataType;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
@@ -51,7 +50,6 @@ import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.matrix.data.OutputInfo;
import org.apache.sysml.runtime.matrix.data.SparseBlock;
-import org.apache.sysml.runtime.matrix.data.SparseRow;
import org.apache.sysml.runtime.util.IndexRange;
import org.apache.sysml.runtime.util.UtilFunctions;
import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
@@ -735,37 +733,7 @@ public class OptimizerUtils
{
return estimateSizeExactSparsity(0, 0, 0.0d);
}
-
- /**
- * Estimates the memory footprint of a SparseRow with <code>clen</code>
- * columns and <code>sp</code> sparsity. This method accounts for the
- * overhead incurred by extra cells allocated (but not used) for SparseRow.
- * It assumes that non-zeros are uniformly distributed in the matrix --
- * i.e., #estimated nnz in a given SparseRow = clen*sp.
- *
- * @param clen number of cols
- * @param sp sparsity
- * @return estimated size in bytes
- */
- public static long estimateRowSize(long clen, double sp)
- {
- if ( sp == 0 )
- return 0;
-
- int basicSize = 28;
- int cellSize = 12; // every cell takes 12 (8+4) bytes
- if ( sp == 1 ) {
- return clen * cellSize;
- }
- long numCells = SparseRow.initialCapacity;
- if ( (long) (sp*clen) > numCells ) {
- numCells = (long) (sp*clen);
- }
- long allocatedCells = (long)Math.pow(2, Math.ceil(Math.log(numCells)/Math.log(2)) );
- long rowSize = basicSize + allocatedCells * cellSize;
- return rowSize;
- }
-
+
public static long estimateSizeTextOutput( long rows, long cols, long nnz, OutputInfo oinfo )
{
long bsize = MatrixBlock.estimateSizeOnDisk(rows, cols, nnz);
@@ -898,16 +866,6 @@ public class OptimizerUtils
public static String getUniqueTempFileName() {
return new Dag<Lop>().getNextUniqueFilename();
}
-
- /**
- * Wrapper over internal varname construction for external usage.
- *
- * @param dt data type
- * @return unique variable name
- */
- public static String getUniqueVariableName(DataType dt) {
- return Dag.getNextUniqueVarname(dt);
- }
public static boolean allowsToFilterEmptyBlockOutputs( Hop hop )
throws HopsException
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
index a450168..52a966e 100644
--- a/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
@@ -19,18 +19,12 @@
package org.apache.sysml.hops.cost;
-import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-
-import org.apache.sysml.hops.Hop;
-import org.apache.sysml.hops.HopsException;
-import org.apache.sysml.lops.LopsException;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
import org.apache.sysml.runtime.controlprogram.Program;
@@ -98,20 +92,6 @@ public class CostEstimationWrapper
LOG.debug("Finished estimation in "+time.stop()+"ms.");
return costs;
}
-
- public static double getTimeEstimate( ArrayList<Hop> hops, ExecutionContext ec )
- throws DMLRuntimeException, HopsException, LopsException, IOException
- {
- Timing time = new Timing(true);
-
- HashMap<String,VarStats> stats = new HashMap<String, VarStats>();
- LocalVariableMap vars = (ec!=null)? ec.getVariables() : new LocalVariableMap();
-
- double costs = _costEstim.getTimeEstimate(hops, vars, stats);
- LOG.debug("Finished estimation in "+time.stop()+"ms.");
-
- return costs;
- }
private static CostEstimator createCostEstimator( CostType type )
throws DMLRuntimeException
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
index 65fe83a..955fadb 100644
--- a/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
@@ -19,21 +19,16 @@
package org.apache.sysml.hops.cost;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.StringTokenizer;
import java.util.Map.Entry;
+import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sysml.conf.ConfigurationManager;
-import org.apache.sysml.hops.Hop;
-import org.apache.sysml.hops.HopsException;
-import org.apache.sysml.hops.recompile.Recompiler;
import org.apache.sysml.lops.Lop;
-import org.apache.sysml.lops.LopsException;
import org.apache.sysml.parser.DMLProgram;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
@@ -104,24 +99,6 @@ public abstract class CostEstimator
return rGetTimeEstimate(pb, stats, new HashSet<String>(), recursive);
}
- public double getTimeEstimate( ArrayList<Hop> hops, LocalVariableMap vars, HashMap<String,VarStats> stats )
- throws DMLRuntimeException, HopsException, LopsException, IOException
- {
- double costs = 0;
-
- ArrayList<Instruction> linst = Recompiler.recompileHopsDag(null, hops, vars, null, false, 0);
- ProgramBlock pb = new ProgramBlock(null);
- pb.setInstructions(linst);
-
- //obtain stats from symboltable (e.g., during recompile)
- maintainVariableStatistics(vars, stats);
-
- //get cost estimate
- costs = rGetTimeEstimate(pb, stats, new HashSet<String>(), true);
-
- return costs;
- }
-
private double rGetTimeEstimate(ProgramBlock pb, HashMap<String,VarStats> stats, HashSet<String> memoFunc, boolean recursive)
throws DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java b/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
index ba54537..68b5d8e 100644
--- a/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
+++ b/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
@@ -19,10 +19,8 @@
package org.apache.sysml.hops.recompile;
-import java.util.ArrayList;
import java.util.HashMap;
-import org.apache.sysml.parser.VariableSet;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
public class RecompileStatus
@@ -39,20 +37,7 @@ public class RecompileStatus
{
return _lastTWrites;
}
-
- public void clearStatus()
- {
- _lastTWrites.clear();
- }
-
- public void clearStatus(VariableSet vars)
- {
- ArrayList<String> lvars = new ArrayList<String>(vars.getVariableNames());
- for( String var : lvars ) {
- _lastTWrites.remove(var);
- }
- }
-
+
@Override
public Object clone()
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java b/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
index 327b097..8b121d7 100644
--- a/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
+++ b/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
@@ -1299,12 +1299,7 @@ public class Recompiler
for( Hop hop : hops ) //for all hop roots
extractDAGOutputStatistics(hop, vars, overwrite);
}
-
- public static void extractDAGOutputStatistics(Hop hop, LocalVariableMap vars)
- {
- extractDAGOutputStatistics(hop, vars, true);
- }
-
+
public static void extractDAGOutputStatistics(Hop hop, LocalVariableMap vars, boolean overwrite)
{
if( hop instanceof DataOp && ((DataOp)hop).getDataOpType()==DataOpTypes.TRANSIENTWRITE ) //for all writes to symbol table
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java b/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
index 7d0edd5..8ccb531 100644
--- a/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
@@ -234,14 +234,7 @@ public class HopRewriteUtils
parent.getInput().remove( posChild );
child.getParent().remove( parent );
}
-
- public static void removeChildReferenceByPos( Hop parent, Hop child, int posChild, int posParent )
- {
- //remove child reference
- parent.getInput().remove( posChild );
- child.getParent().remove( posParent );
- }
-
+
public static void removeAllChildReferences( Hop parent )
{
//remove parent reference from all childs
@@ -799,23 +792,7 @@ public class HopRewriteUtils
return ret;
}
-
- public static double getBasic1NSequenceMax(Hop hop)
- throws HopsException
- {
- if( hop instanceof DataGenOp )
- {
- DataGenOp dgop = (DataGenOp) hop;
- if( dgop.getOp() == DataGenMethod.SEQ ){
- Hop to = dgop.getInput().get(dgop.getParamIndex(Statement.SEQ_TO));
- if( to instanceof LiteralOp )
- return getDoubleValueSafe((LiteralOp)to);
- }
- }
-
- throw new HopsException("Failed to retrieve 'to' argument from basic 1-N sequence.");
- }
-
+
public static LiteralOp getBasic1NSequenceMaxLiteral(Hop hop)
throws HopsException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/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 b5b8b80..a5ed9e9 100644
--- a/src/main/java/org/apache/sysml/lops/Lop.java
+++ b/src/main/java/org/apache/sysml/lops/Lop.java
@@ -627,10 +627,6 @@ public abstract class Lop
public String printErrorLocation(){
return "ERROR: line " + _beginLine + ", column " + _beginColumn + " -- ";
}
-
- public String printWarningLocation(){
- return "WARNING: line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
//TODO: Leo This might get confused with Rand.getInstructions
public String getInstructions(String input, String rowl, String rowu,
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/lops/PartialAggregate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/PartialAggregate.java b/src/main/java/org/apache/sysml/lops/PartialAggregate.java
index 9ec23f4..ce54655 100644
--- a/src/main/java/org/apache/sysml/lops/PartialAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/PartialAggregate.java
@@ -135,12 +135,7 @@ public class PartialAggregate extends Lop
{
_dropCorr = true;
}
-
- public static CorrectionLocationType decodeCorrectionLocation(String loc)
- {
- return CorrectionLocationType.valueOf(loc);
- }
-
+
/**
* This method computes the location of "correction" terms in the output
* produced by PartialAgg instruction.
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/lops/Ternary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/Ternary.java b/src/main/java/org/apache/sysml/lops/Ternary.java
index 7a79088..a2d674b 100644
--- a/src/main/java/org/apache/sysml/lops/Ternary.java
+++ b/src/main/java/org/apache/sysml/lops/Ternary.java
@@ -331,21 +331,6 @@ public class Ternary extends Lop
return sb.toString();
}
-
- public static String getOpcode(OperationTypes type)
- {
- switch( type )
- {
- case CTABLE_TRANSFORM: return "ctabletransform";
- case CTABLE_TRANSFORM_SCALAR_WEIGHT: return "ctabletransformscalarweight";
- case CTABLE_EXPAND_SCALAR_WEIGHT: return "ctableexpandscalarweight";
- case CTABLE_TRANSFORM_HISTOGRAM: return "ctabletransformhistogram";
- case CTABLE_TRANSFORM_WEIGHTED_HISTOGRAM: return "ctabletransformweightedhistogram";
-
- default:
- throw new UnsupportedOperationException("Ternary operation code is not defined: " + type);
- }
- }
public static OperationTypes getOperationType(String opcode)
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/lops/Transform.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/Transform.java b/src/main/java/org/apache/sysml/lops/Transform.java
index e0c2f35..d677f6b 100644
--- a/src/main/java/org/apache/sysml/lops/Transform.java
+++ b/src/main/java/org/apache/sysml/lops/Transform.java
@@ -272,30 +272,4 @@ public class Transform extends Lop
return sb.toString();
}
-
- public static Transform constructTransformLop(Lop input1, OperationTypes op, DataType dt, ValueType vt) {
-
- for (Lop lop : input1.getOutputs()) {
- if ( lop.type == Lop.Type.Transform ) {
- return (Transform)lop;
- }
- }
- Transform retVal = new Transform(input1, op, dt, vt);
- retVal.setAllPositions(input1.getBeginLine(), input1.getBeginColumn(), input1.getEndLine(), input1.getEndColumn());
- return retVal;
- }
-
- public static Transform constructTransformLop(Lop input1, OperationTypes op, DataType dt, ValueType vt, ExecType et) {
-
- for (Lop lop : input1.getOutputs()) {
- if ( lop.type == Lop.Type.Transform ) {
- return (Transform)lop;
- }
- }
- Transform retVal = new Transform(input1, op, dt, vt, et);
- retVal.setAllPositions(input1.getBeginLine(), input1.getBeginColumn(), input1.getEndLine(), input1.getEndColumn());
- return retVal;
- }
-
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/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 5a15c9f..8a2fa1c 100644
--- a/src/main/java/org/apache/sysml/lops/compile/Dag.java
+++ b/src/main/java/org/apache/sysml/lops/compile/Dag.java
@@ -230,13 +230,7 @@ public class Dag<N extends Lop>
nodes.add(node);
return true;
}
-
- public ArrayList<Instruction> getJobs(DMLConfig config)
- throws LopsException, IOException, DMLRuntimeException
- {
- return getJobs(null, config);
- }
-
+
/**
* Method to compile a dag generically
*
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/lops/compile/JobType.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/compile/JobType.java b/src/main/java/org/apache/sysml/lops/compile/JobType.java
index 91d3f1d..8403497 100644
--- a/src/main/java/org/apache/sysml/lops/compile/JobType.java
+++ b/src/main/java/org/apache/sysml/lops/compile/JobType.java
@@ -232,22 +232,6 @@ public enum JobType
return (int) Math.pow(2, id-1);
}
- public JobType findJobTypeById(int id) {
- for (JobType jt : JobType.values()) {
- if (jt.getId() == id)
- return jt;
- }
- return null;
- }
-
- public JobType findJobTypeByName(String name) {
- for (JobType jt : JobType.values()) {
- if (jt.getName().equalsIgnoreCase(name))
- return jt;
- }
- return null;
- }
-
public static int getNumJobTypes() {
return values().length;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java b/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
index 2e64674..25f1fa9 100644
--- a/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
+++ b/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
@@ -67,28 +67,11 @@ public class ConditionalPredicate
public void setBeginColumn(int passed) { _beginColumn = passed; }
public void setEndLine(int passed) { _endLine = passed; }
public void setEndColumn(int passed) { _endColumn = passed; }
-
- public void setAllPositions(String fname, int blp, int bcp, int elp, int ecp){
- _filename = fname;
- _beginLine = blp;
- _beginColumn = bcp;
- _endLine = elp;
- _endColumn = ecp;
- }
public String getFilename() { return _filename; }
public int getBeginLine() { return _beginLine; }
public int getBeginColumn() { return _beginColumn; }
public int getEndLine() { return _endLine; }
public int getEndColumn() { return _endColumn; }
-
- public String printErrorLocation(){
- return "ERROR: line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
-
- public String printWarningLocation(){
- return "WARNING: line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
-
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/DMLProgram.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DMLProgram.java b/src/main/java/org/apache/sysml/parser/DMLProgram.java
index d6a0deb..292a13c 100644
--- a/src/main/java/org/apache/sysml/parser/DMLProgram.java
+++ b/src/main/java/org/apache/sysml/parser/DMLProgram.java
@@ -67,11 +67,7 @@ public class DMLProgram
public HashMap<String,DMLProgram> getNamespaces(){
return _namespaces;
}
-
- public void addStatementBlock(StatementBlock b, int pos) {
- _blocks.add(pos,b) ;
- }
-
+
public void addStatementBlock(StatementBlock b){
_blocks.add(b);
}
@@ -143,10 +139,6 @@ public class DMLProgram
public StatementBlock getStatementBlock(int i){
return _blocks.get(i);
}
-
- public void setStatementBlock(int i, StatementBlock sb) {
- _blocks.set(i, sb);
- }
public void mergeStatementBlocks(){
_blocks = StatementBlock.mergeStatementBlocks(_blocks);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/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 e7e37c8..545fe12 100644
--- a/src/main/java/org/apache/sysml/parser/DMLTranslator.java
+++ b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
@@ -2962,15 +2962,6 @@ public class DMLTranslator
h.setColsInBlock(id.getColumnsInBlock());
}
- public void setIdentifierParams(Hop h, Hop source) {
-
- h.setDim1(source.getDim1());
- h.setDim2(source.getDim2());
- h.setNnz(source.getNnz());
- h.setRowsInBlock(source.getRowsInBlock());
- h.setColsInBlock(source.getColsInBlock());
- }
-
private boolean prepareReadAfterWrite( DMLProgram prog, HashMap<String, DataIdentifier> pWrites )
throws LanguageException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/DataIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DataIdentifier.java b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
index 41dffe8..158829a 100644
--- a/src/main/java/org/apache/sysml/parser/DataIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
@@ -71,40 +71,7 @@ public class DataIdentifier extends Identifier
_kind = null;
_defaultValue = null;
}
-
- public void setTypeInfo( String valueType, String dataType) throws ParseException{
-
- if (valueType.equalsIgnoreCase("int") || valueType.equalsIgnoreCase("integer"))
- this.setValueType(ValueType.INT);
- else if (valueType.equalsIgnoreCase("double"))
- this.setValueType(ValueType.DOUBLE);
- else if (valueType.equalsIgnoreCase("string"))
- this.setValueType(ValueType.STRING);
- else if (valueType.equalsIgnoreCase("boolean"))
- this.setValueType(ValueType.BOOLEAN);
- else if (valueType.equalsIgnoreCase("object"))
- this.setValueType(ValueType.OBJECT);
- else {
- // provide location for this exception in the parser
- LOG.error(this.printErrorLocation() + "function parameter has unknown value type " + valueType);
- throw new ParseException(this.printErrorLocation() + "function parameter has unknown value type " + valueType);
- }
-
- if (dataType.equalsIgnoreCase("object"))
- this.setDataType(DataType.OBJECT);
- else if (dataType.equalsIgnoreCase("SCALAR"))
- this.setDataType(DataType.SCALAR);
- else if (dataType.equalsIgnoreCase("MATRIX"))
- this.setDataType(DataType.MATRIX);
- else {
- // provide location for this exception in the parser
- LOG.error(this.printErrorLocation() + "function parameter has unknown data type " + valueType);
- throw new ParseException(this.printErrorLocation() + "function parameter has unknown data type " + valueType);
- }
-
- }
-
public String getName(){
return _name;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/FunctionStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionStatement.java b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
index a1c46d9..ea2ed5c 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionStatement.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
@@ -21,8 +21,6 @@ package org.apache.sysml.parser;
import java.util.ArrayList;
-import org.apache.sysml.lops.Lop;
-
public class FunctionStatement extends Statement
{
@@ -67,11 +65,7 @@ public class FunctionStatement extends Statement
public String getName(){
return _name;
}
-
- public void addStatementBlock(StatementBlock sb){
- _body.add(sb);
- }
-
+
public ArrayList<StatementBlock> getBody(){
return _body;
}
@@ -139,18 +133,4 @@ public class FunctionStatement extends Statement
LOG.warn(this.printWarningLocation() + " -- should not call variablesRead from FunctionStatement ");
return new VariableSet();
}
-
- public static String[] createFunctionCallVariables( ArrayList<Lop> lops )
- {
- String[] ret = new String[lops.size()]; //vars in order
-
- for( int i=0; i<lops.size(); i++ )
- {
- Lop llops = lops.get(i);
- if( llops.getType()==Lop.Type.Data )
- ret[i] = llops.getOutputParameters().getLabel();
- }
-
- return ret;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/IfStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IfStatement.java b/src/main/java/org/apache/sysml/parser/IfStatement.java
index b3d999a..0eea248 100644
--- a/src/main/java/org/apache/sysml/parser/IfStatement.java
+++ b/src/main/java/org/apache/sysml/parser/IfStatement.java
@@ -100,32 +100,7 @@ public class IfStatement extends Statement
if (!_elseBody.isEmpty())
_elseBody = StatementBlock.mergeStatementBlocks(_elseBody);
}
-
- public VariableSet variablesReadIfBody() {
-
- return null;
-
- }
-
- public VariableSet variablesReadElseBody() {
-
- LOG.warn("WARNING: line " + this.getBeginLine() + ", column " + this.getBeginColumn() + " -- should not call variablesReadElseBody from IfStatement ");
- return null;
- }
-
- public VariableSet variablesUpdatedIfBody() {
-
- LOG.warn("WARNING: line " + this.getBeginLine() + ", column " + this.getBeginColumn() + " -- should not call variablesUpdatedIfBody from IfStatement ");
- return null;
- }
-
- public VariableSet variablesUpdatedElseBody() {
-
- LOG.warn("WARNING: line " + this.getBeginLine() + ", column " + this.getBeginColumn() + " -- should not call variablesUpdatedElseBody from IfStatement ");
- return null;
- }
-
-
+
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append("if ( ");
@@ -145,11 +120,6 @@ public class IfStatement extends Statement
return sb.toString();
}
-
- public VariableSet variablesKill() {
- return new VariableSet();
- }
-
@Override
public VariableSet variablesRead() {
LOG.warn("WARNING: line " + this.getBeginLine() + ", column " + this.getBeginColumn() + " -- should not call variablesRead from IfStatement ");
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
index 11110b5..637e445 100644
--- a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
@@ -709,35 +709,6 @@ public class IndexedIdentifier extends DataIdentifier
return result;
}
- public void setAllPositions (String filename, int blp, int bcp, ArrayList<ArrayList<Expression>> exprListList){
- setFilename(filename);
- setBeginLine(blp);
- setBeginColumn(bcp);
-
- Expression rightMostIndexExpr = null;
- if (exprListList != null){
- for(ArrayList<Expression> exprList : exprListList){
- if (exprList != null){
- for (Expression expr : exprList){
- if (expr != null) {
- rightMostIndexExpr = expr;
- }
- }
- }
- }
- }
-
- if (rightMostIndexExpr != null){
- setEndLine(rightMostIndexExpr.getEndLine());
- setEndColumn(rightMostIndexExpr.getEndColumn());
- }
- else {
- setEndLine(blp);
- setEndColumn(bcp);
- }
- }
-
-
public void setProperties(Identifier i){
_dataType = i.getDataType();
_valueType = i.getValueType();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java b/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
index 9cadc3d..9133e33 100644
--- a/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
+++ b/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
@@ -79,11 +79,6 @@ public abstract class LiveVariableAnalysis
public abstract VariableSet initializebackwardLV(VariableSet loPassed) throws LanguageException;
public abstract VariableSet analyze(VariableSet loPassed) throws LanguageException;
-
- public void updateLiveVariablesIn(VariableSet liveIn){
- updateLiveVariables(_liveIn,liveIn);
- }
-
public void updateLiveVariablesOut(VariableSet liveOut){
updateLiveVariables(_liveOut,liveOut);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/OutputStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/OutputStatement.java b/src/main/java/org/apache/sysml/parser/OutputStatement.java
index 3d1b7bb..ec58d57 100644
--- a/src/main/java/org/apache/sysml/parser/OutputStatement.java
+++ b/src/main/java/org/apache/sysml/parser/OutputStatement.java
@@ -56,10 +56,6 @@ public class OutputStatement extends Statement
filename, blp, bcp, elp, ecp);
}
- public void setExprParam(String name, Expression value) {
- _paramsExpr.addVarParam(name, value);
- }
-
public static boolean isValidParamName(String key){
for (String paramName : WRITE_VALID_PARAM_NAMES)
if (paramName.equals(key))
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
index d632249..c135b74 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
@@ -168,11 +168,7 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
public void addVarParam(String name, Expression value){
_varParams.put(name, value);
}
-
- public void removeVarParam(String name) {
- _varParams.remove(name);
- }
-
+
/**
* Validate parse tree : Process BuiltinFunction Expression in an assignment
* statement
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/Statement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Statement.java b/src/main/java/org/apache/sysml/parser/Statement.java
index 8268796..c2e00ea 100644
--- a/src/main/java/org/apache/sysml/parser/Statement.java
+++ b/src/main/java/org/apache/sysml/parser/Statement.java
@@ -115,26 +115,6 @@ public abstract class Statement
public String printWarningLocation(){
return "WARNING: " + _filename + " -- line " + _beginLine + ", column " + _beginColumn + " -- ";
}
-
- public String printInfoLocation(){
- return "INFO: " + _filename + " -- line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
-
- public String printErrorLocation(int beginLine, int beginColumn){
- return "ERROR: " + _filename + " -- line " + beginLine + ", column " + beginColumn + " -- ";
- }
-
- public String printWarningLocation(int beginLine, int beginColumn){
- return "WARNING: " + _filename + " -- line " + beginLine + ", column " + beginColumn + " -- ";
- }
-
- public String printInfoLocation(int beginLine, int beginColumn){
- return "INFO: " + _filename + " -- line " + beginLine + ", column " + beginColumn + " -- ";
- }
-
- public void raiseValidateError( String msg ) throws LanguageException {
- raiseValidateError(msg, false, null);
- }
public void raiseValidateError( String msg, boolean conditional ) throws LanguageException {
raiseValidateError(msg, conditional, null);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/StatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/StatementBlock.java b/src/main/java/org/apache/sysml/parser/StatementBlock.java
index af085d5..73fdd94 100644
--- a/src/main/java/org/apache/sysml/parser/StatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/StatementBlock.java
@@ -91,21 +91,7 @@ public class StatementBlock extends LiveVariableAnalysis
this._endColumn = s.getEndColumn();
}
-
- public void replaceStatement(int index, Statement passedStmt){
- this._statements.set(index, passedStmt);
-
- if (index == 0){
- this._beginLine = passedStmt.getBeginLine();
- this._beginColumn = passedStmt.getBeginColumn();
- }
-
- else if (index == this._statements.size() -1){
- this._endLine = passedStmt.getEndLine();
- this._endColumn = passedStmt.getEndColumn();
- }
- }
-
+
public void addStatementBlock(StatementBlock s){
for (int i = 0; i < s.getNumStatements(); i++){
_statements.add(s.getStatement(i));
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/VariableSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/VariableSet.java b/src/main/java/org/apache/sysml/parser/VariableSet.java
index 819e9e3..b1f5067 100644
--- a/src/main/java/org/apache/sysml/parser/VariableSet.java
+++ b/src/main/java/org/apache/sysml/parser/VariableSet.java
@@ -62,12 +62,7 @@ public class VariableSet
_variables.remove(var);
}
}
-
- public void removeVariable(String name)
- {
- _variables.remove(name);
- }
-
+
public boolean containsVariable(String name){
return _variables.containsKey(name);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
index bcdeffd..43eabcb 100644
--- a/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
+++ b/src/main/java/org/apache/sysml/parser/common/CommonSyntacticValidator.java
@@ -86,10 +86,6 @@ public abstract class CommonSyntacticValidator {
functions = (null != prepFunctions) ? prepFunctions : new HashSet<String>();
}
- protected void notifyErrorListeners(String message, int line, int charPositionInLine) {
- errorListener.validationError(line, charPositionInLine, message);
- }
-
protected void notifyErrorListeners(String message, Token op) {
errorListener.validationError(op.getLine(), op.getCharPositionInLine(), message);
}
@@ -156,19 +152,6 @@ public abstract class CommonSyntacticValidator {
notifyErrorListeners("Namespace Conflict: '" + namespace + "' already defined as " + sources.get(namespace), ctx.start);
}
}
-
- protected boolean validateBuiltinFunctions(String function) {
- String functionName = function.replaceAll(" ", "").trim();
- if(functionName.equals("write") || functionName.equals(DMLProgram.DEFAULT_NAMESPACE + namespaceResolutionOp() + "write")) {
- return validateBuiltinWriteFunction(function);
- }
- return true;
- }
-
- protected boolean validateBuiltinWriteFunction(String function) {
- return true;
- }
-
protected void setFileLineColumn(Expression expr, ParserRuleContext ctx) {
String txt = ctx.getText();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java b/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
index fa3f9d9..90d0265 100644
--- a/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
+++ b/src/main/java/org/apache/sysml/parser/common/CustomErrorListener.java
@@ -317,14 +317,6 @@ public class CustomErrorListener extends BaseErrorListener {
}
/**
- * Clear the list of parse issues.
- *
- */
- public void clearParseIssues() {
- parseIssues.clear();
- }
-
- /**
* Generate a message displaying information about the parse issues that
* occurred.
*
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/compress/ColGroupBitmap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/compress/ColGroupBitmap.java b/src/main/java/org/apache/sysml/runtime/compress/ColGroupBitmap.java
index a9fdc0f..dac18ef 100644
--- a/src/main/java/org/apache/sysml/runtime/compress/ColGroupBitmap.java
+++ b/src/main/java/org/apache/sysml/runtime/compress/ColGroupBitmap.java
@@ -25,11 +25,10 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import java.util.TreeMap;
import java.util.Map.Entry;
+import java.util.TreeMap;
import org.apache.sysml.runtime.DMLRuntimeException;
-import org.apache.sysml.runtime.compress.utils.LinearAlgebraUtils;
import org.apache.sysml.runtime.functionobjects.Builtin;
import org.apache.sysml.runtime.functionobjects.Builtin.BuiltinCode;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
@@ -325,17 +324,6 @@ public abstract class ColGroupBitmap extends ColGroup
return val;
}
- protected final void sumAllValues(double[] b, double[] c)
- {
- final int numVals = getNumValues();
- final int numCols = getNumCols();
-
- //vectMultiplyAdd over cols instead of dotProduct over vals because
- //usually more values than columns
- for( int i=0, off=0; i<numCols; i++, off+=numVals )
- LinearAlgebraUtils.vectMultiplyAdd(b[i], _values, c, off, 0, numVals);
- }
-
protected final double mxxValues(int bitmapIx, Builtin builtin)
{
final int numCols = getNumCols();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/compress/PlanningBinPacker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/compress/PlanningBinPacker.java b/src/main/java/org/apache/sysml/runtime/compress/PlanningBinPacker.java
index 7c3d8d2..70308bb 100644
--- a/src/main/java/org/apache/sysml/runtime/compress/PlanningBinPacker.java
+++ b/src/main/java/org/apache/sysml/runtime/compress/PlanningBinPacker.java
@@ -20,14 +20,10 @@
package org.apache.sysml.runtime.compress;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.math3.random.RandomDataGenerator;
-
/**
* Used for the finding columns to co-code
*
@@ -53,26 +49,6 @@ public class PlanningBinPacker
return packFirstFit(_items, _itemWeights);
}
- /**
- * shuffling the items to make some potential for having bins of different
- * sizes when consecutive columns are of close cardinalities
- *
- * @return key: available space, value: list of the bins that have that free
- * space
- */
- public TreeMap<Float, List<List<Integer>>> packFirstFitShuffled() {
- RandomDataGenerator rnd = new RandomDataGenerator();
- int[] permutation = rnd.nextPermutation(_items.size(), _items.size());
- List<Integer> shuffledItems = new ArrayList<Integer>(_items.size());
- List<Float> shuffledWeights = new ArrayList<Float>(_items.size());
- for (int ix : permutation) {
- shuffledItems.add(_items.get(ix));
- shuffledWeights.add(_itemWeights.get(ix));
- }
-
- return packFirstFit(shuffledItems, shuffledWeights);
- }
-
private TreeMap<Float, List<List<Integer>>> packFirstFit(List<Integer> items, List<Float> itemWeights)
{
// when searching for a bin, the first bin in the list is used
@@ -114,41 +90,6 @@ public class PlanningBinPacker
return bins;
}
- /**
- * NOTE: upper bound is 11/9 OPT + 6/9 (~1.22 OPT)
- *
- * @return sorted map of ?
- */
- public TreeMap<Float, List<List<Integer>>> packFirstFitDescending() {
- // sort items descending based on their weights
- Integer[] indexes = new Integer[_items.size()];
- for (int i = 0; i < indexes.length; i++)
- indexes[i] = i;
- Arrays.sort(indexes, new Comparator<Integer>() {
-
- @Override
- public int compare(Integer o1, Integer o2) {
- return _itemWeights.get(o1).compareTo(_itemWeights.get(o2));
- }
- });
- List<Integer> sortedItems = new ArrayList<Integer>();
- List<Float> sortedItemWeights = new ArrayList<Float>();
- for (int i = indexes.length - 1; i >= 0; i--) {
- sortedItems.add(_items.get(i));
- sortedItemWeights.add(_itemWeights.get(i));
- }
- return packFirstFit(sortedItems, sortedItemWeights);
- }
-
- /**
- * NOTE: upper bound is 71/60 OPT + 6/9 (~1.18 OPT)
- *
- * @return sorted map of ?
- */
- public TreeMap<Float, List<List<Integer>>> packModifiedFirstFitDescending() {
- throw new UnsupportedOperationException("Not implemented yet!");
- }
-
private List<List<Integer>> createBinList() {
List<List<Integer>> binList = new ArrayList<List<Integer>>();
binList.add(new ArrayList<Integer>());
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/compress/estim/CompressedSizeEstimatorSample.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/compress/estim/CompressedSizeEstimatorSample.java b/src/main/java/org/apache/sysml/runtime/compress/estim/CompressedSizeEstimatorSample.java
index cc5932b..eb0040f 100644
--- a/src/main/java/org/apache/sysml/runtime/compress/estim/CompressedSizeEstimatorSample.java
+++ b/src/main/java/org/apache/sysml/runtime/compress/estim/CompressedSizeEstimatorSample.java
@@ -70,10 +70,6 @@ public class CompressedSizeEstimatorSample extends CompressedSizeEstimator
_sampleRows = sampleRows;
}
- public void resampleRows(int sampleSize) {
- _sampleRows = getSortedUniformSample(_numRows, sampleSize);
- }
-
@Override
public CompressedSizeInfo estimateCompressedColGroupSize(int[] colIndexes)
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/compress/utils/ConverterUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/compress/utils/ConverterUtils.java b/src/main/java/org/apache/sysml/runtime/compress/utils/ConverterUtils.java
index f4d9f1c..37b2984 100644
--- a/src/main/java/org/apache/sysml/runtime/compress/utils/ConverterUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/compress/utils/ConverterUtils.java
@@ -19,7 +19,6 @@
package org.apache.sysml.runtime.compress.utils;
-import java.util.ArrayList;
import java.util.Arrays;
import org.apache.sysml.runtime.compress.ColGroup;
@@ -71,19 +70,4 @@ public class ConverterUtils
else
return vector.getDenseBlock();
}
-
- public static MatrixBlock getUncompressedColBlock( ColGroup group )
- {
- MatrixBlock ret = null;
- if( group instanceof ColGroupUncompressed ) {
- ret = ((ColGroupUncompressed) group).getData();
- }
- else {
- ArrayList<ColGroup> tmpGroup = new ArrayList<ColGroup>(Arrays.asList(group));
- ColGroupUncompressed decompressedCols = new ColGroupUncompressed(tmpGroup);
- ret = decompressedCols.getData();
- }
-
- return ret;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/compress/utils/LinearAlgebraUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/compress/utils/LinearAlgebraUtils.java b/src/main/java/org/apache/sysml/runtime/compress/utils/LinearAlgebraUtils.java
index 7a4a013..3bf0ad4 100644
--- a/src/main/java/org/apache/sysml/runtime/compress/utils/LinearAlgebraUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/compress/utils/LinearAlgebraUtils.java
@@ -28,86 +28,6 @@ import org.apache.sysml.runtime.matrix.data.MatrixBlock;
*/
public class LinearAlgebraUtils {
- public static double dotProduct(double[] a, double[] b, final int len)
- {
- double val = 0;
- final int bn = len % 8;
-
- // compute rest
- for (int i = 0; i < bn; i++)
- val += a[i] * b[i];
-
- // unrolled 8-block (for better instruction-level parallelism)
- for (int i = bn; i < len; i += 8) {
- // read 64B cachelines of a and b
- // compute cval' = sum(a * b) + cval
- val += a[i + 0] * b[i + 0]
- + a[i + 1] * b[i + 1]
- + a[i + 2] * b[i + 2]
- + a[i + 3] * b[i + 3]
- + a[i + 4] * b[i + 4]
- + a[i + 5] * b[i + 5]
- + a[i + 6] * b[i + 6]
- + a[i + 7] * b[i + 7];
- }
-
- // scalar result
- return val;
- }
-
- public static double dotProduct( double[] a, double[] b, int ai, int bi, final int len )
- {
- double val = 0;
- final int bn = len%8;
-
- //compute rest
- for( int i = 0; i < bn; i++, ai++, bi++ )
- val += a[ ai ] * b[ bi ];
-
- //unrolled 8-block (for better instruction-level parallelism)
- for( int i = bn; i < len; i+=8, ai+=8, bi+=8 )
- {
- //read 64B cachelines of a and b
- //compute cval' = sum(a * b) + cval
- val += a[ ai+0 ] * b[ bi+0 ]
- + a[ ai+1 ] * b[ bi+1 ]
- + a[ ai+2 ] * b[ bi+2 ]
- + a[ ai+3 ] * b[ bi+3 ]
- + a[ ai+4 ] * b[ bi+4 ]
- + a[ ai+5 ] * b[ bi+5 ]
- + a[ ai+6 ] * b[ bi+6 ]
- + a[ ai+7 ] * b[ bi+7 ];
- }
-
- //scalar result
- return val;
- }
-
- public static void vectAdd( double[] a, double[] c, int ai, int ci, final int len )
- {
- final int bn = len%8;
-
- //rest, not aligned to 8-blocks
- for( int j = 0; j < bn; j++, ai++, ci++)
- c[ ci ] += a[ ai ];
-
- //unrolled 8-block (for better instruction-level parallelism)
- for( int j = bn; j < len; j+=8, ai+=8, ci+=8)
- {
- //read 64B cachelines of a and c
- //compute c' = c * a
- //write back 64B cacheline of c = c'
- c[ ci+0 ] += a[ ai+0 ];
- c[ ci+1 ] += a[ ai+1 ];
- c[ ci+2 ] += a[ ai+2 ];
- c[ ci+3 ] += a[ ai+3 ];
- c[ ci+4 ] += a[ ai+4 ];
- c[ ci+5 ] += a[ ai+5 ];
- c[ ci+6 ] += a[ ai+6 ];
- c[ ci+7 ] += a[ ai+7 ];
- }
- }
-
public static void vectAdd( final double aval, double[] c, char[] bix, final int bi, final int ci, final int len )
{
final int bn = len%8;
@@ -152,53 +72,6 @@ public class LinearAlgebraUtils {
}
}
- public static void vectMultiplyAdd( final double aval, double[] b, double[] c, int[] bix, final int bi, final int ci, final int len )
- {
- final int bn = (len-bi)%8;
-
- //rest, not aligned to 8-blocks
- for( int j = bi; j < bi+bn; j++ )
- c[ ci + bix[j] ] += aval * b[ j ];
-
- //unrolled 8-block (for better instruction-level parallelism)
- for( int j = bi+bn; j < len; j+=8 )
- {
- c[ ci+bix[j+0] ] += aval * b[ j+0 ];
- c[ ci+bix[j+1] ] += aval * b[ j+1 ];
- c[ ci+bix[j+2] ] += aval * b[ j+2 ];
- c[ ci+bix[j+3] ] += aval * b[ j+3 ];
- c[ ci+bix[j+4] ] += aval * b[ j+4 ];
- c[ ci+bix[j+5] ] += aval * b[ j+5 ];
- c[ ci+bix[j+6] ] += aval * b[ j+6 ];
- c[ ci+bix[j+7] ] += aval * b[ j+7 ];
- }
- }
-
- public static void vectMultiplyAdd( final double aval, double[] b, double[] c, int bi, int ci, final int len )
- {
- final int bn = len%8;
-
- //rest, not aligned to 8-blocks
- for( int j = 0; j < bn; j++, bi++, ci++)
- c[ ci ] += aval * b[ bi ];
-
- //unrolled 8-block (for better instruction-level parallelism)
- for( int j = bn; j < len; j+=8, bi+=8, ci+=8)
- {
- //read 64B cachelines of b and c
- //compute c' = aval * b + c
- //write back 64B cacheline of c = c'
- c[ ci+0 ] += aval * b[ bi+0 ];
- c[ ci+1 ] += aval * b[ bi+1 ];
- c[ ci+2 ] += aval * b[ bi+2 ];
- c[ ci+3 ] += aval * b[ bi+3 ];
- c[ ci+4 ] += aval * b[ bi+4 ];
- c[ ci+5 ] += aval * b[ bi+5 ];
- c[ ci+6 ] += aval * b[ bi+6 ];
- c[ ci+7 ] += aval * b[ bi+7 ];
- }
- }
-
public static double vectSum( double[] a, char[] bix, final int ai, final int bi, final int len )
{
double val = 0;
@@ -249,18 +122,6 @@ public class LinearAlgebraUtils {
return val;
}
- public static void copyUpperToLowerTriangle( MatrixBlock ret )
- {
- double[] c = ret.getDenseBlock();
- final int m = ret.getNumRows();
- final int n = ret.getNumColumns();
-
- //copy symmetric values
- for( int i=0, uix=0; i<m; i++, uix+=n )
- for( int j=i+1, lix=j*n+i; j<n; j++, lix+=n )
- c[ lix ] = c[ uix+j ];
- }
-
public static void copyNonZerosToRowCol( MatrixBlock ret, MatrixBlock tmp, int ix )
{
for(int i=0; i<tmp.getNumColumns(); i++) {
@@ -271,29 +132,4 @@ public class LinearAlgebraUtils {
}
}
}
-
- /**
- * Obtain the index of the closest element in a to the value x.
- *
- * @param a array of ints
- * @param x value
- * @return the index of the closest element in a to the value x
- */
- public static int getClosestK(int[] a, int x) {
-
- int low = 0;
- int high = a.length - 1;
-
- while (low < high) {
- int mid = (low + high) / 2;
- int d1 = Math.abs(a[mid] - x);
- int d2 = Math.abs(a[mid + 1] - x);
- if (d2 <= d1) {
- low = mid + 1;
- } else {
- high = mid;
- }
- }
- return high;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
index f01c049..3c72ca9 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
@@ -909,13 +909,6 @@ public class ExternalFunctionProgramBlock extends FunctionProgramBlock
throw new RuntimeException("Should never come here");
}
- public void printMe() {
- //System.out.println("***** INSTRUCTION BLOCK *****");
- for (Instruction i : this._inst) {
- i.printMe();
- }
- }
-
public HashMap<String,String> getOtherParams() {
return _otherParams;
}
@@ -935,24 +928,6 @@ public class ExternalFunctionProgramBlock extends FunctionProgramBlock
private Collection<String> _skipInReblock = new HashSet<String>();
private Collection<String> _skipOutReblock = new HashSet<String>();
- public void setSkippedReblockLists( Collection<String> varsIn, Collection<String> varsOut )
- {
- _skipInReblock.clear();
- _skipOutReblock.clear();
-
- if( varsIn!=null || varsOut!=null )
- {
- if( varsIn != null )
- _skipInReblock.addAll(varsIn);
- if( varsOut != null )
- _skipOutReblock.addAll(varsOut);
-
- //regenerate instructions
- createInstructions();
- }
- }
-
-
@Override
public ArrayList<Instruction> getInstructions()
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
index be7bada..103ce70 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
@@ -81,11 +81,7 @@ public class ForProgramBlock extends ProgramBlock
public void setIncrementInstructions(ArrayList<Instruction> instructions) {
_incrementInstructions = instructions;
}
-
- public void addExitInstruction(Instruction inst) {
- _exitInstructions.add(inst);
- }
-
+
public ArrayList<Instruction> getExitInstructions() {
return _exitInstructions;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java b/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
index 136850c..63757ac 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
@@ -19,17 +19,15 @@
package org.apache.sysml.runtime.controlprogram;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.StringTokenizer;
+
import org.apache.sysml.runtime.DMLRuntimeException;
-import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
import org.apache.sysml.runtime.instructions.cp.Data;
-import org.apache.sysml.runtime.instructions.spark.data.LineageObject;
-
-import java.util.HashMap;
-import java.util.StringTokenizer;
-import java.util.Map.Entry;
-import java.util.Set;
/**
* Replaces <code>HashMap⟨String, Data⟩</code> as the table of
@@ -85,13 +83,6 @@ public class LocalVariableMap implements Cloneable
localMap.put( name, val );
}
- public void putAll( LocalVariableMap vars )
- {
- if( vars == this || vars == null )
- return;
- localMap.putAll (vars.localMap);
- }
-
public Data remove( String name )
{
return localMap.remove( name );
@@ -107,31 +98,6 @@ public class LocalVariableMap implements Cloneable
return localMap.containsValue(d);
}
- public boolean hasReferences( LineageObject bo )
- {
- for( Data tmpdat : localMap.values() )
- if ( tmpdat instanceof MatrixObject ) {
- MatrixObject mo = (MatrixObject)tmpdat;
- if( mo.getBroadcastHandle()==bo || mo.getRDDHandle()==bo )
- return true;
- }
- return false;
- }
-
- public int getNumReferences( Data d, boolean earlyAbort )
- {
- if ( d == null )
- return 0;
-
- int refCount = 0;
- for( Data tmpdat : localMap.values() )
- if ( tmpdat == d )
- if( ++refCount > 1 && earlyAbort )
- return refCount;
-
- return refCount;
- }
-
public String serialize()
throws DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
index e1986c8..eb504ca 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
@@ -432,16 +432,8 @@ public class ProgramBlock
public int getBeginColumn() { return _beginColumn; }
public int getEndLine() { return _endLine; }
public int getEndColumn() { return _endColumn; }
-
- public String printErrorLocation(){
- return "ERROR: line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
-
+
public String printBlockErrorLocation(){
return "ERROR: Runtime error in program block generated from statement block between lines " + _beginLine + " and " + _endLine + " -- ";
}
-
- public String printWarningLocation(){
- return "WARNING: line " + _beginLine + ", column " + _beginColumn + " -- ";
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
index b77b9ea..c435884 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
@@ -69,11 +69,7 @@ public class WhileProgramBlock extends ProgramBlock
public void setExitInstructions1(ArrayList<Instruction> predicate) {
_predicate = predicate;
}
-
- public void addExitInstruction(Instruction inst) {
- _exitInstructions.add(inst);
- }
-
+
public ArrayList<Instruction> getPredicate() {
return _predicate;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
index a03f9d3..f40ae62 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
@@ -51,7 +51,6 @@ public class CacheStatistics
}
//hit statistics (for acquire read)
- private static AtomicLong _numHitsTotal = null;
private static AtomicLong _numHitsMem = null;
private static AtomicLong _numHitsFSBuff = null;
private static AtomicLong _numHitsFS = null;
@@ -75,7 +74,6 @@ public class CacheStatistics
public static void reset()
{
- _numHitsTotal = new AtomicLong(0);
_numHitsMem = new AtomicLong(0);
_numHitsFSBuff = new AtomicLong(0);
_numHitsFS = new AtomicLong(0);
@@ -90,22 +88,7 @@ public class CacheStatistics
_ctimeRelease = new AtomicLong(0);
_ctimeExport = new AtomicLong(0);
}
-
- public static void incrementTotalHits()
- {
- _numHitsTotal.incrementAndGet();
- }
-
- public static void incrementTotalHits(int delta)
- {
- _numHitsTotal.addAndGet(delta);
- }
-
- public static long getTotalHits()
- {
- return _numHitsTotal.get();
- }
-
+
public static void incrementMemHits()
{
_numHitsMem.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
index 251b04f..325fa03 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
@@ -138,13 +138,7 @@ public class ExecutionContext
{
return _variables.get(varname).getMetaData();
}
-
- public void removeMetaData(String varname)
- throws DMLRuntimeException
- {
- _variables.get(varname).removeMetaData();
- }
-
+
public MatrixObject getMatrixObject(String varname)
throws DMLRuntimeException
{
@@ -243,24 +237,6 @@ public class ExecutionContext
}
/**
- * Allocates a sparse matrix in CSR format on the GPU.
- * Assumes that mat.getNumRows() returns a valid number
- *
- * @param varName variable name
- * @param nnz number of non zeroes
- * @return matrix object
- * @throws DMLRuntimeException if DMLRuntimeException occurs
- */
- public MatrixObject getSparseMatrixOutputForGPUInstruction(String varName, long nnz)
- throws DMLRuntimeException
- {
- MatrixObject mo = allocateGPUMatrixObject(varName);
- mo.getMatrixCharacteristics().setNonZeros(nnz);
- mo.getGPUObject().acquireDeviceModifySparse();
- return mo;
- }
-
- /**
* Allocates the {@link GPUObject} for a given LOPS Variable (eg. _mVar3)
* @param varName variable name
* @return matrix object
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/1ab2d7e6/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
index 8a65267..a9ca2c3 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
@@ -50,7 +50,6 @@ import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyze
import org.apache.sysml.runtime.instructions.cp.Data;
import org.apache.sysml.runtime.instructions.spark.CheckpointSPInstruction;
import org.apache.sysml.runtime.instructions.spark.SPInstruction;
-import org.apache.sysml.runtime.instructions.spark.data.BlockPartitioner;
import org.apache.sysml.runtime.instructions.spark.data.BroadcastObject;
import org.apache.sysml.runtime.instructions.spark.data.LineageObject;
import org.apache.sysml.runtime.instructions.spark.data.PartitionedBlock;
@@ -610,17 +609,6 @@ public class SparkExecutionContext extends ExecutionContext
return bret;
}
- public BlockPartitioner getPartitionerForRDDVariable(String varname)
- throws DMLRuntimeException
- {
- //get input rdd and matrix characteristics
- JavaPairRDD<MatrixIndexes,MatrixBlock> in = getBinaryBlockRDDHandleForVariable(varname);
- MatrixCharacteristics mc = getMatrixCharacteristics(varname);
-
- //create tile-based matrix partitioner
- return new BlockPartitioner(mc, in.partitions().size());
- }
-
/**
* Keep the output rdd of spark rdd operations as meta data of matrix/frame
* objects in the symbol table.