You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2017/10/13 03:46:37 UTC
[8/8] systemml git commit: [MINOR] Cleanup various issues raised by
static code analysis, part 3
[MINOR] Cleanup various issues raised by static code analysis, part 3
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/e106966a
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/e106966a
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/e106966a
Branch: refs/heads/master
Commit: e106966a976520ac9e7059f730d52ed4021dc114
Parents: cf95849
Author: Matthias Boehm <mb...@gmail.com>
Authored: Thu Oct 12 20:41:29 2017 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Thu Oct 12 20:46:44 2017 -0700
----------------------------------------------------------------------
.../sysml/api/mlcontext/FrameMetadata.java | 7 +-
.../org/apache/sysml/conf/CompilerConfig.java | 1 +
.../java/org/apache/sysml/conf/DMLConfig.java | 1 +
.../apache/sysml/debug/DMLProgramCounter.java | 1 +
src/main/java/org/apache/sysml/hops/Hop.java | 9 +-
.../sysml/hops/ParameterizedBuiltinOp.java | 5 -
.../sysml/hops/codegen/cplan/CNodeTpl.java | 1 +
.../hops/codegen/template/TemplateMultiAgg.java | 1 +
.../codegen/template/TemplateOuterProduct.java | 1 +
.../java/org/apache/sysml/lops/Aggregate.java | 6 +-
src/main/java/org/apache/sysml/lops/Append.java | 2 +-
.../java/org/apache/sysml/lops/AppendG.java | 2 +
.../org/apache/sysml/lops/AppendGAlignedSP.java | 1 +
.../java/org/apache/sysml/lops/AppendM.java | 4 +
.../java/org/apache/sysml/lops/AppendR.java | 2 +
.../org/apache/sysml/lops/BinaryUAggChain.java | 2 +-
.../org/apache/sysml/lops/CombineBinary.java | 6 +-
.../org/apache/sysml/lops/CombineTernary.java | 1 +
.../org/apache/sysml/lops/CombineUnary.java | 6 +-
.../apache/sysml/lops/ConvolutionTransform.java | 1 +
.../sysml/lops/CumulativeOffsetBinary.java | 1 +
src/main/java/org/apache/sysml/lops/Data.java | 2 +
src/main/java/org/apache/sysml/lops/Lop.java | 2 +-
.../java/org/apache/sysml/lops/MapMult.java | 1 +
.../org/apache/sysml/lops/MapMultChain.java | 1 +
.../java/org/apache/sysml/lops/PMapMult.java | 1 +
.../org/apache/sysml/lops/PartialAggregate.java | 1 +
src/main/java/org/apache/sysml/lops/RepMat.java | 2 +-
.../org/apache/sysml/lops/UAggOuterChain.java | 2 +-
.../apache/sysml/lops/WeightedCrossEntropy.java | 1 +
.../sysml/lops/WeightedCrossEntropyR.java | 1 +
.../org/apache/sysml/lops/WeightedDivMM.java | 1 +
.../org/apache/sysml/lops/WeightedDivMMR.java | 1 +
.../org/apache/sysml/lops/WeightedSigmoid.java | 1 +
.../org/apache/sysml/lops/WeightedSigmoidR.java | 1 +
.../apache/sysml/lops/WeightedSquaredLoss.java | 1 +
.../apache/sysml/lops/WeightedSquaredLossR.java | 1 +
.../org/apache/sysml/lops/WeightedUnaryMM.java | 1 +
.../org/apache/sysml/lops/WeightedUnaryMMR.java | 1 +
.../sysml/parser/AssignmentStatement.java | 13 +--
.../apache/sysml/parser/BinaryExpression.java | 2 +
.../apache/sysml/parser/BooleanExpression.java | 2 +
.../apache/sysml/parser/BooleanIdentifier.java | 2 +
.../sysml/parser/BuiltinFunctionExpression.java | 2 +
.../sysml/parser/ConditionalPredicate.java | 1 +
.../org/apache/sysml/parser/DMLProgram.java | 1 +
.../org/apache/sysml/parser/DataExpression.java | 2 +
.../org/apache/sysml/parser/DataIdentifier.java | 1 +
.../apache/sysml/parser/DoubleIdentifier.java | 2 +
.../org/apache/sysml/parser/ForStatement.java | 4 +
.../apache/sysml/parser/ForStatementBlock.java | 8 +-
.../sysml/parser/FunctionCallIdentifier.java | 7 +-
.../apache/sysml/parser/FunctionStatement.java | 5 +-
.../sysml/parser/FunctionStatementBlock.java | 9 +-
.../org/apache/sysml/parser/IfStatement.java | 6 +-
.../apache/sysml/parser/IfStatementBlock.java | 4 +-
.../apache/sysml/parser/ImportStatement.java | 9 +-
.../apache/sysml/parser/IndexedIdentifier.java | 5 +-
.../org/apache/sysml/parser/IntIdentifier.java | 3 +-
.../apache/sysml/parser/IterablePredicate.java | 2 +
.../sysml/parser/MultiAssignmentStatement.java | 17 ++--
.../apache/sysml/parser/OutputStatement.java | 8 +-
.../ParameterizedBuiltinFunctionExpression.java | 2 +
.../org/apache/sysml/parser/PathStatement.java | 12 ++-
.../org/apache/sysml/parser/PrintStatement.java | 4 +
.../sysml/parser/RelationalExpression.java | 3 +-
.../org/apache/sysml/parser/StatementBlock.java | 6 +-
.../apache/sysml/parser/StringIdentifier.java | 3 +-
.../org/apache/sysml/parser/VariableSet.java | 1 +
.../org/apache/sysml/parser/WhileStatement.java | 5 +-
.../sysml/parser/WhileStatementBlock.java | 6 +-
.../sysml/parser/dml/DmlSyntacticValidator.java | 3 +-
.../parser/pydml/PydmlSyntacticValidator.java | 3 +-
.../runtime/codegen/SpoofOuterProduct.java | 1 +
.../ExternalFunctionProgramBlock.java | 1 +
.../ExternalFunctionProgramBlockCP.java | 15 ++-
.../runtime/controlprogram/ForProgramBlock.java | 8 +-
.../controlprogram/FunctionProgramBlock.java | 2 +-
.../runtime/controlprogram/IfProgramBlock.java | 8 +-
.../controlprogram/LocalVariableMap.java | 6 +-
.../controlprogram/ParForProgramBlock.java | 30 +++---
.../sysml/runtime/controlprogram/Program.java | 14 +--
.../runtime/controlprogram/ProgramBlock.java | 4 +-
.../controlprogram/WhileProgramBlock.java | 6 +-
.../controlprogram/caching/CacheableData.java | 5 +-
.../controlprogram/caching/MatrixObject.java | 2 +-
.../context/ExecutionContext.java | 36 +++----
.../context/SparkExecutionContext.java | 26 +++---
.../DataPartitionerRemoteSparkMapper.java | 2 +-
.../controlprogram/parfor/LocalTaskQueue.java | 2 +-
.../controlprogram/parfor/ProgramConverter.java | 55 +++++------
.../controlprogram/parfor/RemoteDPParForMR.java | 2 +-
.../parfor/RemoteDPParForSpark.java | 6 +-
.../parfor/RemoteDPParForSparkWorker.java | 10 +-
.../parfor/RemoteParForColocatedFileSplit.java | 22 ++---
.../controlprogram/parfor/RemoteParForMR.java | 2 +-
.../parfor/RemoteParForSparkWorker.java | 4 +-
.../parfor/RemoteParForUtils.java | 4 +-
.../parfor/RemoteParWorkerMapper.java | 7 +-
.../controlprogram/parfor/ResultMerge.java | 18 +---
.../parfor/ResultMergeLocalMemory.java | 5 +-
.../parfor/ResultMergeRemoteMR.java | 25 ++---
.../parfor/ResultMergeRemoteReducer.java | 4 +-
.../parfor/ResultMergeRemoteSpark.java | 4 +-
.../parfor/ResultMergeRemoteSparkWCompare.java | 2 +-
.../runtime/controlprogram/parfor/Task.java | 25 ++---
.../parfor/TaskPartitionerFactoring.java | 4 +-
.../parfor/TaskPartitionerFixedsize.java | 3 +-
.../parfor/mqo/MergedMRJobInstruction.java | 6 +-
.../parfor/mqo/PiggybackingWorker.java | 4 +-
.../mqo/PiggybackingWorkerTimeSequential.java | 2 +-
.../PiggybackingWorkerUtilDecayParallel.java | 4 +-
.../mqo/PiggybackingWorkerUtilTimeParallel.java | 2 +-
.../parfor/mqo/RuntimePiggybacking.java | 8 +-
.../controlprogram/parfor/opt/OptNode.java | 13 ++-
.../parfor/opt/OptTreeConverter.java | 8 +-
.../parfor/opt/OptTreePlanChecker.java | 2 +-
.../parfor/opt/OptTreePlanMapping.java | 2 +-
.../parfor/opt/OptTreePlanMappingAbstract.java | 41 +++-----
.../parfor/opt/OptTreePlanMappingRuntime.java | 28 ++----
.../parfor/opt/OptimizationWrapper.java | 4 +-
.../parfor/opt/OptimizerConstrained.java | 6 +-
.../parfor/opt/OptimizerRuleBased.java | 47 +++++-----
.../parfor/opt/ProgramRecompiler.java | 4 +-
.../parfor/stat/StatisticMonitor.java | 6 +-
.../sysml/runtime/functionobjects/Builtin.java | 3 +-
.../sysml/runtime/functionobjects/COV.java | 2 +
.../sysml/runtime/functionobjects/CTable.java | 13 +--
.../runtime/functionobjects/KahanPlus.java | 1 +
.../sysml/runtime/functionobjects/Mean.java | 3 +-
.../functionobjects/OffsetColumnIndex.java | 1 +
.../functionobjects/ParameterizedBuiltin.java | 7 +-
.../sysml/runtime/functionobjects/Plus.java | 3 +-
.../instructions/CPInstructionParser.java | 6 +-
.../sysml/runtime/instructions/Instruction.java | 1 +
.../instructions/MRInstructionParser.java | 2 +-
.../runtime/instructions/MRJobInstruction.java | 5 +-
.../instructions/SPInstructionParser.java | 2 +-
.../instructions/cp/BreakPointInstruction.java | 3 +-
.../runtime/instructions/cp/CM_COV_Object.java | 5 +-
.../cp/FunctionCallCPInstruction.java | 4 -
.../runtime/instructions/cp/KahanObject.java | 4 +-
.../cp/ParameterizedBuiltinCPInstruction.java | 2 +-
.../cp/ScalarBuiltinMultipleCPInstruction.java | 2 +-
.../gpu/context/ExecutionConfig.java | 2 +-
.../instructions/gpu/context/JCudaKernels.java | 2 +-
.../instructions/mr/AppendMInstruction.java | 2 +-
.../mr/GroupedAggregateMInstruction.java | 2 +-
.../mr/ParameterizedBuiltinMRInstruction.java | 2 +-
.../mr/RangeBasedReIndexInstruction.java | 2 +-
.../mr/RemoveEmptyMRInstruction.java | 2 +-
.../instructions/mr/ReorgInstruction.java | 2 +-
.../instructions/mr/ScalarInstruction.java | 1 +
.../spark/AggregateTernarySPInstruction.java | 4 +-
.../spark/AggregateUnarySPInstruction.java | 4 +-
.../spark/AppendGAlignedSPInstruction.java | 4 +-
.../spark/AppendGSPInstruction.java | 21 ++---
.../instructions/spark/CpmmSPInstruction.java | 6 +-
.../spark/CumulativeAggregateSPInstruction.java | 2 +-
.../spark/CumulativeOffsetSPInstruction.java | 8 +-
.../spark/FrameAppendMSPInstruction.java | 2 +-
.../spark/FrameAppendRSPInstruction.java | 7 +-
.../spark/FrameIndexingSPInstruction.java | 18 ++--
.../instructions/spark/MapmmSPInstruction.java | 22 ++---
.../spark/MatrixAppendMSPInstruction.java | 22 ++---
.../spark/MatrixIndexingSPInstruction.java | 28 +++---
.../spark/MatrixReshapeSPInstruction.java | 2 +-
.../instructions/spark/PMapmmSPInstruction.java | 8 +-
.../ParameterizedBuiltinSPInstruction.java | 22 ++---
.../instructions/spark/PmmSPInstruction.java | 6 +-
.../spark/QuaternarySPInstruction.java | 18 ++--
.../instructions/spark/RandSPInstruction.java | 40 ++++----
.../instructions/spark/ReorgSPInstruction.java | 12 +--
.../instructions/spark/RmmSPInstruction.java | 10 +-
.../spark/TernarySPInstruction.java | 27 +++---
.../instructions/spark/Tsmm2SPInstruction.java | 12 +--
.../spark/UaggOuterChainSPInstruction.java | 14 +--
.../instructions/spark/WriteSPInstruction.java | 4 +-
.../spark/data/BroadcastObject.java | 2 +-
.../instructions/spark/data/LineageObject.java | 2 +-
.../spark/data/PartitionedBlock.java | 2 +-
.../functions/ConvertFrameBlockToIJVLines.java | 3 +-
.../functions/ConvertStringToLongTextPair.java | 2 +-
.../spark/functions/CopyBinaryCellFunction.java | 2 +-
.../spark/functions/CopyBlockPairFunction.java | 2 +-
.../functions/CopyFrameBlockPairFunction.java | 4 +-
.../spark/functions/CopyTextInputFunction.java | 2 +-
.../functions/ExtractBlockForBinaryReblock.java | 4 +-
.../spark/functions/ExtractGroup.java | 6 +-
.../spark/functions/ExtractGroupNWeights.java | 4 +-
.../spark/functions/GetMIMBFromRow.java | 7 +-
.../MatrixVectorBinaryOpPartitionFunction.java | 2 +-
.../functions/OuterVectorBinaryOpFunction.java | 3 +-
.../spark/functions/ReorgMapFunction.java | 5 +-
.../spark/functions/ReplicateBlockFunction.java | 8 +-
.../functions/ReplicateVectorFunction.java | 7 +-
.../spark/utils/FrameRDDConverterUtils.java | 45 +++++----
.../spark/utils/RDDConverterUtils.java | 59 +++++-------
.../instructions/spark/utils/RDDSortUtils.java | 47 +++++-----
.../instructions/spark/utils/SparkUtils.java | 25 +++--
.../io/FrameReaderBinaryBlockParallel.java | 6 +-
.../sysml/runtime/io/FrameReaderTextCSV.java | 3 +-
.../runtime/io/FrameReaderTextCSVParallel.java | 13 ++-
.../runtime/io/FrameReaderTextCellParallel.java | 4 +-
.../io/FrameWriterBinaryBlockParallel.java | 2 +-
.../runtime/io/FrameWriterTextCSVParallel.java | 2 +-
.../runtime/io/FrameWriterTextCellParallel.java | 2 +-
.../sysml/runtime/io/IOUtilFunctions.java | 4 +-
.../apache/sysml/runtime/io/MatrixReader.java | 2 +-
.../sysml/runtime/io/ReaderBinaryBlock.java | 2 +-
.../runtime/io/ReaderBinaryBlockParallel.java | 2 +-
.../apache/sysml/runtime/io/ReaderTextCSV.java | 2 +-
.../sysml/runtime/io/ReaderTextCSVParallel.java | 4 +-
.../runtime/io/ReaderTextCellParallel.java | 2 +-
.../runtime/io/WriterBinaryBlockParallel.java | 2 +-
.../runtime/io/WriterMatrixMarketParallel.java | 2 +-
.../apache/sysml/runtime/io/WriterTextCSV.java | 2 +-
.../sysml/runtime/io/WriterTextCSVParallel.java | 3 +-
.../runtime/io/WriterTextCellParallel.java | 2 +-
.../sysml/runtime/matrix/CSVReblockMR.java | 10 +-
.../apache/sysml/runtime/matrix/CombineMR.java | 3 +-
.../runtime/matrix/MatrixCharacteristics.java | 4 +-
.../org/apache/sysml/runtime/matrix/SortMR.java | 98 ++++++++++----------
.../matrix/data/AddDummyWeightConverter.java | 3 +-
.../data/BinaryBlockToBinaryCellConverter.java | 3 +-
.../data/BinaryBlockToRowBlockConverter.java | 2 +-
.../data/BinaryBlockToTextCellConverter.java | 2 +-
.../data/BinaryCellToRowBlockConverter.java | 2 +-
.../matrix/data/BinaryCellToTextConverter.java | 2 +-
.../sysml/runtime/matrix/data/CM_N_COVCell.java | 6 +-
.../matrix/data/ConvolutionParameters.java | 1 +
.../sysml/runtime/matrix/data/FrameBlock.java | 52 +++++++++--
.../apache/sysml/runtime/matrix/data/IJV.java | 1 +
.../runtime/matrix/data/IdenticalConverter.java | 3 +-
.../sysml/runtime/matrix/data/LibMatrixAgg.java | 12 +--
.../data/LibMatrixCuDNNInputRowFetcher.java | 10 +-
.../runtime/matrix/data/LibMatrixDatagen.java | 2 +-
.../runtime/matrix/data/LibMatrixMult.java | 20 ++--
.../runtime/matrix/data/LibMatrixReorg.java | 14 +--
.../sysml/runtime/matrix/data/MatrixBlock.java | 17 +++-
.../sysml/runtime/matrix/data/MatrixCell.java | 3 +-
.../sysml/runtime/matrix/data/MatrixValue.java | 6 +-
.../matrix/data/OperationsOnMatrixValues.java | 10 +-
.../sysml/runtime/matrix/data/PartialBlock.java | 4 +-
.../runtime/matrix/data/SparseBlockCOO.java | 1 +
.../runtime/matrix/data/SparseRowScalar.java | 3 +
.../sysml/runtime/matrix/data/Tagged.java | 4 +-
.../matrix/data/TaggedFirstSecondIndexes.java | 18 ++--
.../matrix/data/TaggedMatrixIndexes.java | 2 +
.../matrix/data/TaggedTripleIndexes.java | 12 +--
.../data/TextCellToRowBlockConverter.java | 3 +-
.../matrix/data/TextToBinaryCellConverter.java | 3 +-
.../runtime/matrix/data/TripleIndexes.java | 12 +--
.../matrix/data/UnPaddedOutputFormat.java | 2 +-
.../sysml/runtime/matrix/data/WeightedCell.java | 19 ++--
.../data/WeightedCellToSortInputConverter.java | 3 +-
.../sysml/runtime/matrix/data/WeightedPair.java | 7 +-
.../matrix/data/hadoopfix/MultipleInputs.java | 4 +-
.../runtime/matrix/mapred/CMCOVMRMapper.java | 2 +
.../runtime/matrix/mapred/CMCOVMRReducer.java | 1 +
.../runtime/matrix/mapred/CSVReblockMapper.java | 2 +-
.../runtime/matrix/mapred/CSVWriteMapper.java | 1 +
.../runtime/matrix/mapred/CachedValueMap.java | 2 +-
.../matrix/mapred/FrameReblockBuffer.java | 2 +-
.../runtime/matrix/mapred/GMRCombiner.java | 3 +-
.../sysml/runtime/matrix/mapred/GMRMapper.java | 4 +-
.../matrix/mapred/GroupedAggMRMapper.java | 3 +-
.../matrix/mapred/IndexedMatrixValue.java | 4 +-
.../runtime/matrix/mapred/MMCJMRCache.java | 4 +-
.../mapred/MMCJMRCombinerReducerBase.java | 2 +-
.../runtime/matrix/mapred/MMCJMRMapper.java | 1 +
.../runtime/matrix/mapred/MMRJMRMapper.java | 1 +
.../runtime/matrix/mapred/MMRJMRReducer.java | 7 +-
.../mapred/MRBaseForCommonInstructions.java | 2 +-
.../matrix/mapred/MRJobConfiguration.java | 2 +-
.../sysml/runtime/matrix/mapred/MapperBase.java | 1 +
.../sysml/runtime/matrix/mapred/ReduceBase.java | 2 +
.../runtime/matrix/sort/CompactInputFormat.java | 4 +-
.../matrix/sort/CompactOutputFormat.java | 23 +++--
.../matrix/sort/PickFromCompactInputFormat.java | 14 +--
.../matrix/sort/SamplingSortMRInputFormat.java | 13 ++-
.../runtime/matrix/sort/ValueSortReducer.java | 4 +-
.../transform/decode/DecoderFactory.java | 2 +-
.../runtime/transform/decode/DecoderRecode.java | 2 +-
.../transform/encode/EncoderFactory.java | 2 +-
.../transform/encode/EncoderMVImpute.java | 11 ++-
.../runtime/transform/encode/EncoderRecode.java | 7 +-
.../runtime/transform/meta/TfMetaUtils.java | 10 +-
.../runtime/transform/meta/TfOffsetMap.java | 4 +-
.../sysml/runtime/util/NormalPRNGenerator.java | 13 +--
.../sysml/runtime/util/PoissonPRNGenerator.java | 12 +--
.../sysml/runtime/util/UniformPRNGenerator.java | 13 +--
.../ExternalFunctionInvocationInstruction.java | 7 +-
.../test/integration/AutomatedTestBase.java | 9 +-
.../test/integration/applications/ID3Test.java | 12 +--
.../BivariateCategoricalCategoricallTest.java | 43 ++++-----
.../BivariateOrdinalOrdinalTest.java | 29 +++---
.../BivariateScaleCategoricalTest.java | 27 ++----
.../BivariateScaleScaleTest.java | 19 ++--
.../parfor/ParForBivariateStatsTest.java | 21 +----
.../parfor/ParForCVMulticlassSVMTest.java | 10 +-
.../parfor/ParForUnivariateStatsTest.java | 7 +-
.../UltraSparseMRMatrixMultiplicationTest.java | 13 +--
.../FullIntegerDivisionTest.java | 31 ++-----
.../binary/matrix_full_other/FullPowerTest.java | 23 +----
.../functions/codegen/CPlanComparisonTest.java | 2 +-
.../codegen/CPlanVectorPrimitivesTest.java | 6 +-
.../compress/BasicCompressionTest.java | 7 +-
.../functions/compress/BasicGetValueTest.java | 7 +-
.../compress/BasicMatrixAppendTest.java | 7 +-
.../compress/BasicMatrixCentralMomentTest.java | 7 +-
.../compress/BasicMatrixMultChainTest.java | 8 +-
.../compress/BasicMatrixQuantileTest.java | 7 +-
.../BasicMatrixTransposeSelfMultTest.java | 7 +-
.../compress/BasicMatrixVectorMultTest.java | 7 +-
.../BasicScalarOperationsSparseUnsafeTest.java | 7 +-
.../compress/BasicScalarOperationsTest.java | 7 +-
.../BasicTransposeSelfLeftMatrixMultTest.java | 7 +-
.../compress/BasicUnaryAggregateTest.java | 6 +-
.../compress/BasicVectorMatrixMultTest.java | 7 +-
.../compress/CompressedSerializationTest.java | 8 +-
.../compress/LargeCompressionTest.java | 7 +-
.../compress/LargeMatrixVectorMultTest.java | 7 +-
.../compress/LargeParMatrixVectorMultTest.java | 7 +-
.../compress/LargeParUnaryAggregateTest.java | 8 +-
.../compress/LargeVectorMatrixMultTest.java | 7 +-
.../functions/compress/ParCompressionTest.java | 7 +-
.../compress/ParMatrixMultChainTest.java | 8 +-
.../compress/ParMatrixVectorMultTest.java | 7 +-
.../ParTransposeSelfLeftMatrixMultTest.java | 7 +-
.../compress/ParUnaryAggregateTest.java | 8 +-
.../compress/ParVectorMatrixMultTest.java | 7 +-
.../functions/data/FullReblockTest.java | 28 +-----
.../functions/external/DynProjectTest.java | 23 +----
.../functions/frame/FrameAppendDistTest.java | 2 +-
.../functions/frame/FrameConverterTest.java | 33 ++-----
.../functions/frame/FrameIndexingDistTest.java | 2 +-
.../functions/frame/FrameMatrixCastingTest.java | 25 +----
.../functions/frame/FrameMatrixReblockTest.java | 31 +------
.../functions/frame/FrameMatrixWriteTest.java | 12 +--
.../functions/frame/FrameSchemaReadTest.java | 16 +---
.../functions/io/SeqParReadTest.java | 16 +---
.../functions/jmlc/FrameCastingTest.java | 4 +-
.../functions/jmlc/FrameDecodeTest.java | 4 +-
.../functions/jmlc/FrameEncodeTest.java | 4 +-
.../functions/jmlc/FrameIndexingAppendTest.java | 4 +-
.../functions/jmlc/FrameLeftIndexingTest.java | 4 +-
.../functions/jmlc/FrameTransformTest.java | 4 +-
.../functions/jmlc/MulticlassSVMScoreTest.java | 2 +-
.../functions/jmlc/ReuseModelVariablesTest.java | 4 +-
.../DataFrameVectorFrameConversionTest.java | 2 +-
.../mlcontext/DataFrameVectorScriptTest.java | 2 +-
.../functions/mlcontext/FrameTest.java | 2 +-
.../parfor/ParForNaNResultMergeTest.java | 2 +-
.../parfor/ParForRulebasedOptimizerTest.java | 22 +----
.../recompile/RandJobRecompileTest.java | 15 +--
.../sparse/SparseBlockGetFirstIndex.java | 10 +-
.../sparse/SparseBlockMemEstimate.java | 9 +-
.../functions/ternary/CTableSequenceTest.java | 21 +----
.../functions/ternary/TableOutputTest.java | 20 +---
.../transform/TransformEncodeDecodeTest.java | 8 +-
.../functions/unary/matrix/ReplaceTest.java | 4 +-
.../functions/unary/scalar/StopTestCtrlStr.java | 3 +-
.../mlcontext/MLContextMultipleScriptsTest.java | 2 +-
.../mlcontext/MLContextScratchCleanupTest.java | 2 +-
.../MLContextUnivariateStatisticsTest.java | 2 +-
.../org/apache/sysml/test/utils/TestUtils.java | 38 ++++----
367 files changed, 1231 insertions(+), 1668 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/api/mlcontext/FrameMetadata.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/mlcontext/FrameMetadata.java b/src/main/java/org/apache/sysml/api/mlcontext/FrameMetadata.java
index 67d7ab9..615e946 100644
--- a/src/main/java/org/apache/sysml/api/mlcontext/FrameMetadata.java
+++ b/src/main/java/org/apache/sysml/api/mlcontext/FrameMetadata.java
@@ -508,12 +508,9 @@ public class FrameMetadata extends Metadata {
* @param matrixCharacteristics
* the frame metadata as a MatrixCharacteristics object
*/
+ @Override
public void setMatrixCharacteristics(MatrixCharacteristics matrixCharacteristics) {
- this.numRows = matrixCharacteristics.getRows();
- this.numColumns = matrixCharacteristics.getCols();
- this.numNonZeros = matrixCharacteristics.getNonZeros();
- this.numRowsPerBlock = matrixCharacteristics.getRowsPerBlock();
- this.numColumnsPerBlock = matrixCharacteristics.getColsPerBlock();
+ super.setMatrixCharacteristics(matrixCharacteristics);
}
/**
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/conf/CompilerConfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/conf/CompilerConfig.java b/src/main/java/org/apache/sysml/conf/CompilerConfig.java
index 9dba923..bafe0ce 100644
--- a/src/main/java/org/apache/sysml/conf/CompilerConfig.java
+++ b/src/main/java/org/apache/sysml/conf/CompilerConfig.java
@@ -134,6 +134,7 @@ public class CompilerConfig
return -1;
}
+ @Override
public CompilerConfig clone() {
return new CompilerConfig(this);
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 6eaa52e..0b73ab0 100644
--- a/src/main/java/org/apache/sysml/conf/DMLConfig.java
+++ b/src/main/java/org/apache/sysml/conf/DMLConfig.java
@@ -458,6 +458,7 @@ public class DMLConfig
return _defaultVals.get( key );
}
+ @Override
public DMLConfig clone() {
DMLConfig conf = new DMLConfig();
conf._fileName = _fileName;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java b/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
index 8a912ba..3dac61c 100644
--- a/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
+++ b/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
@@ -155,6 +155,7 @@ public class DMLProgramCounter {
* Displays a pretty-printed program counter
* @return Current pc
*/
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(DMLProgram.constructFunctionKey(this.namespace, this.fname));
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 6547e2f..23d4346 100644
--- a/src/main/java/org/apache/sysml/hops/Hop.java
+++ b/src/main/java/org/apache/sysml/hops/Hop.java
@@ -453,13 +453,11 @@ public abstract class Hop implements ParseInfo
return offset;
}
- public void setOutputEmptyBlocks(boolean flag)
- {
+ public void setOutputEmptyBlocks(boolean flag) {
_outputEmptyBlocks = flag;
}
- public boolean isOutputEmptyBlocks()
- {
+ public boolean isOutputEmptyBlocks() {
return _outputEmptyBlocks;
}
@@ -1854,7 +1852,8 @@ public abstract class Hop implements ParseInfo
_endLine = that._endLine;
_endColumn = that._endColumn;
}
-
+
+ @Override
public abstract Object clone() throws CloneNotSupportedException;
public abstract boolean compare( Hop that );
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java b/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
index b9b8649..3fd6ec0 100644
--- a/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
+++ b/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
@@ -62,7 +62,6 @@ public class ParameterizedBuiltinOp extends Hop implements MultiThreadedHop
private int _maxNumThreads = -1; //-1 for unlimited
//removeEmpty hints
- private boolean _outputEmptyBlocks = true;
private boolean _outputPermutationMatrix = false;
private boolean _bRmEmptyBC = false;
@@ -128,10 +127,6 @@ public class ParameterizedBuiltinOp extends Hop implements MultiThreadedHop
public ParamBuiltinOp getOp() {
return _op;
}
-
- public void setOutputEmptyBlocks(boolean flag) {
- _outputEmptyBlocks = flag;
- }
public void setOutputPermutationMatrix(boolean flag) {
_outputPermutationMatrix = flag;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeTpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeTpl.java b/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeTpl.java
index ab5853c..d5298ce 100644
--- a/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeTpl.java
+++ b/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeTpl.java
@@ -76,6 +76,7 @@ public abstract class CNodeTpl extends CNode implements Cloneable
return codegen(false);
}
+ @Override
public abstract CNodeTpl clone();
public abstract SpoofOutputDimsType getOutputDimType();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateMultiAgg.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateMultiAgg.java b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateMultiAgg.java
index 9b114b0..ebd6078 100644
--- a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateMultiAgg.java
+++ b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateMultiAgg.java
@@ -71,6 +71,7 @@ public class TemplateMultiAgg extends TemplateCell
return CloseType.CLOSED_INVALID;
}
+ @Override
public Pair<Hop[], CNodeTpl> constructCplan(Hop hop, CPlanMemoTable memo, boolean compileLiterals)
{
//get all root nodes for multi aggregation
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateOuterProduct.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateOuterProduct.java b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateOuterProduct.java
index cac9f9b..904fbb3 100644
--- a/src/main/java/org/apache/sysml/hops/codegen/template/TemplateOuterProduct.java
+++ b/src/main/java/org/apache/sysml/hops/codegen/template/TemplateOuterProduct.java
@@ -103,6 +103,7 @@ public class TemplateOuterProduct extends TemplateBase {
return CloseType.OPEN;
}
+ @Override
public Pair<Hop[], CNodeTpl> constructCplan(Hop hop, CPlanMemoTable memo, boolean compileLiterals)
{
//recursively process required cplan output
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/Aggregate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/Aggregate.java b/src/main/java/org/apache/sysml/lops/Aggregate.java
index 0eefb16..f90e214 100644
--- a/src/main/java/org/apache/sysml/lops/Aggregate.java
+++ b/src/main/java/org/apache/sysml/lops/Aggregate.java
@@ -81,9 +81,9 @@ public class Aggregate extends Lop
}
}
- public String toString()
- {
- return "Operation: " + operation;
+ @Override
+ public String toString() {
+ return "Operation: " + operation;
}
/**
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/Append.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/Append.java b/src/main/java/org/apache/sysml/lops/Append.java
index e224e51..f2b9896 100644
--- a/src/main/java/org/apache/sysml/lops/Append.java
+++ b/src/main/java/org/apache/sysml/lops/Append.java
@@ -62,11 +62,11 @@ public class Append extends Lop
@Override
public String toString() {
-
return " Append: ";
}
//called when append executes in CP
+ @Override
public String getInstructions(String input1, String input2, String input3, String output)
throws LopsException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/AppendG.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/AppendG.java b/src/main/java/org/apache/sysml/lops/AppendG.java
index 161dea1..b412563 100644
--- a/src/main/java/org/apache/sysml/lops/AppendG.java
+++ b/src/main/java/org/apache/sysml/lops/AppendG.java
@@ -86,6 +86,7 @@ public class AppendG extends Lop
}
//called when append executes in MR
+ @Override
public String getInstructions(int input_index1, int input_index2, int input_index3, int input_index4, int output_index)
throws LopsException
{
@@ -98,6 +99,7 @@ public class AppendG extends Lop
}
//called when append executes in SP
+ @Override
public String getInstructions(String input_index1, String input_index2, String input_index3, String input_index4, String output_index)
throws LopsException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java b/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
index ecd3192..a591c3e 100644
--- a/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
+++ b/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
@@ -64,6 +64,7 @@ public class AppendGAlignedSP extends Lop
}
//called when append executes in CP
+ @Override
public String getInstructions(String input_index1, String input_index2, String input_index3, String output_index)
throws LopsException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/AppendM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/AppendM.java b/src/main/java/org/apache/sysml/lops/AppendM.java
index aea0105..0d71319 100644
--- a/src/main/java/org/apache/sysml/lops/AppendM.java
+++ b/src/main/java/org/apache/sysml/lops/AppendM.java
@@ -79,6 +79,7 @@ public class AppendM extends Lop
}
//called when append executes in MR
+ @Override
public String getInstructions(int input_index1, int input_index2, int input_index3, int output_index)
throws LopsException
{
@@ -91,6 +92,7 @@ public class AppendM extends Lop
//called when append executes in SP
+ @Override
public String getInstructions(String input1, String input2, String input3, String output)
throws LopsException
{
@@ -124,10 +126,12 @@ public class AppendM extends Lop
return sb.toString();
}
+ @Override
public boolean usesDistributedCache() {
return true;
}
+ @Override
public int[] distributedCacheInputIndex() {
return new int[]{2}; // second input is from distributed cache
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/AppendR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/AppendR.java b/src/main/java/org/apache/sysml/lops/AppendR.java
index 8495efe..e8d55b4 100644
--- a/src/main/java/org/apache/sysml/lops/AppendR.java
+++ b/src/main/java/org/apache/sysml/lops/AppendR.java
@@ -70,6 +70,7 @@ public class AppendR extends Lop
}
//called when append executes in MR
+ @Override
public String getInstructions(int input_index1, int input_index2, int output_index)
throws LopsException
{
@@ -80,6 +81,7 @@ public class AppendR extends Lop
}
//called when append executes in CP
+ @Override
public String getInstructions(String input1, String input2, String output)
throws LopsException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java b/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
index 3203cf5..e1b8968 100644
--- a/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
+++ b/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
@@ -87,7 +87,7 @@ public class BinaryUAggChain extends Lop
}
}
-
+ @Override
public String toString() {
return "Operation = BinUaggChain";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/CombineBinary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/CombineBinary.java b/src/main/java/org/apache/sysml/lops/CombineBinary.java
index 8a13710..44ee47d 100644
--- a/src/main/java/org/apache/sysml/lops/CombineBinary.java
+++ b/src/main/java/org/apache/sysml/lops/CombineBinary.java
@@ -66,9 +66,9 @@ public class CombineBinary extends Lop
this.lps.setProducesIntermediateOutput(true);
}
- public String toString()
- {
- return "combinebinary";
+ @Override
+ public String toString() {
+ return "combinebinary";
}
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/CombineTernary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/CombineTernary.java b/src/main/java/org/apache/sysml/lops/CombineTernary.java
index d49e099..ac1a60f 100644
--- a/src/main/java/org/apache/sysml/lops/CombineTernary.java
+++ b/src/main/java/org/apache/sysml/lops/CombineTernary.java
@@ -62,6 +62,7 @@ public class CombineTernary extends Lop
this.lps.setProducesIntermediateOutput(true);
}
+ @Override
public String toString() {
return "combineternary";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/CombineUnary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/CombineUnary.java b/src/main/java/org/apache/sysml/lops/CombineUnary.java
index a3e92e7..a7f34f6 100644
--- a/src/main/java/org/apache/sysml/lops/CombineUnary.java
+++ b/src/main/java/org/apache/sysml/lops/CombineUnary.java
@@ -54,9 +54,9 @@ public class CombineUnary extends Lop
this.lps.setProperties( inputs, ExecType.MR, ExecLocation.Map, breaksAlignment, aligner, definesMRJob );
}
- public String toString()
- {
- return "combineunary";
+ @Override
+ public String toString() {
+ return "combineunary";
}
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java b/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java
index 947b019..dfc187c 100644
--- a/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java
+++ b/src/main/java/org/apache/sysml/lops/ConvolutionTransform.java
@@ -148,6 +148,7 @@ public class ConvolutionTransform extends Lop
}
}
+ @Override
public String getInstructions(String input, String bias, String output) throws LopsException {
if(operation == OperationTypes.BIAS_ADD || operation == OperationTypes.BIAS_MULTIPLY || operation == OperationTypes.RELU_BACKWARD) {
StringBuilder sb = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java b/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
index 7237d94..c9ad84c 100644
--- a/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
+++ b/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
@@ -83,6 +83,7 @@ public class CumulativeOffsetBinary extends Lop
}
}
+ @Override
public String toString() {
return "CumulativeOffsetBinary";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/Data.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/Data.java b/src/main/java/org/apache/sysml/lops/Data.java
index 56601be..7f22038 100644
--- a/src/main/java/org/apache/sysml/lops/Data.java
+++ b/src/main/java/org/apache/sysml/lops/Data.java
@@ -495,10 +495,12 @@ public class Data extends Lop
*
* @throws LopsException if LopsException occurs
*/
+ @Override
public String getInstructions() throws LopsException {
return getCreateVarInstructions(getOutputParameters().getFile_name(), getOutputParameters().getLabel());
}
+ @Override
public String getInstructions(String outputFileName) throws LopsException {
return getCreateVarInstructions(outputFileName, getOutputParameters().getLabel() );
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 48554d9..499cd59 100644
--- a/src/main/java/org/apache/sysml/lops/Lop.java
+++ b/src/main/java/org/apache/sysml/lops/Lop.java
@@ -277,7 +277,7 @@ public abstract class Lop
/**
* Method to have Lops print their state. This is for debugging purposes.
*/
-
+ @Override
public abstract String toString();
public void resetVisitStatus() {
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/MapMult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/MapMult.java b/src/main/java/org/apache/sysml/lops/MapMult.java
index d4919bc..7fb5a60 100644
--- a/src/main/java/org/apache/sysml/lops/MapMult.java
+++ b/src/main/java/org/apache/sysml/lops/MapMult.java
@@ -133,6 +133,7 @@ public class MapMult extends Lop
lps.setProperties( inputs, ExecType.SPARK, ExecLocation.ControlProgram, breaksAlignment, aligner, definesMRJob );
}
+ @Override
public String toString() {
return "Operation = MapMM";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/MapMultChain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/MapMultChain.java b/src/main/java/org/apache/sysml/lops/MapMultChain.java
index f3eb6b5..e19e522 100644
--- a/src/main/java/org/apache/sysml/lops/MapMultChain.java
+++ b/src/main/java/org/apache/sysml/lops/MapMultChain.java
@@ -120,6 +120,7 @@ public class MapMultChain extends Lop
_numThreads = k;
}
+ @Override
public String toString() {
return "Operation = MapMMChain";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/PMapMult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/PMapMult.java b/src/main/java/org/apache/sysml/lops/PMapMult.java
index e5e978d..e6bf3ac 100644
--- a/src/main/java/org/apache/sysml/lops/PMapMult.java
+++ b/src/main/java/org/apache/sysml/lops/PMapMult.java
@@ -47,6 +47,7 @@ public class PMapMult extends Lop
lps.setProperties( inputs, ExecType.SPARK, ExecLocation.ControlProgram, breaksAlignment, aligner, definesMRJob );
}
+ @Override
public String toString() {
return "Operation = PMapMM";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 0517ca5..c42e787 100644
--- a/src/main/java/org/apache/sysml/lops/PartialAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/PartialAggregate.java
@@ -277,6 +277,7 @@ public class PartialAggregate extends Lop
}
}
+ @Override
public String toString() {
return "Partial Aggregate " + operation;
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/RepMat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/RepMat.java b/src/main/java/org/apache/sysml/lops/RepMat.java
index 0303cd9..b443c80 100644
--- a/src/main/java/org/apache/sysml/lops/RepMat.java
+++ b/src/main/java/org/apache/sysml/lops/RepMat.java
@@ -62,7 +62,7 @@ public class RepMat extends Lop
lps.setProperties( inputs, ExecType.MR, ExecLocation.Map, breaksAlignment, aligner, definesMRJob );
}
-
+ @Override
public String toString() {
return "Operation = RepMat";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/UAggOuterChain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/UAggOuterChain.java b/src/main/java/org/apache/sysml/lops/UAggOuterChain.java
index 6885043..bdd4e0c 100644
--- a/src/main/java/org/apache/sysml/lops/UAggOuterChain.java
+++ b/src/main/java/org/apache/sysml/lops/UAggOuterChain.java
@@ -95,7 +95,7 @@ public class UAggOuterChain extends Lop
}
}
-
+ @Override
public String toString() {
return "Operation = UaggOuterChain";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
index a18de2d..5249eae 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
@@ -83,6 +83,7 @@ public class WeightedCrossEntropy extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedCrossEntropy";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
index b05beaf..228b9d7 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
@@ -80,6 +80,7 @@ public class WeightedCrossEntropyR extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedCrossEntropyR";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedDivMM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedDivMM.java b/src/main/java/org/apache/sysml/lops/WeightedDivMM.java
index cd6a311..758ef9e 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedDivMM.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedDivMM.java
@@ -122,6 +122,7 @@ public class WeightedDivMM extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedDivMM";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java b/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
index 7da8b3c..648551b 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
@@ -77,6 +77,7 @@ public class WeightedDivMMR extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedDivMMR";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java b/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
index df6a081..3dcc930 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
@@ -80,6 +80,7 @@ public class WeightedSigmoid extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedSigmoid";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java b/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
index da9efd1..9778168 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
@@ -77,6 +77,7 @@ public class WeightedSigmoidR extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedSigmoidR";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java b/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
index c58a804..84de064 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
@@ -85,6 +85,7 @@ public class WeightedSquaredLoss extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedSquaredLoss";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java b/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
index f55d12c..6d7127a 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
@@ -78,6 +78,7 @@ public class WeightedSquaredLossR extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedSquaredLossR";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java b/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
index 97e3cc8..8d120af 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
@@ -80,6 +80,7 @@ public class WeightedUnaryMM extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedUMM";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java b/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
index 36e4343..0a91034 100644
--- a/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
@@ -79,6 +79,7 @@ public class WeightedUnaryMMR extends Lop
}
}
+ @Override
public String toString() {
return "Operation = WeightedUMMR";
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/AssignmentStatement.java b/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
index 3d12394..9195fbd 100644
--- a/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
+++ b/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
@@ -28,22 +28,18 @@ import org.apache.sysml.debug.DMLBreakpointManager;
public class AssignmentStatement extends Statement
{
-
private ArrayList<DataIdentifier> _targetList;
private Expression _source;
// rewrites statement to support function inlining (creates deep copy)
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException {
-
// rewrite target (deep copy)
DataIdentifier newTarget = (DataIdentifier) _targetList.get(0).rewriteExpression(prefix);
-
// rewrite source (deep copy)
Expression newSource = _source.rewriteExpression(prefix);
-
// create rewritten assignment statement (deep copy)
AssignmentStatement retVal = new AssignmentStatement(newTarget, newSource, this);
-
return retVal;
}
@@ -96,15 +92,18 @@ public class AssignmentStatement extends Statement
return false;
}
-
+
+ @Override
public void initializeforwardLV(VariableSet activeIn){
//do nothing
}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo){
return lo;
}
+ @Override
public VariableSet variablesRead() {
VariableSet result = new VariableSet();
@@ -121,6 +120,7 @@ public class AssignmentStatement extends Statement
return result;
}
+ @Override
public VariableSet variablesUpdated() {
VariableSet result = new VariableSet();
@@ -132,6 +132,7 @@ public class AssignmentStatement extends Statement
return result;
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
for (int i=0; i< _targetList.size(); i++){
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BinaryExpression.java b/src/main/java/org/apache/sysml/parser/BinaryExpression.java
index 68678e7..c4f23ea 100644
--- a/src/main/java/org/apache/sysml/parser/BinaryExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BinaryExpression.java
@@ -28,6 +28,7 @@ public class BinaryExpression extends Expression
private Expression _right;
private BinaryOp _opcode;
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException{
BinaryExpression newExpr = new BinaryExpression(this._opcode, this);
newExpr.setLeft(_left.rewriteExpression(prefix));
@@ -181,6 +182,7 @@ public class BinaryExpression extends Expression
}
}
+ @Override
public String toString() {
String leftString;
String rightString;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/BooleanExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BooleanExpression.java b/src/main/java/org/apache/sysml/parser/BooleanExpression.java
index 2069c06..c16e58d 100644
--- a/src/main/java/org/apache/sysml/parser/BooleanExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BooleanExpression.java
@@ -75,6 +75,7 @@ public class BooleanExpression extends Expression
return _right;
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException{
BooleanExpression newExpr = new BooleanExpression(this._opcode, this);
newExpr.setLeft(_left.rewriteExpression(prefix));
@@ -122,6 +123,7 @@ public class BooleanExpression extends Expression
}
}
+ @Override
public String toString(){
if (_opcode == BooleanOp.NOT) {
return "(" + _opcode.toString() + " " + _left.toString() + ")";
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java b/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
index 6ca2b9f..60836cd 100644
--- a/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
@@ -52,6 +52,7 @@ public class BooleanIdentifier extends ConstIdentifier
setValueType(ValueType.BOOLEAN);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException{
return this;
}
@@ -60,6 +61,7 @@ public class BooleanIdentifier extends ConstIdentifier
return _val;
}
+ @Override
public String toString(){
return Boolean.toString(_val);
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
index d63cf7b..9a8129c 100644
--- a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
@@ -61,6 +61,7 @@ public class BuiltinFunctionExpression extends DataIdentifier
setCtxValuesAndFilename(ctx, fname);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
Expression[] newArgs = new Expression[_args.length];
for (int i = 0; i < _args.length; i++) {
@@ -1375,6 +1376,7 @@ public class BuiltinFunctionExpression extends DataIdentifier
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder(_opcode.toString() + "(");
if (_args != null) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 2a11175..a54012c 100644
--- a/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
+++ b/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
@@ -34,6 +34,7 @@ public class ConditionalPredicate implements ParseInfo
_expr = expr;
}
+ @Override
public String toString(){
return _expr.toString();
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 43be802..6fa5b98 100644
--- a/src/main/java/org/apache/sysml/parser/DMLProgram.java
+++ b/src/main/java/org/apache/sysml/parser/DMLProgram.java
@@ -131,6 +131,7 @@ public class DMLProgram
_blocks = StatementBlock.mergeStatementBlocks(_blocks);
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/DataExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DataExpression.java b/src/main/java/org/apache/sysml/parser/DataExpression.java
index a24bc53..4d14b66 100644
--- a/src/main/java/org/apache/sysml/parser/DataExpression.java
+++ b/src/main/java/org/apache/sysml/parser/DataExpression.java
@@ -380,6 +380,7 @@ public class DataExpression extends DataIdentifier
setCtxValuesAndFilename(ctx, filename);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
HashMap<String,Expression> newVarParams = new HashMap<>();
@@ -1668,6 +1669,7 @@ public class DataExpression extends DataIdentifier
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(_opcode.toString());
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 5523cec..1873549 100644
--- a/src/main/java/org/apache/sysml/parser/DataIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
@@ -34,6 +34,7 @@ public class DataIdentifier extends Identifier
setParseInfo(passed);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException{
DataIdentifier newId = new DataIdentifier(this);
String newIdName = prefix + _name;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java b/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
index b6c60fb..9e620a8 100644
--- a/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
@@ -61,6 +61,7 @@ public class DoubleIdentifier extends ConstIdentifier
setValueType(ValueType.DOUBLE);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException{
return this;
}
@@ -78,6 +79,7 @@ public class DoubleIdentifier extends ConstIdentifier
_val = v;
}
+ @Override
public String toString(){
return Double.toString(_val);
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/ForStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ForStatement.java b/src/main/java/org/apache/sysml/parser/ForStatement.java
index f1404e1..7309739 100644
--- a/src/main/java/org/apache/sysml/parser/ForStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ForStatement.java
@@ -28,6 +28,7 @@ public class ForStatement extends Statement
protected IterablePredicate _predicate;
protected ArrayList<StatementBlock> _body;
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
LOG.error(this.printErrorLocation() + "should not call rewriteStatement for ForStatement");
throw new LanguageException(this.printErrorLocation() + "should not call rewriteStatement for ForStatement");
@@ -69,6 +70,7 @@ public class ForStatement extends Statement
_body = StatementBlock.mergeStatementBlocks(_body);
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append("for ");
@@ -81,11 +83,13 @@ public class ForStatement extends Statement
return sb.toString();
}
+ @Override
public void initializeforwardLV(VariableSet activeIn) throws LanguageException{
LOG.error(this.printErrorLocation() + "should never call initializeforwardLV for ForStatement");
throw new LanguageException(this.printErrorLocation() + "should never call initializeforwardLV for ForStatement");
}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo) throws LanguageException{
LOG.error(this.printErrorLocation() + "should never call initializeforwardLV for ForStatement");
throw new LanguageException(this.printErrorLocation() + "should never call initializeforwardLV for ForStatement");
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/ForStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ForStatementBlock.java b/src/main/java/org/apache/sysml/parser/ForStatementBlock.java
index 07a51db..856e151 100644
--- a/src/main/java/org/apache/sysml/parser/ForStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/ForStatementBlock.java
@@ -182,6 +182,7 @@ public class ForStatementBlock extends StatementBlock
return ids;
}
+ @Override
public VariableSet initializeforwardLV(VariableSet activeInPassed) throws LanguageException {
ForStatement fstmt = (ForStatement)_statements.get(0);
@@ -245,6 +246,7 @@ public class ForStatementBlock extends StatementBlock
return _liveOut;
}
+ @Override
public VariableSet initializebackwardLV(VariableSet loPassed) throws LanguageException{
ForStatement fstmt = (ForStatement)_statements.get(0);
@@ -264,13 +266,12 @@ public class ForStatementBlock extends StatementBlock
}
+ @Override
public ArrayList<Hop> get_hops() throws HopsException {
-
if (_hops != null && !_hops.isEmpty()){
LOG.error(this.printBlockErrorLocation() + "there should be no HOPs associated with the ForStatementBlock");
throw new HopsException(this.printBlockErrorLocation() + "there should be no HOPs associated with the ForStatementBlock");
}
-
return _hops;
}
@@ -292,8 +293,7 @@ public class ForStatementBlock extends StatementBlock
public Lop getToLops() { return _toLops; }
public Lop getIncrementLops() { return _incrementLops; }
-
-
+ @Override
public VariableSet analyze(VariableSet loPassed) throws LanguageException{
VariableSet predVars = new VariableSet();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
index 091d8cb..420e5a6 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
@@ -52,20 +52,17 @@ public class FunctionCallIdentifier extends DataIdentifier
return _paramExprs;
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
-
ArrayList<ParameterExpression> newParameterExpressions = new ArrayList<>();
for (ParameterExpression paramExpr : _paramExprs)
newParameterExpressions.add(new ParameterExpression(paramExpr.getName(), paramExpr.getExpr().rewriteExpression(prefix)));
-
// rewrite each output expression
FunctionCallIdentifier fci = new FunctionCallIdentifier(newParameterExpressions);
fci.setParseInfo(this);
-
fci._name = this._name;
fci._namespace = this._namespace;
- fci._opcode = this._opcode;
-
+ fci._opcode = this._opcode;
return fci;
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 fdddc92..3d7960a 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionStatement.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
@@ -30,6 +30,7 @@ public class FunctionStatement extends Statement
protected ArrayList <DataIdentifier> _inputParams;
protected ArrayList <DataIdentifier> _outputParams;
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
LOG.error(this.printErrorLocation() + "should not call rewriteStatement for FunctionStatement");
throw new LanguageException(this.printErrorLocation() + "should not call rewriteStatement for FunctionStatement");
@@ -84,6 +85,7 @@ public class FunctionStatement extends Statement
_body = StatementBlock.mergeStatementBlocks(_body);
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append(_name + " = ");
@@ -110,15 +112,16 @@ public class FunctionStatement extends Statement
return sb.toString();
}
+ @Override
public void initializeforwardLV(VariableSet activeIn) throws LanguageException{
LOG.error(this.printErrorLocation() + "should never call initializeforwardLV for FunctionStatement");
throw new LanguageException(this.printErrorLocation() + "should never call initializeforwardLV for FunctionStatement");
}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo) throws LanguageException{
LOG.error(this.printErrorLocation() + "should never call initializeforwardLV for FunctionStatement");
throw new LanguageException(this.printErrorLocation() + "should never call initializeforwardLV for FunctionStatement");
-
}
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
index 833ecfa..0f91d00 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
@@ -202,14 +202,13 @@ public class FunctionStatementBlock extends StatementBlock
return ret;
}
+ @Override
public VariableSet initializeforwardLV(VariableSet activeInPassed) throws LanguageException {
-
FunctionStatement fstmt = (FunctionStatement)_statements.get(0);
if (_statements.size() > 1){
LOG.error(this.printBlockErrorLocation() + "FunctionStatementBlock should have only 1 statement (while statement)");
throw new LanguageException(this.printBlockErrorLocation() + "FunctionStatementBlock should have only 1 statement (while statement)");
}
-
_read = new VariableSet();
_gen = new VariableSet();
@@ -247,6 +246,7 @@ public class FunctionStatementBlock extends StatementBlock
return _liveOut;
}
+ @Override
public VariableSet initializebackwardLV(VariableSet loPassed) throws LanguageException{
FunctionStatement wstmt = (FunctionStatement)_statements.get(0);
@@ -266,7 +266,7 @@ public class FunctionStatementBlock extends StatementBlock
}
-
+ @Override
public ArrayList<Hop> get_hops() throws HopsException {
if (_hops != null && _hops.size() > 0){
@@ -277,13 +277,12 @@ public class FunctionStatementBlock extends StatementBlock
return _hops;
}
-
+ @Override
public VariableSet analyze(VariableSet loPassed) throws LanguageException{
LOG.error(this.printBlockErrorLocation() + "Both liveIn and liveOut variables need to be specified for liveness analysis for FunctionStatementBlock");
throw new LanguageException(this.printBlockErrorLocation() + "Both liveIn and liveOut variables need to be specified for liveness analysis for FunctionStatementBlock");
}
-
public VariableSet analyze(VariableSet liPassed, VariableSet loPassed) throws LanguageException{
VariableSet candidateLO = new VariableSet();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 cbb0c7b..1448e8a 100644
--- a/src/main/java/org/apache/sysml/parser/IfStatement.java
+++ b/src/main/java/org/apache/sysml/parser/IfStatement.java
@@ -29,6 +29,7 @@ public class IfStatement extends Statement
private ArrayList<StatementBlock> _ifBody;
private ArrayList<StatementBlock> _elseBody;
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
LOG.error(this.printErrorLocation() + "should not call rewriteStatement for IfStatement");
throw new LanguageException(this.printErrorLocation() + "should not call rewriteStatement for IfStatement");
@@ -79,16 +80,16 @@ public class IfStatement extends Statement
return true;
}
+ @Override
public void initializeforwardLV(VariableSet activeIn) throws LanguageException{
LOG.error(this.printErrorLocation() + "should never call initializeforwardLV for IfStatement");
throw new LanguageException(this.printErrorLocation() + "should never call initializeforwardLV for IfStatement");
-
}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo) throws LanguageException{
LOG.error(this.printErrorLocation() + "should never call initializeforwardLV for IfStatement");
throw new LanguageException(this.printErrorLocation() + "should never call initializeforwardLV for IfStatement");
-
}
public void mergeStatementBlocksIfBody(){
@@ -100,6 +101,7 @@ public class IfStatement extends Statement
_elseBody = StatementBlock.mergeStatementBlocks(_elseBody);
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append("if ( ");
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 1b42e08..2a66857 100644
--- a/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
@@ -455,13 +455,12 @@ public class IfStatementBlock extends StatementBlock
_predicateHops = hops;
}
+ @Override
public ArrayList<Hop> get_hops() throws HopsException{
-
if (_hops != null && _hops.size() > 0){
LOG.error(this.printBlockErrorLocation() + "error there should be no HOPs in IfStatementBlock");
throw new HopsException(this.printBlockErrorLocation() + "error there should be no HOPs in IfStatementBlock");
}
-
return _hops;
}
@@ -477,6 +476,7 @@ public class IfStatementBlock extends StatementBlock
_predicateLops = predicateLops;
}
+ @Override
public VariableSet analyze(VariableSet loPassed) throws LanguageException{
VariableSet predVars = ((IfStatement)_statements.get(0)).getConditionalPredicate().variablesRead();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/ImportStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ImportStatement.java b/src/main/java/org/apache/sysml/parser/ImportStatement.java
index 7947d0e..6b892d1 100644
--- a/src/main/java/org/apache/sysml/parser/ImportStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ImportStatement.java
@@ -73,14 +73,17 @@ public class ImportStatement extends Statement
_completePath = filePath;
}
-
+
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
LOG.error(this.printErrorLocation() + "rewriting for inlining not supported for ImportStatement");
throw new LanguageException(this.printErrorLocation() + "rewriting for inlining not supported for ImportStatement");
}
-
+
+ @Override
public void initializeforwardLV(VariableSet activeIn){}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo){
return lo;
}
@@ -100,6 +103,7 @@ public class ImportStatement extends Statement
return false;
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append(Statement.SOURCE + "(");
@@ -111,5 +115,4 @@ public class ImportStatement extends Statement
sb.append(";");
return sb.toString();
}
-
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 cb870af..9c2b2d8 100644
--- a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
@@ -527,11 +527,11 @@ public class IndexedIdentifier extends DataIdentifier
public long getOrigDim2() { return this._origDim2; }
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
-
IndexedIdentifier newIndexedIdentifier = new IndexedIdentifier(this.getName(), this._rowLowerEqualsUpper, this._colLowerEqualsUpper);
newIndexedIdentifier.setParseInfo(this);
-
+
// set dimensionality information and other Identifier specific properties for new IndexedIdentifier
newIndexedIdentifier.setProperties(this);
newIndexedIdentifier.setOriginalDimensions(this._origDim1, this._origDim2);
@@ -675,6 +675,7 @@ public class IndexedIdentifier extends DataIdentifier
return result;
}
+ @Override
public void setProperties(Identifier i){
_dataType = i.getDataType();
_valueType = i.getValueType();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/IntIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IntIdentifier.java b/src/main/java/org/apache/sysml/parser/IntIdentifier.java
index d07fbef..1e384bc 100644
--- a/src/main/java/org/apache/sysml/parser/IntIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/IntIdentifier.java
@@ -23,9 +23,9 @@ import org.antlr.v4.runtime.ParserRuleContext;
public class IntIdentifier extends ConstIdentifier
{
-
private long _val;
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException{
return this;
}
@@ -71,6 +71,7 @@ public class IntIdentifier extends ConstIdentifier
return _val;
}
+ @Override
public String toString(){
return Long.toString(_val);
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/IterablePredicate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IterablePredicate.java b/src/main/java/org/apache/sysml/parser/IterablePredicate.java
index 68274f5..ea49073 100644
--- a/src/main/java/org/apache/sysml/parser/IterablePredicate.java
+++ b/src/main/java/org/apache/sysml/parser/IterablePredicate.java
@@ -43,6 +43,7 @@ public class IterablePredicate extends Expression
setCtxValuesAndFilename(ctx, filename);
}
+ @Override
public VariableSet variablesRead() {
VariableSet result = new VariableSet();
result.addVariables(_fromExpr.variablesRead());
@@ -52,6 +53,7 @@ public class IterablePredicate extends Expression
return result;
}
+ @Override
public VariableSet variablesUpdated() {
VariableSet result = new VariableSet();
result.addVariable(_iterVar.getName(), _iterVar);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
index 3db1e56..4010a65 100644
--- a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
+++ b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
@@ -30,8 +30,9 @@ public class MultiAssignmentStatement extends Statement
{
private ArrayList<DataIdentifier> _targetList;
private Expression _source;
-
+
// rewrites statement to support function inlining (creates deep copy)
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
ArrayList<DataIdentifier> newTargetList = new ArrayList<>();
@@ -75,17 +76,17 @@ public class MultiAssignmentStatement extends Statement
return true;
}
- public void initializeforwardLV(VariableSet activeIn){}
- public VariableSet initializebackwardLV(VariableSet lo){
- return lo;
- }
+ @Override
+ public void initializeforwardLV(VariableSet activeIn) { }
+ @Override
+ public VariableSet initializebackwardLV(VariableSet lo) { return lo; }
+
+ @Override
public VariableSet variablesRead() {
VariableSet result = new VariableSet();
-
// add variables read by source expression
result.addVariables(_source.variablesRead());
-
// for any IndexedIdentifier on LHS, add variables for indexing expressions
for (int i=0; i<_targetList.size(); i++){
if (_targetList.get(i) instanceof IndexedIdentifier) {
@@ -93,10 +94,10 @@ public class MultiAssignmentStatement extends Statement
result.addVariables(target.variablesRead());
}
}
-
return result;
}
+ @Override
public VariableSet variablesUpdated() {
VariableSet result = new VariableSet();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 a636519..9105dd0 100644
--- a/src/main/java/org/apache/sysml/parser/OutputStatement.java
+++ b/src/main/java/org/apache/sysml/parser/OutputStatement.java
@@ -81,6 +81,7 @@ public class OutputStatement extends Statement
}
// rewrites statement to support function inlining (create deep copy)
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
OutputStatement newStatement = new OutputStatement(null, Expression.DataOp.WRITE, this);
@@ -107,11 +108,12 @@ public class OutputStatement extends Statement
return _paramsExpr.getVarParam(key);
}
+ @Override
public void initializeforwardLV(VariableSet activeIn){}
- public VariableSet initializebackwardLV(VariableSet lo){
- return lo;
- }
+ @Override
+ public VariableSet initializebackwardLV(VariableSet lo){return lo;}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(Statement.OUTPUTSTATEMENT + "(");
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 3286049..ad95552 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
@@ -140,6 +140,7 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
setParseInfo(parseInfo);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
HashMap<String,Expression> newVarParams = new HashMap<>();
for (String key : _varParams.keySet()){
@@ -737,6 +738,7 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
+ "It is of type '"+data.getOutput().getDataType().toString()+"', '"+data.getOutput().getValueType().toString()+"'.", conditional, LanguageErrorCodes.INVALID_PARAMETERS);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder(_opcode.toString() + "(");
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/PathStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/PathStatement.java b/src/main/java/org/apache/sysml/parser/PathStatement.java
index 85416d1..6fe61af 100644
--- a/src/main/java/org/apache/sysml/parser/PathStatement.java
+++ b/src/main/java/org/apache/sysml/parser/PathStatement.java
@@ -23,7 +23,6 @@ package org.apache.sysml.parser;
public class PathStatement extends Statement
{
-
// Set of file system paths to packages
private String _pathValue;
@@ -35,12 +34,15 @@ public class PathStatement extends Statement
return _pathValue;
}
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
- return this;
+ return this;
}
-
+
+ @Override
public void initializeforwardLV(VariableSet activeIn){}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo){
return lo;
}
@@ -60,13 +62,13 @@ public class PathStatement extends Statement
return false;
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append(Statement.SETWD + "(");
sb.append(_pathValue);
sb.append(")");
sb.append(";");
- return sb.toString();
+ return sb.toString();
}
-
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/PrintStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/PrintStatement.java b/src/main/java/org/apache/sysml/parser/PrintStatement.java
index 27a5f0a..e964595 100644
--- a/src/main/java/org/apache/sysml/parser/PrintStatement.java
+++ b/src/main/java/org/apache/sysml/parser/PrintStatement.java
@@ -81,6 +81,7 @@ public class PrintStatement extends Statement
}
}
+ @Override
public Statement rewriteStatement(String prefix) throws LanguageException{
List<Expression> newExpressions = new ArrayList<>();
for (Expression oldExpression : expressions) {
@@ -92,12 +93,15 @@ public class PrintStatement extends Statement
return retVal;
}
+ @Override
public void initializeforwardLV(VariableSet activeIn){}
+ @Override
public VariableSet initializebackwardLV(VariableSet lo){
return lo;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(_type + "(");
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/RelationalExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/RelationalExpression.java b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
index 8a82b1e..91e9da3 100644
--- a/src/main/java/org/apache/sysml/parser/RelationalExpression.java
+++ b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
@@ -45,6 +45,7 @@ public class RelationalExpression extends Expression
setParseInfo(parseInfo);
}
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
RelationalExpression newExpr = new RelationalExpression(this._opcode, this);
newExpr.setLeft(_left.rewriteExpression(prefix));
@@ -188,6 +189,7 @@ public class RelationalExpression extends Expression
}
}
+ @Override
public String toString(){
String leftString;
String rightString;
@@ -220,5 +222,4 @@ public class RelationalExpression extends Expression
result.addVariables(_right.variablesUpdated());
return result;
}
-
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 71c1894..4a24675 100644
--- a/src/main/java/org/apache/sysml/parser/StatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/StatementBlock.java
@@ -349,6 +349,7 @@ public class StatementBlock extends LiveVariableAnalysis implements ParseInfo
return result;
}
+ @Override
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append("statements\n");
@@ -926,10 +927,9 @@ public class StatementBlock extends LiveVariableAnalysis implements ParseInfo
return _constVarsOut;
}
-
+ @Override
public VariableSet analyze(VariableSet loPassed)
- throws LanguageException{
-
+ throws LanguageException {
VariableSet candidateLO = new VariableSet();
candidateLO.addVariables(loPassed);
//candidateLO.addVariables(_gen);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/main/java/org/apache/sysml/parser/StringIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/StringIdentifier.java b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
index ed0c1d6..aaaade2 100644
--- a/src/main/java/org/apache/sysml/parser/StringIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
@@ -23,9 +23,9 @@ import org.antlr.v4.runtime.ParserRuleContext;
public class StringIdentifier extends ConstIdentifier
{
-
private String _val;
+ @Override
public Expression rewriteExpression(String prefix) throws LanguageException {
return this;
}
@@ -53,6 +53,7 @@ public class StringIdentifier extends ConstIdentifier
return _val;
}
+ @Override
public String toString(){
return _val;
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 29c4ae3..eb5dc92 100644
--- a/src/main/java/org/apache/sysml/parser/VariableSet.java
+++ b/src/main/java/org/apache/sysml/parser/VariableSet.java
@@ -73,6 +73,7 @@ public class VariableSet
return _variables;
}
+ @Override
public String toString() {
return Arrays.toString(
_variables.keySet().toArray());