Repository: systemml Updated Branches: refs/heads/master 40dd894ed -> 13a017583
http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java index aee9956..ff05fa0 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java @@ -324,15 +324,17 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab : (denseBlock!=null); } - public void allocateDenseBlock() { + public MatrixBlock allocateDenseBlock() { allocateDenseBlock( true ); + return this; } - public void allocateDenseOrSparseBlock() { + public MatrixBlock allocateBlock() { if( sparse ) allocateSparseRowsBlock(); else allocateDenseBlock(); + return this; } public void allocateDenseBlock(boolean clearNNZ) @@ -2055,7 +2057,7 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab } } - private void writeEmptyBlock(DataOutput out) + private static void writeEmptyBlock(DataOutput out) throws IOException { //empty blocks do not need to materialize row information @@ -2563,17 +2565,15 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab return evalSparseFormatInMemory(finalRlen, finalClen, ennz); } - private boolean estimateSparsityOnLeftIndexing(long rlenm1, long clenm1, long nnzm1, long rlenm2, long clenm2, long nnzm2) - { + private static boolean estimateSparsityOnLeftIndexing( + long rlenm1, long clenm1, long nnzm1, long rlenm2, long clenm2, long nnzm2) { //min bound: nnzm1 - rlenm2*clenm2 + nnzm2 //max bound: min(rlenm1*rlenm2, nnzm1+nnzm2) - long ennz = Math.min(rlenm1*clenm1, nnzm1+nnzm2); return evalSparseFormatInMemory(rlenm1, clenm1, ennz); } - private boolean estimateSparsityOnGroupedAgg( long rlen, long groups ) - { + private static boolean estimateSparsityOnGroupedAgg( long rlen, long groups ) { long ennz = Math.min(groups, rlen); return evalSparseFormatInMemory(groups, 1, ennz); } @@ -4342,7 +4342,7 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab } - private void incrementalAggregateUnaryHelp(AggregateOperator aggOp, MatrixBlock result, int row, int column, + private static void incrementalAggregateUnaryHelp(AggregateOperator aggOp, MatrixBlock result, int row, int column, double newvalue, KahanObject buffer) throws DMLRuntimeException { if(aggOp.correctionExists) http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java index ef90349..2cd4bc6 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java @@ -305,7 +305,7 @@ public class MRBaseForCommonInstructions extends MapReduceBase * @param row if true return row dimension, else return column dimension * @return maximum row or column dimension, or 0 if MatrixValue not MatrixCell or MatrixBlock */ - private long getMaxDimension( MatrixIndexes key, MatrixValue value, boolean row ) { + private static long getMaxDimension( MatrixIndexes key, MatrixValue value, boolean row ) { if( value instanceof MatrixCell ) return row ? key.getRowIndex() : key.getColumnIndex(); else if( value instanceof MatrixBlock ) http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java index 04899f3..0b7d5ac 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java @@ -260,9 +260,8 @@ public class PickFromCompactInputFormat extends FileInputFormat<MatrixIndexes, M reader=new ReadWithZeros(currentStream, contain0s, numZeros); } - private int getIndexInTheArray(String name) { - int i=name.indexOf("part-"); - return Integer.parseInt(name.substring(i+5)); + private static int getIndexInTheArray(String name) { + return Integer.parseInt(name.substring(name.indexOf("part-")+5)); } private void parseSelectedRangeString(String str) { @@ -385,10 +384,9 @@ public class PickFromCompactInputFormat extends FileInputFormat<MatrixIndexes, M private boolean noRecordsNeeded=false; ReadWithZeros reader=null; - private int getIndexInTheArray(String name) - { - int i=name.indexOf("part-"); - return Integer.parseInt(name.substring(i+5)); + private static int getIndexInTheArray(String name) { + return Integer.parseInt( + name.substring(name.indexOf("part-")+5)); } public PickRecordReader(JobConf job, FileSplit split) http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/main/java/org/apache/sysml/udf/lib/SGDNesterovUpdate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/udf/lib/SGDNesterovUpdate.java b/src/main/java/org/apache/sysml/udf/lib/SGDNesterovUpdate.java index a88f230..1a16b57 100644 --- a/src/main/java/org/apache/sysml/udf/lib/SGDNesterovUpdate.java +++ b/src/main/java/org/apache/sysml/udf/lib/SGDNesterovUpdate.java @@ -149,7 +149,7 @@ public class SGDNesterovUpdate extends PackageFunction { } } - private MatrixBlock allocateDenseMatrixBlock(Matrix mat) { + private static MatrixBlock allocateDenseMatrixBlock(Matrix mat) { int rows = (int) mat.getNumRows(); int cols = (int) mat.getNumCols(); MatrixBlock mb = new MatrixBlock(rows, cols, false); @@ -157,16 +157,13 @@ public class SGDNesterovUpdate extends PackageFunction { return mb; } - - // out += constant*in - private void multiplyByConstant(double [] in, double constant, double [] out) { + private static void multiplyByConstant(double [] in, double constant, double [] out) { for(int i = 0; i < out.length; i++) { out[i] += in[i]*constant; } } - // out += constant*in - private void multiplyByConstant(MatrixBlock in, double constant, double [] out) { + private static void multiplyByConstant(MatrixBlock in, double constant, double [] out) { if(in.isInSparseFormat()) { Iterator<IJV> iter = in.getSparseBlockIterator(); while(iter.hasNext()) { @@ -186,7 +183,7 @@ public class SGDNesterovUpdate extends PackageFunction { } // Assumption dest is zero-ed out. - private void copy(MatrixBlock src, double [] dest) { + private static void copy(MatrixBlock src, double [] dest) { if(src.isInSparseFormat()) { Iterator<IJV> iter = src.getSparseBlockIterator(); while(iter.hasNext()) { http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java index 2547285..837ad32 100644 --- a/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java +++ b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java @@ -313,7 +313,7 @@ public class DMLYarnClient * * @return null if the constant does not exists */ - private String getLocalJarFileNameFromEnvConst() + private static String getLocalJarFileNameFromEnvConst() { String fname = null; @@ -353,7 +353,7 @@ public class DMLYarnClient * @throws IOException if IOException occurs * @throws InterruptedException if InterruptedException occurs */ - private String createJar( String dir ) + private static String createJar( String dir ) throws IOException, InterruptedException { //construct jar command @@ -464,7 +464,7 @@ public class DMLYarnClient return rMap; } - private Map<String, String> constructEnvionmentMap(YarnConfiguration yconf) + private static Map<String, String> constructEnvionmentMap(YarnConfiguration yconf) throws IOException { Map<String, String> eMap = new HashMap<>(); @@ -510,7 +510,7 @@ public class DMLYarnClient return eMap; } - private String readMessageToHDFSWorkingDir(DMLConfig conf, YarnConfiguration yconf, ApplicationId appId) + private static String readMessageToHDFSWorkingDir(DMLConfig conf, YarnConfiguration yconf, ApplicationId appId) { String ret = null; http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java index 2258d13..6a78011 100644 --- a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java +++ b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java @@ -462,7 +462,7 @@ public abstract class AutomatedTestBase return matrix; } - private void cleanupExistingData(String fname, boolean cleanupRData) throws IOException { + private static void cleanupExistingData(String fname, boolean cleanupRData) throws IOException { MapReduceTool.deleteFileIfExistOnHDFS(fname); MapReduceTool.deleteFileIfExistOnHDFS(fname + ".mtd"); if ( cleanupRData ) http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java index d6aa0c5..d52ba02 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java @@ -192,7 +192,7 @@ public class FullDynWriteTest extends AutomatedTestBase * @return * @throws IOException */ - private double[][] readMatrix( String fname, InputInfo ii, long rows, long cols, int brows, int bcols ) + private static double[][] readMatrix( String fname, InputInfo ii, long rows, long cols, int brows, int bcols ) throws IOException { MatrixBlock mb = DataConverter.readMatrixFromHDFS(fname, ii, rows, cols, brows, bcols); @@ -212,7 +212,7 @@ public class FullDynWriteTest extends AutomatedTestBase * @throws DMLRuntimeException * @throws IOException */ - private void writeMatrix( double[][] A, String fname, OutputInfo oi, long rows, long cols, int brows, int bcols, long nnz ) + private static void writeMatrix( double[][] A, String fname, OutputInfo oi, long rows, long cols, int brows, int bcols, long nnz ) throws DMLRuntimeException, IOException { MapReduceTool.deleteFileIfExistOnHDFS(fname); @@ -225,12 +225,7 @@ public class FullDynWriteTest extends AutomatedTestBase MapReduceTool.writeMetaDataFile(fname+".mtd", ValueType.DOUBLE, mc, oi); } - /** - * - * @param oinfo - * @return - */ - private String getFormatString(OutputInfo oinfo) + private static String getFormatString(OutputInfo oinfo) { if( oinfo==OutputInfo.BinaryBlockOutputInfo ) return "binary"; @@ -244,20 +239,11 @@ public class FullDynWriteTest extends AutomatedTestBase return null; } - /** - * - * @param A - * @return - */ - private long computeSum( double[][] A ) - { + private static long computeSum( double[][] A ) { double ret = 0; - for( int i=0; i<A.length; i++ ) for( int j=0; j<A[i].length; j++ ) ret += A[i][j]; - return UtilFunctions.toLong(ret); } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java index f97ea1a..1209f70 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java @@ -149,7 +149,7 @@ public class FrameCastingTest extends AutomatedTestBase return ret; } - private double[][] add(double[][] data, double val) { + private static double[][] add(double[][] data, double val) { for( int i=0; i<data.length; i++ ) for( int j=0; j<data[i].length; j++ ) data[i][j] += val; http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java index 86e5715..0f99031 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java @@ -157,7 +157,7 @@ public class FrameReadMetaTest extends AutomatedTestBase } @SuppressWarnings("unchecked") - private HashMap<String,Long>[] getRecodeMaps(String spec, FrameBlock M) + private static HashMap<String,Long>[] getRecodeMaps(String spec, FrameBlock M) throws DMLRuntimeException { List<Integer> collist = Arrays.asList(ArrayUtils.toObject( @@ -179,7 +179,7 @@ public class FrameReadMetaTest extends AutomatedTestBase return ret; } - private double[][] generateData(int rows, int cols, HashMap<String,Long>[] RC) { + private static double[][] generateData(int rows, int cols, HashMap<String,Long>[] RC) { double[][] ret = new double[rows][cols]; for( int i=0; i<rows; i++ ) for( int j=0; j<cols; j++ ) http://git-wip-us.apache.org/repos/asf/systemml/blob/13a01758/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java index dd3db7d..e0dbfd8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java @@ -166,7 +166,7 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir() + " " + Integer.toString((update||changedDim)?1:0); - double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity, 7); + double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity, 7); writeInputMatrix("V", V, true); runTest(true, false, null, -1); @@ -188,15 +188,7 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase } } - /** - * - * @param mb - * @return - */ - private double computeMemoryUtilFactor( int mb ) - { - double factor = Math.min(1, ((double)1024*1024*mb)/InfrastructureAnalyzer.getLocalMaxMemory()); - //System.out.println("Setting max mem util factor: "+factor); - return factor; + private static double computeMemoryUtilFactor( int mb ) { + return Math.min(1, ((double)1024*1024*mb)/InfrastructureAnalyzer.getLocalMaxMemory()); } } \ No newline at end of file
