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 2016/03/19 23:21:40 UTC
[2/4] incubator-systemml git commit: [SYSTEMML-584] New thread-local
configuration handling (dml/compiler)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/GMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/GMR.java b/src/main/java/org/apache/sysml/runtime/matrix/GMR.java
index d1fdb87..0d399fa 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/GMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/GMR.java
@@ -212,7 +212,7 @@ public class GMR
MRJobConfiguration.addBinaryBlockSerializationFramework( job );
//set up map/reduce memory configurations (if in AM context)
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
DMLAppMasterUtils.setupMRJobRemoteMaxMemory(job, config);
//set up custom map/reduce configurations
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java b/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
index 5a65ab0..65aff10 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
@@ -96,7 +96,7 @@ public class GroupedAggMR
job.setInt(MRConfigurationNames.DFS_REPLICATION, replication);
//set up custom map/reduce configurations
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
MRJobConfiguration.setupCustomMRConfigurations(job, config);
//set up what matrices are needed to pass from the mapper to reducer
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java b/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
index 44513a6..eb4ae4c 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
@@ -210,7 +210,7 @@ public class MMCJMR
MRJobConfiguration.addBinaryBlockSerializationFramework( job );
//set up map/reduce memory configurations (if in AM context)
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
DMLAppMasterUtils.setupMRJobRemoteMaxMemory(job, config);
//set up custom map/reduce configurations
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java b/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
index 2d120bc..54df00a 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
@@ -119,7 +119,7 @@ public class MMRJMR
job.setInt(MRConfigurationNames.DFS_REPLICATION, replication);
//set up map/reduce memory configurations (if in AM context)
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
DMLAppMasterUtils.setupMRJobRemoteMaxMemory(job, config);
//set up custom map/reduce configurations
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java b/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
index 8dd930d..b60d3d6 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
@@ -114,7 +114,7 @@ public class ReblockMR
MRJobConfiguration.addBinaryBlockSerializationFramework( job );
//set up custom map/reduce configurations
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
MRJobConfiguration.setupCustomMRConfigurations(job, config);
//enable jvm reuse (based on SystemML configuration)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java b/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
index 8f56336..c5d7a5b 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
@@ -256,7 +256,7 @@ public class SortMR
job.setInt(MRConfigurationNames.DFS_REPLICATION, replication);
//set up custom map/reduce configurations
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
MRJobConfiguration.setupCustomMRConfigurations(job, config);
MatrixCharacteristics[] s = new MatrixCharacteristics[1];
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java b/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
index 33939f8..87c25b9 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
@@ -84,7 +84,7 @@ public class WriteCSVMR
MRJobConfiguration.addBinaryBlockSerializationFramework( job );
//set up custom map/reduce configurations
- DMLConfig config = ConfigurationManager.getConfig();
+ DMLConfig config = ConfigurationManager.getDMLConfig();
MRJobConfiguration.setupCustomMRConfigurations(job, config);
long maxRlen=0;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/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 49fb9b0..993adfd 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
@@ -34,13 +34,11 @@ import java.util.Iterator;
import org.apache.commons.math3.random.Well1024a;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.sysml.conf.ConfigurationManager;
-import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.hops.Hop.OpOp2;
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.lops.MMTSJ.MMTSJType;
import org.apache.sysml.lops.MapMultChain.ChainType;
import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.DMLUnsupportedOperationException;
import org.apache.sysml.runtime.functionobjects.Builtin;
@@ -5856,11 +5854,8 @@ public class MatrixBlock extends MatrixValue implements Externalizable
public static MatrixBlock randOperations(int rows, int cols, double sparsity, double min, double max, String pdf, long seed, int k)
throws DMLRuntimeException
{
- DMLConfig conf = ConfigurationManager.getConfig();
- int blocksize = (conf!=null) ? ConfigurationManager.getConfig().getIntValue(DMLConfig.DEFAULT_BLOCK_SIZE)
- : DMLTranslator.DMLBlockSize;
-
- RandomMatrixGenerator rgen = new RandomMatrixGenerator(pdf, rows, cols, blocksize, blocksize, sparsity, min, max);
+ RandomMatrixGenerator rgen = new RandomMatrixGenerator(pdf, rows, cols,
+ ConfigurationManager.getBlocksize(), ConfigurationManager.getBlocksize(), sparsity, min, max);
if (k > 1)
return randOperations(rgen, seed, k);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
index 06ae844..503e3e4 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
@@ -1360,7 +1360,7 @@ public class MRJobConfiguration
//correction max number of reducers on yarn clusters
if( InfrastructureAnalyzer.isYarnEnabled() )
n = (int)Math.max( n, YarnClusterAnalyzer.getNumCores()/2 );
- n=Math.min(n, ConfigurationManager.getConfig().getIntValue(DMLConfig.NUM_REDUCERS));
+ n=Math.min(n, ConfigurationManager.getNumReducers());
n=Math.min(n, numFromCompiler);
if(numReducerGroups>0)
n=(int) Math.min(n, numReducerGroups);
@@ -1876,7 +1876,7 @@ public class MRJobConfiguration
public static String constructTempOutputFilename()
{
StringBuilder sb = new StringBuilder();
- sb.append(ConfigurationManager.getConfig().getTextValue(DMLConfig.SCRATCH_SPACE));
+ sb.append(ConfigurationManager.getScratchSpace());
sb.append(Lop.FILE_SEPARATOR);
sb.append(Lop.PROCESS_PREFIX);
sb.append(DMLScript.getUUID());
@@ -1893,7 +1893,7 @@ public class MRJobConfiguration
private static String constructPartitionFilename()
{
StringBuilder sb = new StringBuilder();
- sb.append(ConfigurationManager.getConfig().getTextValue(DMLConfig.SCRATCH_SPACE));
+ sb.append(ConfigurationManager.getScratchSpace());
sb.append(Lop.FILE_SEPARATOR);
sb.append(Lop.PROCESS_PREFIX);
sb.append(DMLScript.getUUID());
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
index 043c5c3..30bf1ff 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
@@ -27,7 +27,6 @@ import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.sysml.conf.ConfigurationManager;
-import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.runtime.instructions.InstructionParser;
import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
import org.apache.sysml.runtime.matrix.CSVReblockMR;
@@ -100,7 +99,7 @@ public class ApplyTfBBMR {
null, rblkInst, null, null, null, resultIndexes, mapoutputIndexes, false);
//set up the number of reducers
- int numRed = WriteCSVMR.determineNumReducers(rlens, clens, ConfigurationManager.getConfig().getIntValue(DMLConfig.NUM_REDUCERS), ret.numReducerGroups);
+ int numRed = WriteCSVMR.determineNumReducers(rlens, clens, ConfigurationManager.getNumReducers(), ret.numReducerGroups);
job.setNumReduceTasks( numRed );
//set up the multiple output files, and their format information
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java b/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
index 44e9141..af74b8c 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
@@ -796,7 +796,7 @@ public class DataTransform
if(isBB)
{
- DMLConfig conf = ConfigurationManager.getConfig();
+ DMLConfig conf = ConfigurationManager.getDMLConfig();
int blockSize = conf.getIntValue(DMLConfig.DEFAULT_BLOCK_SIZE);
CSVReblockInstruction rblk = prepDummyReblockInstruction(oprnds.inputCSVProperties, blockSize);
@@ -835,7 +835,7 @@ public class DataTransform
if (isCSV)
{
- DMLConfig conf = ConfigurationManager.getConfig();
+ DMLConfig conf = ConfigurationManager.getDMLConfig();
int blockSize = conf.getIntValue(DMLConfig.DEFAULT_BLOCK_SIZE);
CSVReblockInstruction rblk = prepDummyReblockInstruction(oprnds.inputCSVProperties, blockSize);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java b/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
index b70ab35..1511d81 100644
--- a/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
@@ -367,7 +367,7 @@ public class LocalFileUtils
{
//create local tmp dir if not existing
String dirRoot = null;
- DMLConfig conf = ConfigurationManager.getConfig();
+ DMLConfig conf = ConfigurationManager.getDMLConfig();
if( conf != null )
dirRoot = conf.getTextValue(DMLConfig.LOCAL_TMP_DIR);
else
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/udf/Matrix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/Matrix.java b/src/main/java/org/apache/sysml/udf/Matrix.java
index 6d710e4..6aa733c 100644
--- a/src/main/java/org/apache/sysml/udf/Matrix.java
+++ b/src/main/java/org/apache/sysml/udf/Matrix.java
@@ -21,7 +21,7 @@ package org.apache.sysml.udf;
import java.io.IOException;
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.conf.ConfigurationManager;
import org.apache.sysml.parser.Expression;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
@@ -216,8 +216,8 @@ public class Matrix extends FunctionParameter
_rows = mb.getNumRows();
_cols = mb.getNumColumns();
long nnz = mb.getNonZeros();
- int rblen = DMLTranslator.DMLBlockSize;
- int cblen = DMLTranslator.DMLBlockSize;
+ int rblen = ConfigurationManager.getBlocksize();
+ int cblen = ConfigurationManager.getBlocksize();
MatrixCharacteristics mc = new MatrixCharacteristics(_rows, _cols, rblen, cblen, nnz);
MatrixFormatMetaData mfmd = new MatrixFormatMetaData(mc, oinfo, iinfo);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
index 80dc3ee..4147665 100644
--- a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
@@ -19,7 +19,7 @@
package org.apache.sysml.udf.lib;
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.conf.ConfigurationManager;
import org.apache.sysml.runtime.matrix.data.InputInfo;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.matrix.data.OutputInfo;
@@ -66,7 +66,7 @@ public class DynamicReadMatrixCP extends PackageFunction
InputInfo ii = InputInfo.stringToInputInfo(format);
OutputInfo oi = OutputInfo.BinaryBlockOutputInfo;
- MatrixBlock mbTmp = DataConverter.readMatrixFromHDFS(fname, ii, m, n, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize);
+ MatrixBlock mbTmp = DataConverter.readMatrixFromHDFS(fname, ii, m, n, ConfigurationManager.getBlocksize(), ConfigurationManager.getBlocksize());
String fnameTmp = createOutputFilePathAndName("TMP");
_ret = new Matrix(fnameTmp, m, n, ValueType.Double);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
index f4faf59..e96ee52 100644
--- a/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
@@ -19,7 +19,7 @@
package org.apache.sysml.udf.lib;
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.conf.ConfigurationManager;
import org.apache.sysml.runtime.matrix.data.InputInfo;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.matrix.data.OutputInfo;
@@ -78,7 +78,7 @@ public class DynamicReadMatrixRcCP extends PackageFunction
String fnameTmp = createOutputFilePathAndName("TMP");
_ret = new Matrix(fnameTmp, m, n, ValueType.Double);
- MatrixBlock mbTmp = DataConverter.readMatrixFromHDFS(fname, ii, m, n, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize);
+ MatrixBlock mbTmp = DataConverter.readMatrixFromHDFS(fname, ii, m, n, ConfigurationManager.getBlocksize(), ConfigurationManager.getBlocksize());
_ret.setMatrixDoubleArray(mbTmp, oi, ii);
_rc = new Scalar(ScalarValueType.Integer, "0");
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java b/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
index 0c5ba81..0f10e9e 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
@@ -140,7 +140,7 @@ public class DMLAppMaster
private void writeMessageToHDFSWorkingDir(String msg)
{
//construct working directory (consistent with client)
- DMLConfig conf = ConfigurationManager.getConfig();
+ DMLConfig conf = ConfigurationManager.getDMLConfig();
String hdfsWD = DMLAppMasterUtils.constructHDFSWorkingDir(conf, _appId);
Path msgPath = new Path(hdfsWD, DMLYarnClient.DML_STOPMSG_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
index 084de46..c4de6b7 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
@@ -26,6 +26,8 @@ import java.util.HashMap;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.CompilerConfig;
+import org.apache.sysml.conf.ConfigurationManager;
import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.hops.HopsException;
import org.apache.sysml.hops.OptimizerUtils;
@@ -77,8 +79,9 @@ public class DMLAppMasterUtils
if( DMLScript.isActiveAM() ){
//set optimization level (for awareness of resource optimization)
- OptimizerUtils.setOptimizationLevel( conf.getIntValue(DMLConfig.OPTIMIZATION_LEVEL) );
-
+ CompilerConfig cconf = OptimizerUtils.constructCompilerConfig(conf);
+ ConfigurationManager.setGlobalConfig(cconf);
+
if( isResourceOptimizerEnabled() )
{
//handle optimized memory (mr memory budget per program block)
@@ -144,7 +147,7 @@ public class DMLAppMasterUtils
long mem = _rcMap.get(pb);
InfrastructureAnalyzer.setRemoteMaxMemoryMap(mem);
InfrastructureAnalyzer.setRemoteMaxMemoryReduce(mem);
- OptimizerUtils.setDefaultSize();
+ OptimizerUtils.resetDefaultSize();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
index 0aaec58..4b31af2 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
@@ -220,7 +220,7 @@ public class ResourceOptimizer
InfrastructureAnalyzer.setLocalMaxMemory( (long)cp );
InfrastructureAnalyzer.setRemoteMaxMemoryMap( (long)mr );
InfrastructureAnalyzer.setRemoteMaxMemoryReduce( (long)mr );
- OptimizerUtils.setDefaultSize(); //dependent on cp, mr
+ OptimizerUtils.resetDefaultSize(); //dependent on cp, mr
}
for( ProgramBlock pb : prog )
@@ -349,7 +349,7 @@ public class ResourceOptimizer
InfrastructureAnalyzer.setLocalMaxMemory( cp );
InfrastructureAnalyzer.setRemoteMaxMemoryMap( mr );
InfrastructureAnalyzer.setRemoteMaxMemoryReduce( mr );
- OptimizerUtils.setDefaultSize(); //dependent on cp, mr
+ OptimizerUtils.resetDefaultSize(); //dependent on cp, mr
//recompile instructions (incl predicates)
if (pb instanceof WhileProgramBlock)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
index 610a60e..b9b45f7 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
@@ -20,7 +20,6 @@
package org.apache.sysml.yarn.ropt;
import org.apache.sysml.conf.ConfigurationManager;
-import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.hops.OptimizerUtils;
public class YarnOptimizerUtils
@@ -73,7 +72,7 @@ public class YarnOptimizerUtils
*/
public static int getNumReducers(boolean configOnly, long jobLookupId)
{
- int ret = ConfigurationManager.getConfig().getIntValue(DMLConfig.NUM_REDUCERS);
+ int ret = ConfigurationManager.getNumReducers();
if( !configOnly )
ret = Math.min(ret,YarnClusterAnalyzer.getRemoteParallelReduceTasks(jobLookupId));
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/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 076e5d0..f044774 100644
--- a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
@@ -44,7 +44,6 @@ import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.api.MLContext;
import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.hops.OptimizerUtils;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.parser.DataExpression;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.DMLRuntimeException;
@@ -501,13 +500,13 @@ public abstract class AutomatedTestBase
protected double[][] writeInputMatrixWithMTD(String name, double[][] matrix, boolean bIncludeR)
{
- MatrixCharacteristics mc = new MatrixCharacteristics(matrix.length, matrix[0].length, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, -1);
+ MatrixCharacteristics mc = new MatrixCharacteristics(matrix.length, matrix[0].length, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, -1);
return writeInputMatrixWithMTD(name, matrix, bIncludeR, mc);
}
protected double[][] writeInputMatrixWithMTD(String name, double[][] matrix, int nnz, boolean bIncludeR)
{
- MatrixCharacteristics mc = new MatrixCharacteristics(matrix.length, matrix[0].length, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, nnz);
+ MatrixCharacteristics mc = new MatrixCharacteristics(matrix.length, matrix[0].length, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, nnz);
return writeInputMatrixWithMTD(name, matrix, bIncludeR, mc);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java b/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
index aaa776d..854bf63 100644
--- a/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Random;
import org.junit.runners.Parameterized.Parameters;
-
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -280,7 +280,7 @@ public abstract class GLMTest extends AutomatedTestBase
}
- int defaultBlockSize = org.apache.sysml.parser.DMLTranslator.DMLBlockSize;
+ int defaultBlockSize = OptimizerUtils.DEFAULT_BLOCKSIZE;
MatrixCharacteristics mc_X = new MatrixCharacteristics (rows, cols, defaultBlockSize, defaultBlockSize, nnz_in_X);
writeInputMatrixWithMTD ("X", X, true, mc_X);
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
index 551c7ab..07a358f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
@@ -24,12 +24,11 @@ import java.util.Random;
import org.junit.Assert;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.hops.BinaryOp.AppendMethod;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -55,7 +54,7 @@ public class AppendMatrixTest extends AutomatedTestBase
private final static int cols1b = 1059;
private final static int cols2b = 1010;
//usecase c: outblock blocksize
- private final static int cols1c = 2*DMLTranslator.DMLBlockSize;
+ private final static int cols1c = 2*OptimizerUtils.DEFAULT_BLOCKSIZE;
private final static int cols2c = 1010;
//usecase d: outblock blocksize
private final static int cols1d = 1460;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
index 5272904..f5bf5ee 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
@@ -24,10 +24,9 @@ import java.util.Random;
import org.junit.Assert;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -36,8 +35,6 @@ import org.apache.sysml.utils.Statistics;
public class AppendVectorTest extends AutomatedTestBase
{
-
-
private final static String TEST_NAME = "AppendVectorTest";
private final static String TEST_DIR = "functions/append/";
private final static String TEST_CLASS_DIR = TEST_DIR + AppendVectorTest.class.getSimpleName() + "/";
@@ -46,7 +43,7 @@ public class AppendVectorTest extends AutomatedTestBase
private final static int rows1 = 1279;
private final static int cols1 = 1059;
private final static int rows2 = 2021;
- private final static int cols2 = DMLTranslator.DMLBlockSize;
+ private final static int cols2 = OptimizerUtils.DEFAULT_BLOCKSIZE;
private final static int min=0;
private final static int max=100;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
index bb7567a..4b3f5b0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
@@ -25,10 +25,9 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.lops.LopProperties.ExecType;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.parser.Expression.DataType;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
@@ -39,8 +38,7 @@ import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
public class FullIntegerDivisionTest extends AutomatedTestBase
-{
-
+{
private final static String TEST_NAME1 = "IntegerDivision_mod";
private final static String TEST_NAME2 = "IntegerDivision_div";
@@ -349,7 +347,7 @@ public class FullIntegerDivisionTest extends AutomatedTestBase
//generate dataset A
if( dt1 == DataType.MATRIX ){
double[][] A = getRandomMatrix(rows, cols, min, max, sparsity, 7);
- MatrixCharacteristics mcA = new MatrixCharacteristics(rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, (long) (rows*cols*sparsity));
+ MatrixCharacteristics mcA = new MatrixCharacteristics(rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, (long) (rows*cols*sparsity));
writeInputMatrixWithMTD("A", A, true, mcA);
}
else{
@@ -359,7 +357,7 @@ public class FullIntegerDivisionTest extends AutomatedTestBase
//generate dataset B
if( dt2 == DataType.MATRIX ){
- MatrixCharacteristics mcB = new MatrixCharacteristics(rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, (long) (rows*cols*sparsity));
+ MatrixCharacteristics mcB = new MatrixCharacteristics(rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, (long) (rows*cols*sparsity));
double[][] B = getRandomMatrix(rows, cols, min, max, sparsity, 3);
writeInputMatrixWithMTD("B", B, true, mcB);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
index 3e3df1f..b59fd26 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
@@ -25,10 +25,9 @@ import java.util.HashMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.lops.LopProperties.ExecType;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.parser.Expression.DataType;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
@@ -233,7 +232,7 @@ public class FullPowerTest extends AutomatedTestBase
//generate dataset A
if( dt1 == DataType.MATRIX ){
double[][] A = getRandomMatrix(rows, cols, min, max, sparsity, 7);
- MatrixCharacteristics mcA = new MatrixCharacteristics(rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, (long) (rows*cols*sparsity));
+ MatrixCharacteristics mcA = new MatrixCharacteristics(rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, (long) (rows*cols*sparsity));
writeInputMatrixWithMTD("A", A, true, mcA);
}
else{
@@ -243,7 +242,7 @@ public class FullPowerTest extends AutomatedTestBase
//generate dataset B
if( dt2 == DataType.MATRIX ){
- MatrixCharacteristics mcB = new MatrixCharacteristics(rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, (long) (rows*cols*sparsity));
+ MatrixCharacteristics mcB = new MatrixCharacteristics(rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, (long) (rows*cols*sparsity));
double[][] B = getRandomMatrix(rows, cols, min, max, sparsity, 3);
writeInputMatrixWithMTD("B", B, true, mcB);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java b/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
index cb21346..201d32a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
@@ -21,9 +21,8 @@ package org.apache.sysml.test.integration.functions.caching;
import org.junit.Assert;
import org.junit.Test;
-
import org.apache.sysml.hops.Hop;
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.data.InputInfo;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.util.DataConverter;
@@ -97,7 +96,7 @@ public class CachingPWriteExportTest extends AutomatedTestBase
else
ii = InputInfo.TextCellInputInfo;
- MatrixBlock mb = DataConverter.readMatrixFromHDFS(output("V"), ii, rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, sparsity);
+ MatrixBlock mb = DataConverter.readMatrixFromHDFS(output("V"), ii, rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, sparsity);
Vp = DataConverter.convertToDoubleMatrix(mb);
}
catch(Exception ex)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
index f533857..78e4021 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
@@ -21,10 +21,9 @@ package org.apache.sysml.test.integration.functions.data;
import org.junit.Assert;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.lops.LopProperties.ExecType;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.matrix.data.InputInfo;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
@@ -363,7 +362,7 @@ public class FullStringInitializeTest extends AutomatedTestBase
if( !expectExcept ) {
//compare matrices
MatrixBlock ret = DataConverter.readMatrixFromHDFS(output("A"), InputInfo.TextCellInputInfo,
- rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, sparsity, null);
+ rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE, sparsity, null);
double[][] dret = DataConverter.convertToDoubleMatrix(ret);
TestUtils.compareMatrices(A, dret, rows, cols, eps);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
index 9535c82..17f552c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
@@ -24,9 +24,8 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import org.junit.Test;
-
import org.apache.sysml.api.DMLException;
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.OutputInfo;
@@ -226,8 +225,8 @@ public class ReadMMTest extends AutomatedTestBase
public void testBinaryWrongRowDimension() throws IOException {
int rows = 5;
int cols = 10;
- int rowsInBlock = DMLTranslator.DMLBlockSize;
- int colsInBlock = DMLTranslator.DMLBlockSize;
+ int rowsInBlock = OptimizerUtils.DEFAULT_BLOCKSIZE;
+ int colsInBlock = OptimizerUtils.DEFAULT_BLOCKSIZE;
TestConfiguration config = availableTestConfigurations.get("BinaryWrongRowDimensionTest");
config.addVariable("rows", rows);
@@ -246,8 +245,8 @@ public class ReadMMTest extends AutomatedTestBase
public void testBinaryWrongColDimension() throws IOException {
int rows = 10;
int cols = 5;
- int rowsInBlock = DMLTranslator.DMLBlockSize;
- int colsInBlock = DMLTranslator.DMLBlockSize;
+ int rowsInBlock = OptimizerUtils.DEFAULT_BLOCKSIZE;
+ int colsInBlock = OptimizerUtils.DEFAULT_BLOCKSIZE;
TestConfiguration config = availableTestConfigurations.get("BinaryWrongColDimensionTest");
config.addVariable("rows", rows);
@@ -274,8 +273,8 @@ public class ReadMMTest extends AutomatedTestBase
public void testBinaryWrongDimensions() throws IOException {
int rows = 3;
int cols = 2;
- int rowsInBlock = DMLTranslator.DMLBlockSize;
- int colsInBlock = DMLTranslator.DMLBlockSize;
+ int rowsInBlock = OptimizerUtils.DEFAULT_BLOCKSIZE;
+ int colsInBlock = OptimizerUtils.DEFAULT_BLOCKSIZE;
TestConfiguration config = availableTestConfigurations.get("TextWrongDimensionsTest");
config.addVariable("rows", rows);
@@ -359,7 +358,7 @@ public class ReadMMTest extends AutomatedTestBase
MapReduceTool.deleteFileIfExistOnHDFS(fname);
MapReduceTool.deleteFileIfExistOnHDFS(fname + ".mtd");
TestUtils.createFile(fname + "/in");
- MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize);
+ MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE);
MapReduceTool.writeMetaDataFile(fname + ".mtd", ValueType.DOUBLE, mc, OutputInfo.stringToOutputInfo("binaryblock"));
runTest(true, DMLException.class);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
index d913193..81fda82 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
@@ -22,10 +22,8 @@ package org.apache.sysml.test.integration.functions.io;
import java.io.IOException;
import org.junit.Assert;
-
import org.junit.Test;
-
-import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
@@ -212,11 +210,11 @@ public class SeqParReadTest extends AutomatedTestBase {
private void runReadTypeFormatSparsitySizeTest(boolean parallel, OutputInfo fmt, boolean dense, boolean big ) {
- boolean oldpar = OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS;
+ boolean oldpar = CompilerConfig.FLAG_PARREAD_TEXT;
try
{
- OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS = parallel;
+ CompilerConfig.FLAG_PARREAD_TEXT = parallel;
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
@@ -252,7 +250,7 @@ public class SeqParReadTest extends AutomatedTestBase {
}
finally
{
- OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS = oldpar;
+ CompilerConfig.FLAG_PARREAD_TEXT = oldpar;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
index 2739f89..ab1f23e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
@@ -20,9 +20,8 @@
package org.apache.sysml.test.integration.functions.io.csv;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
-import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
@@ -138,12 +137,12 @@ public class ReadCSVTest extends AutomatedTestBase
{
RUNTIME_PLATFORM oldPlatform = rtplatform;
- boolean oldpar = OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS;
+ boolean oldpar = CompilerConfig.FLAG_PARREAD_TEXT;
try
{
rtplatform = platform;
- OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS = parallel;
+ CompilerConfig.FLAG_PARREAD_TEXT = parallel;
TestConfiguration config = getTestConfiguration(TEST_NAME);
@@ -171,7 +170,7 @@ public class ReadCSVTest extends AutomatedTestBase
finally
{
rtplatform = oldPlatform;
- OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS = oldpar;
+ CompilerConfig.FLAG_PARREAD_TEXT = oldpar;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
index 8884daf..6be1b9c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
@@ -20,9 +20,8 @@
package org.apache.sysml.test.integration.functions.io.matrixmarket;
import org.junit.Test;
-
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
-import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
@@ -91,12 +90,12 @@ public class ReadMMTest extends AutomatedTestBase
private void runMMTest(int testNumber, RUNTIME_PLATFORM platform, boolean parallel) {
RUNTIME_PLATFORM oldPlatform = rtplatform;
- boolean oldpar = OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS;
+ boolean oldpar = CompilerConfig.FLAG_PARREAD_TEXT;
try
{
rtplatform = platform;
- OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS = parallel;
+ CompilerConfig.FLAG_PARREAD_TEXT = parallel;
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
@@ -123,7 +122,7 @@ public class ReadMMTest extends AutomatedTestBase
finally
{
rtplatform = oldPlatform;
- OptimizerUtils.PARALLEL_CP_READ_TEXTFORMATS = oldpar;
+ CompilerConfig.FLAG_PARREAD_TEXT = oldpar;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
index 4a3bb4d..8d30240 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
@@ -184,7 +184,7 @@ public class DataTypeChangeTest extends AutomatedTestBase
loadTestConfiguration(testConfig);
DMLConfig conf = new DMLConfig(getCurConfigFile().getPath());
- ConfigurationManager.setConfig(conf);
+ ConfigurationManager.setLocalConfig(conf);
String dmlScriptString="";
HashMap<String, String> argVals = new HashMap<String,String>();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
index 110cdf3..749f8c1 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
@@ -178,7 +178,7 @@ public class GNMFTest extends AutomatedTestBase
MLOutput out = mlCtx.execute(fullDMLScriptName, programArgs);
if(numRegisteredOutputs >= 2) {
- String configStr = ConfigurationManager.getConfig().getConfigInfo();
+ String configStr = ConfigurationManager.getDMLConfig().getConfigInfo();
if(configStr.contains("cp.parallel.matrixmult: true"))
Assert.fail("Configuration not updated via setConfig");
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
index a2dc04b..9f14bdc 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
@@ -338,7 +338,7 @@ public class ParForDependencyAnalysisTest extends AutomatedTestBase
loadTestConfiguration(testConfig);
DMLConfig conf = new DMLConfig(getCurConfigFile().getPath());
- ConfigurationManager.setConfig(conf);
+ ConfigurationManager.setLocalConfig(conf);
String dmlScriptString="";
HashMap<String, String> argVals = new HashMap<String,String>();
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
index 68dd7e0..c541fa2 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
@@ -22,10 +22,8 @@ package org.apache.sysml.test.integration.functions.parfor;
import java.util.HashMap;
import org.junit.Assert;
-
import org.junit.Test;
-
-import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -67,14 +65,14 @@ public class ParForReplaceThreadIDRecompileTest extends AutomatedTestBase
*/
private void runThreadIDReplaceTest( String TEST_NAME, boolean recompile )
{
- boolean flag = OptimizerUtils.ALLOW_DYN_RECOMPILATION;
+ boolean flag = CompilerConfig.FLAG_DYN_RECOMPILE;
try
{
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = recompile;
// This is for running the junit test the new way, i.e., construct the arguments directly
String HOME = SCRIPT_DIR + TEST_DIR;
@@ -94,7 +92,7 @@ public class ParForReplaceThreadIDRecompileTest extends AutomatedTestBase
Assert.assertTrue( dmlout.size()>=1 );
}
finally{
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = flag;
+ CompilerConfig.FLAG_DYN_RECOMPILE = flag;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
index db84ea8..98a93ad 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
@@ -22,9 +22,8 @@ package org.apache.sysml.test.integration.functions.recompile;
import java.util.HashMap;
import org.junit.Assert;
-
import org.junit.Test;
-
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -80,7 +79,7 @@ public class FunctionRecompileTest extends AutomatedTestBase
private void runFunctionTest( boolean recompile, boolean IPA )
{
- boolean oldFlagRecompile = OptimizerUtils.ALLOW_DYN_RECOMPILATION;
+ boolean oldFlagRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
try
@@ -103,7 +102,7 @@ public class FunctionRecompileTest extends AutomatedTestBase
double[][] V = getRandomMatrix(rows, cols, 0, 1, sparsity, seed);
writeInputMatrix("V", V, true);
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = recompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
boolean exceptionExpected = false;
@@ -133,7 +132,7 @@ public class FunctionRecompileTest extends AutomatedTestBase
}
finally
{
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = oldFlagRecompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = oldFlagRecompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
index c439138..29660aa 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
@@ -278,7 +278,7 @@ public class PredicateRecompileTest extends AutomatedTestBase
private void runRecompileTest( String testname, boolean recompile, boolean evalExpr, boolean constFold, boolean IPA )
{
- boolean oldFlagRecompile = OptimizerUtils.ALLOW_DYN_RECOMPILATION;
+ boolean oldFlagRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
boolean oldFlagEval = OptimizerUtils.ALLOW_SIZE_EXPRESSION_EVALUATION;
boolean oldFlagFold = OptimizerUtils.ALLOW_CONSTANT_FOLDING;
boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
@@ -301,7 +301,7 @@ public class PredicateRecompileTest extends AutomatedTestBase
Integer.toString(val),
output("R") };
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = recompile;
OptimizerUtils.ALLOW_SIZE_EXPRESSION_EVALUATION = evalExpr;
OptimizerUtils.ALLOW_CONSTANT_FOLDING = constFold;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
@@ -350,7 +350,7 @@ public class PredicateRecompileTest extends AutomatedTestBase
}
finally
{
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = oldFlagRecompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = oldFlagRecompile;
OptimizerUtils.ALLOW_SIZE_EXPRESSION_EVALUATION = oldFlagEval;
OptimizerUtils.ALLOW_CONSTANT_FOLDING = oldFlagFold;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
index 515b43c..a1ed7f2 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
@@ -21,7 +21,7 @@ package org.apache.sysml.test.integration.functions.recompile;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -113,7 +113,7 @@ public class RandRecompileTest extends AutomatedTestBase
private void runRandTest( String testName, boolean recompile, boolean IPA )
{
- boolean oldFlagRecompile = OptimizerUtils.ALLOW_DYN_RECOMPILATION;
+ boolean oldFlagRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
boolean oldFlagRand1 = OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE;
@@ -132,7 +132,7 @@ public class RandRecompileTest extends AutomatedTestBase
fullDMLScriptName = HOME + testName + ".dml";
programArgs = new String[]{"-args", Integer.toString(rows), Integer.toString(cols) };
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = recompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
//disable rand specific recompile
@@ -160,7 +160,7 @@ public class RandRecompileTest extends AutomatedTestBase
}
finally
{
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = oldFlagRecompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = oldFlagRecompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA;
OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE = oldFlagRand1;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
index 531a5b7..54c8fed 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
@@ -23,10 +23,8 @@ import java.io.IOException;
import java.util.HashMap;
import org.junit.Assert;
-
import org.junit.Test;
-
-import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.matrix.data.InputInfo;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
@@ -120,7 +118,7 @@ public class ReblockRecompileTest extends AutomatedTestBase
//compare matrices
try
{
- MatrixBlock mo = DataConverter.readMatrixFromHDFS(output("R"), InputInfo.BinaryBlockInputInfo, rows, 1, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize);
+ MatrixBlock mo = DataConverter.readMatrixFromHDFS(output("R"), InputInfo.BinaryBlockInputInfo, rows, 1, OptimizerUtils.DEFAULT_BLOCKSIZE, OptimizerUtils.DEFAULT_BLOCKSIZE);
HashMap<CellIndex, Double> dmlfile = new HashMap<CellIndex,Double>();
for( int i=0; i<mo.getNumRows(); i++ )
for( int j=0; j<mo.getNumColumns(); j++ )
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
index 54f207c..5cafd6a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
@@ -23,9 +23,8 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.hops.OptimizerUtils;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
@@ -166,7 +165,7 @@ public class SparsityFunctionRecompileTest extends AutomatedTestBase
private void runRecompileTest( String testname, boolean recompile, boolean IPA )
{
- boolean oldFlagRecompile = OptimizerUtils.ALLOW_DYN_RECOMPILATION;
+ boolean oldFlagRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS;
boolean oldFlagBranchRemoval = OptimizerUtils.ALLOW_BRANCH_REMOVAL;
@@ -180,12 +179,12 @@ public class SparsityFunctionRecompileTest extends AutomatedTestBase
programArgs = new String[]{"-args",
input("V"), Double.toString(val), output("R") };
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = recompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA;
OptimizerUtils.ALLOW_BRANCH_REMOVAL = false;
MatrixBlock mb = MatrixBlock.randOperations((int)rows, (int)cols, sparsity, 0, 1, "uniform", 732);
- MatrixCharacteristics mc = new MatrixCharacteristics(rows,cols,DMLTranslator.DMLBlockSize,DMLTranslator.DMLBlockSize,(long)(rows*cols*sparsity));
+ MatrixCharacteristics mc = new MatrixCharacteristics(rows,cols,OptimizerUtils.DEFAULT_BLOCKSIZE,OptimizerUtils.DEFAULT_BLOCKSIZE,(long)(rows*cols*sparsity));
DataConverter.writeMatrixToHDFS(mb, input("V"), OutputInfo.TextCellOutputInfo, mc);
MapReduceTool.writeMetaDataFile(input("V.mtd"), ValueType.DOUBLE, mc, OutputInfo.TextCellOutputInfo);
@@ -221,7 +220,7 @@ public class SparsityFunctionRecompileTest extends AutomatedTestBase
}
finally
{
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = oldFlagRecompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = oldFlagRecompile;
OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA;
OptimizerUtils.ALLOW_BRANCH_REMOVAL = oldFlagBranchRemoval;
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
index dc01e34..357b15a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
@@ -22,11 +22,9 @@ package org.apache.sysml.test.integration.functions.recompile;
import java.util.HashMap;
import org.junit.Assert;
-
import org.junit.Test;
-
+import org.apache.sysml.conf.CompilerConfig;
import org.apache.sysml.hops.OptimizerUtils;
-import org.apache.sysml.parser.DMLTranslator;
import org.apache.sysml.parser.Expression.ValueType;
import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
@@ -135,7 +133,7 @@ public class SparsityRecompileTest extends AutomatedTestBase
private void runRecompileTest( String testname, boolean recompile )
{
- boolean oldFlagRecompile = OptimizerUtils.ALLOW_DYN_RECOMPILATION;
+ boolean oldFlagRecompile = CompilerConfig.FLAG_DYN_RECOMPILE;
try
{
@@ -146,10 +144,10 @@ public class SparsityRecompileTest extends AutomatedTestBase
programArgs = new String[]{"-explain", "-args",
input("V"), Double.toString(val), output("R") };
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = recompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = recompile;
MatrixBlock mb = MatrixBlock.randOperations((int)rows, (int)cols, sparsity, 0, 1, "uniform", System.currentTimeMillis());
- MatrixCharacteristics mc = new MatrixCharacteristics(rows,cols,DMLTranslator.DMLBlockSize,DMLTranslator.DMLBlockSize,(long)(rows*cols*sparsity));
+ MatrixCharacteristics mc = new MatrixCharacteristics(rows,cols,OptimizerUtils.DEFAULT_BLOCKSIZE,OptimizerUtils.DEFAULT_BLOCKSIZE,(long)(rows*cols*sparsity));
DataConverter.writeMatrixToHDFS(mb, input("V"), OutputInfo.TextCellOutputInfo, mc);
MapReduceTool.writeMetaDataFile(input("V.mtd"), ValueType.DOUBLE, mc, OutputInfo.TextCellOutputInfo);
@@ -183,7 +181,7 @@ public class SparsityRecompileTest extends AutomatedTestBase
}
finally
{
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = oldFlagRecompile;
+ CompilerConfig.FLAG_DYN_RECOMPILE = oldFlagRecompile;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
index e08c8dd..058308b 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
import org.apache.sysml.api.DMLScript;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.conf.ConfigurationManager;
-import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.runtime.DMLRuntimeException;
import org.apache.sysml.runtime.io.ReaderBinaryBlock;
import org.apache.sysml.runtime.io.ReaderTextCSV;
@@ -229,8 +228,8 @@ public class ScalingTest extends AutomatedTestBase
ReaderBinaryBlock bbReader = new ReaderBinaryBlock(false);
out = bbReader.readMatrixFromHDFS(
outputFile, exp.getNumRows(), exp.getNumColumns(),
- ConfigurationManager.getConfig().getIntValue( DMLConfig.DEFAULT_BLOCK_SIZE ),
- ConfigurationManager.getConfig().getIntValue( DMLConfig.DEFAULT_BLOCK_SIZE ),
+ ConfigurationManager.getBlocksize(),
+ ConfigurationManager.getBlocksize(),
-1);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java b/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
index e607ee2..3d799f0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import org.apache.sysml.api.DMLScript;
import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
import org.apache.sysml.conf.ConfigurationManager;
-import org.apache.sysml.conf.DMLConfig;
import org.apache.sysml.runtime.io.ReaderBinaryBlock;
import org.apache.sysml.runtime.io.ReaderTextCSV;
import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
@@ -666,13 +665,13 @@ public class TransformTest extends AutomatedTestBase
ReaderBinaryBlock bbReader = new ReaderBinaryBlock(false);
out = bbReader.readMatrixFromHDFS(
output("tfout"), exp.getNumRows(), exp.getNumColumns(),
- ConfigurationManager.getConfig().getIntValue( DMLConfig.DEFAULT_BLOCK_SIZE ),
- ConfigurationManager.getConfig().getIntValue( DMLConfig.DEFAULT_BLOCK_SIZE ),
+ ConfigurationManager.getBlocksize(),
+ ConfigurationManager.getBlocksize(),
-1);
out2 = bbReader.readMatrixFromHDFS(
output("test_tfout"), exp.getNumRows(), exp.getNumColumns(),
- ConfigurationManager.getConfig().getIntValue( DMLConfig.DEFAULT_BLOCK_SIZE ),
- ConfigurationManager.getConfig().getIntValue( DMLConfig.DEFAULT_BLOCK_SIZE ),
+ ConfigurationManager.getBlocksize(),
+ ConfigurationManager.getBlocksize(),
-1);
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/257793d8/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java
index 062a680..cb19d04 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.sysml.hops.OptimizerUtils;
import org.apache.sysml.runtime.controlprogram.parfor.opt.OptimizerRuleBased;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
@@ -95,10 +94,8 @@ public class UpdateInPlaceTest extends AutomatedTestBase
//Note: In order to run these tests against ParFor loop, parfor's DEBUG flag needs to be set in the script.
@Override
- public void setUp()
- {
+ public void setUp() {
TestUtils.clearAssertionInformation();
- OptimizerUtils.ALLOW_DYN_RECOMPILATION = true;
addTestConfiguration(TEST_NAME, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME, null));
}