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/07/14 06:01:26 UTC
[1/2] systemml git commit: [SYSTEMML-1765] Support for reading dml
scripts from object stores
Repository: systemml
Updated Branches:
refs/heads/master f31548007 -> a4ce06461
[SYSTEMML-1765] Support for reading dml scripts from object stores
This patch generates the various methods for reading dml scripts files
to support (apart from local fs and hdfs) also the read from object
stores such as swift and s3.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/586c67b6
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/586c67b6
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/586c67b6
Branch: refs/heads/master
Commit: 586c67b6a47950305f1bb57ba809aa295a83861b
Parents: f315480
Author: Matthias Boehm <mb...@gmail.com>
Authored: Thu Jul 13 17:20:20 2017 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Thu Jul 13 19:46:25 2017 -0700
----------------------------------------------------------------------
src/main/java/org/apache/sysml/api/DMLScript.java | 7 +++----
.../java/org/apache/sysml/api/jmlc/Connection.java | 4 ++--
.../org/apache/sysml/api/mlcontext/ScriptFactory.java | 14 +++++++-------
src/main/java/org/apache/sysml/conf/DMLConfig.java | 4 ++--
.../java/org/apache/sysml/parser/ParserWrapper.java | 7 ++++---
5 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/586c67b6/src/main/java/org/apache/sysml/api/DMLScript.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/DMLScript.java b/src/main/java/org/apache/sysml/api/DMLScript.java
index 6dd7e89..515d632 100644
--- a/src/main/java/org/apache/sysml/api/DMLScript.java
+++ b/src/main/java/org/apache/sysml/api/DMLScript.java
@@ -567,8 +567,8 @@ public class DMLScript
try
{
//read from hdfs or gpfs file system
- if( fileName.startsWith("hdfs:")
- || fileName.startsWith("gpfs:") )
+ if( fileName.startsWith("hdfs:") || fileName.startsWith("gpfs:")
+ || IOUtilFunctions.isObjectStoreFileScheme(new Path(fileName)) )
{
Path scriptPath = new Path(fileName);
FileSystem fs = IOUtilFunctions.getFileSystem(scriptPath);
@@ -588,8 +588,7 @@ public class DMLScript
sb.append( "\n" );
}
}
- catch (IOException ex)
- {
+ catch (IOException ex) {
LOG.error("Failed to read the script from the file system", ex);
throw ex;
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/586c67b6/src/main/java/org/apache/sysml/api/jmlc/Connection.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/jmlc/Connection.java b/src/main/java/org/apache/sysml/api/jmlc/Connection.java
index af50139..7739a35 100644
--- a/src/main/java/org/apache/sysml/api/jmlc/Connection.java
+++ b/src/main/java/org/apache/sysml/api/jmlc/Connection.java
@@ -250,8 +250,8 @@ public class Connection implements Closeable
try
{
//read from hdfs or gpfs file system
- if( fname.startsWith("hdfs:")
- || fname.startsWith("gpfs:") )
+ if( fname.startsWith("hdfs:") || fname.startsWith("gpfs:")
+ || IOUtilFunctions.isObjectStoreFileScheme(new Path(fname)) )
{
Path scriptPath = new Path(fname);
FileSystem fs = IOUtilFunctions.getFileSystem(scriptPath);
http://git-wip-us.apache.org/repos/asf/systemml/blob/586c67b6/src/main/java/org/apache/sysml/api/mlcontext/ScriptFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/mlcontext/ScriptFactory.java b/src/main/java/org/apache/sysml/api/mlcontext/ScriptFactory.java
index 4a30f00..10cd947 100644
--- a/src/main/java/org/apache/sysml/api/mlcontext/ScriptFactory.java
+++ b/src/main/java/org/apache/sysml/api/mlcontext/ScriptFactory.java
@@ -351,20 +351,20 @@ public class ScriptFactory {
throw new MLContextException("Script file path is null");
}
try {
- if (scriptFilePath.startsWith("hdfs:") || scriptFilePath.startsWith("gpfs:")) {
+ if ( scriptFilePath.startsWith("hdfs:") || scriptFilePath.startsWith("gpfs:")
+ || IOUtilFunctions.isObjectStoreFileScheme(new Path(scriptFilePath))) {
Path path = new Path(scriptFilePath);
FileSystem fs = IOUtilFunctions.getFileSystem(path);
- FSDataInputStream fsdis = fs.open(path);
- return IOUtils.toString(fsdis);
+ try( FSDataInputStream fsdis = fs.open(path) ) {
+ return IOUtils.toString(fsdis);
+ }
} else {// from local file system
File scriptFile = new File(scriptFilePath);
return FileUtils.readFileToString(scriptFile);
}
- } catch (IllegalArgumentException e) {
+ } catch (IllegalArgumentException | IOException e) {
throw new MLContextException("Error trying to read script string from file: " + scriptFilePath, e);
- } catch (IOException e) {
- throw new MLContextException("Error trying to read script string from file: " + scriptFilePath, e);
- }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/systemml/blob/586c67b6/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 3a21d95..00a591c 100644
--- a/src/main/java/org/apache/sysml/conf/DMLConfig.java
+++ b/src/main/java/org/apache/sysml/conf/DMLConfig.java
@@ -172,8 +172,8 @@ public class DMLConfig
factory.setIgnoringComments(true); //ignore XML comments
DocumentBuilder builder = factory.newDocumentBuilder();
Document domTree = null;
- if (_fileName.startsWith("hdfs:") ||
- _fileName.startsWith("gpfs:") ) // config file from DFS
+ if( _fileName.startsWith("hdfs:") || _fileName.startsWith("gpfs:")
+ || IOUtilFunctions.isObjectStoreFileScheme(new Path(_fileName)) )
{
Path configFilePath = new Path(_fileName);
FileSystem DFS = IOUtilFunctions.getFileSystem(configFilePath);
http://git-wip-us.apache.org/repos/asf/systemml/blob/586c67b6/src/main/java/org/apache/sysml/parser/ParserWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParserWrapper.java b/src/main/java/org/apache/sysml/parser/ParserWrapper.java
index 9a32b00..71e405b 100644
--- a/src/main/java/org/apache/sysml/parser/ParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/ParserWrapper.java
@@ -94,11 +94,12 @@ public abstract class ParserWrapper {
try
{
//read from hdfs or gpfs file system
- if( script.startsWith("hdfs:")
- || script.startsWith("gpfs:") )
+ if( script.startsWith("hdfs:") || script.startsWith("gpfs:")
+ || IOUtilFunctions.isObjectStoreFileScheme(new Path(script)) )
{
- LOG.debug("Looking for the following file in HDFS or GPFS: " + script);
Path scriptPath = new Path(script);
+ String scheme = (scriptPath.toUri()!=null) ? scriptPath.toUri().getScheme() : null;
+ LOG.debug("Looking for the following file in "+scheme+": " + script);
FileSystem fs = IOUtilFunctions.getFileSystem(scriptPath);
in = new BufferedReader(new InputStreamReader(fs.open(scriptPath)));
}
[2/2] systemml git commit: [SYSTEMML-1768] Cleanup properties of
systemml-config file
Posted by mb...@apache.org.
[SYSTEMML-1768] Cleanup properties of systemml-config file
This patch cleans up the following two properties of the
SystemML-config.xml file in order to better convey their meaning:
1) cp.parallel.matrixmult -> cp.parallel.ops
2) cp.parallel.textio -> cp.parallel.io
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/a4ce0646
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/a4ce0646
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/a4ce0646
Branch: refs/heads/master
Commit: a4ce06461deedd9c4f9d0293195ce81ae42ccfd6
Parents: 586c67b
Author: Matthias Boehm <mb...@gmail.com>
Authored: Thu Jul 13 19:46:08 2017 -0700
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Thu Jul 13 19:46:26 2017 -0700
----------------------------------------------------------------------
conf/SystemML-config.xml.template | 8 +++----
docs/standalone-guide.md | 4 ++--
.../java/org/apache/sysml/conf/DMLConfig.java | 25 ++++++++++----------
.../org/apache/sysml/hops/OptimizerUtils.java | 4 ++--
src/main/standalone/SystemML-config.xml | 8 +++----
src/test/config/SystemML-config.xml | 8 +++----
.../functions/mlcontext/GNMFTest.java | 4 ++--
.../SystemML-config-codegen-compress.xml | 8 +++----
.../codegen/SystemML-config-codegen.xml | 8 +++----
.../codegen/SystemML-config-codegen6.xml | 8 +++----
.../compress/SystemML-config-compress.xml | 8 +++----
.../functions/dmlscript/SystemML-config.xml | 4 ++--
.../gdfo/SystemML-config-globalopt.xml | 8 +++----
13 files changed, 52 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/conf/SystemML-config.xml.template
----------------------------------------------------------------------
diff --git a/conf/SystemML-config.xml.template b/conf/SystemML-config.xml.template
index e026f8e..ff724b4 100644
--- a/conf/SystemML-config.xml.template
+++ b/conf/SystemML-config.xml.template
@@ -48,11 +48,11 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
<!-- enables compressed linear algebra, experimental feature -->
<compressed.linalg>false</compressed.linalg>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/docs/standalone-guide.md
----------------------------------------------------------------------
diff --git a/docs/standalone-guide.md b/docs/standalone-guide.md
index 4f901c1..a401c30 100644
--- a/docs/standalone-guide.md
+++ b/docs/standalone-guide.md
@@ -334,8 +334,8 @@ The console output should show the accuracy of the trained model in percent, i.e
15/09/01 01:32:51 INFO conf.DMLConfig: Updating dml.yarn.appmaster.mem with value 2048
15/09/01 01:32:51 INFO conf.DMLConfig: Updating dml.yarn.mapreduce.mem with value 2048
15/09/01 01:32:51 INFO conf.DMLConfig: Updating dml.yarn.app.queue with value default
- 15/09/01 01:32:51 INFO conf.DMLConfig: Updating cp.parallel.matrixmult with value true
- 15/09/01 01:32:51 INFO conf.DMLConfig: Updating cp.parallel.textio with value true
+ 15/09/01 01:32:51 INFO conf.DMLConfig: Updating cp.parallel.ops with value true
+ 15/09/01 01:32:51 INFO conf.DMLConfig: Updating cp.parallel.io with value true
Accuracy (%): 74.14965986394557
15/09/01 01:32:52 INFO api.DMLScript: SystemML Statistics:
Total execution time: 0.130 sec.
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/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 00a591c..5b5b8ea 100644
--- a/src/main/java/org/apache/sysml/conf/DMLConfig.java
+++ b/src/main/java/org/apache/sysml/conf/DMLConfig.java
@@ -68,15 +68,15 @@ public class DMLConfig
public static final String YARN_APPMASTERMEM = "dml.yarn.appmaster.mem";
public static final String YARN_MAPREDUCEMEM = "dml.yarn.mapreduce.mem";
public static final String YARN_APPQUEUE = "dml.yarn.app.queue";
- public static final String CP_PARALLEL_MATRIXMULT = "cp.parallel.matrixmult";
- public static final String CP_PARALLEL_TEXTIO = "cp.parallel.textio";
+ public static final String CP_PARALLEL_OPS = "cp.parallel.ops";
+ public static final String CP_PARALLEL_IO = "cp.parallel.io";
public static final String COMPRESSED_LINALG = "compressed.linalg";
- public static final String NATIVE_BLAS = "native.blas";
+ public static final String NATIVE_BLAS = "native.blas";
public static final String CODEGEN = "codegen.enabled"; //boolean
public static final String CODEGEN_PLANCACHE = "codegen.plancache"; //boolean
public static final String CODEGEN_LITERALS = "codegen.literals"; //1..heuristic, 2..always
- public static final String EXTRA_GPU_STATS = "systemml.stats.extraGPU"; //boolean
- public static final String EXTRA_DNN_STATS = "systemml.stats.extraDNN"; //boolean
+ public static final String EXTRA_GPU_STATS = "systemml.stats.extraGPU"; //boolean
+ public static final String EXTRA_DNN_STATS = "systemml.stats.extraDNN"; //boolean
public static final String MAX_GPUS_PER_PROCESS = "systemml.gpu.perProcessMax"; // boolean, maximum number of gpus to use, -1 for all
// Fraction of available memory to use. The available memory is computer when the GPUContext is created
@@ -110,19 +110,18 @@ public class DMLConfig
_defaultVals.put(YARN_APPMASTERMEM, "2048" );
_defaultVals.put(YARN_MAPREDUCEMEM, "-1" );
_defaultVals.put(YARN_APPQUEUE, "default" );
- _defaultVals.put(CP_PARALLEL_MATRIXMULT, "true" );
- _defaultVals.put(CP_PARALLEL_TEXTIO, "true" );
+ _defaultVals.put(CP_PARALLEL_OPS, "true" );
+ _defaultVals.put(CP_PARALLEL_IO, "true" );
_defaultVals.put(COMPRESSED_LINALG, "false" );
_defaultVals.put(CODEGEN, "false" );
_defaultVals.put(CODEGEN_PLANCACHE, "true" );
_defaultVals.put(CODEGEN_LITERALS, "1" );
- _defaultVals.put(NATIVE_BLAS, "none" );
-
- _defaultVals.put(EXTRA_GPU_STATS, "false" );
- _defaultVals.put(EXTRA_DNN_STATS, "false" );
+ _defaultVals.put(NATIVE_BLAS, "none" );
+ _defaultVals.put(EXTRA_GPU_STATS, "false" );
+ _defaultVals.put(EXTRA_DNN_STATS, "false" );
_defaultVals.put(GPU_MEMORY_UTILIZATION_FACTOR, "0.9" );
- _defaultVals.put(MAX_GPUS_PER_PROCESS, "-1");
+ _defaultVals.put(MAX_GPUS_PER_PROCESS, "-1");
}
public DMLConfig()
@@ -402,7 +401,7 @@ public class DMLConfig
LOCAL_TMP_DIR,SCRATCH_SPACE,OPTIMIZATION_LEVEL,
NUM_REDUCERS, DEFAULT_BLOCK_SIZE,
YARN_APPMASTER, YARN_APPMASTERMEM, YARN_MAPREDUCEMEM,
- CP_PARALLEL_MATRIXMULT, CP_PARALLEL_TEXTIO, NATIVE_BLAS,
+ CP_PARALLEL_OPS, CP_PARALLEL_IO, NATIVE_BLAS,
COMPRESSED_LINALG, CODEGEN, CODEGEN_LITERALS, CODEGEN_PLANCACHE,
EXTRA_GPU_STATS, EXTRA_DNN_STATS
};
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/hops/OptimizerUtils.java b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
index dcbc27a..7f07cfc 100644
--- a/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
@@ -356,7 +356,7 @@ public class OptimizerUtils
}
//handle parallel text io (incl awareness of thread contention in <jdk8)
- if (!dmlconf.getBooleanValue(DMLConfig.CP_PARALLEL_TEXTIO)) {
+ if (!dmlconf.getBooleanValue(DMLConfig.CP_PARALLEL_IO)) {
cconf.set(ConfigType.PARALLEL_CP_READ_TEXTFORMATS, false);
cconf.set(ConfigType.PARALLEL_CP_WRITE_TEXTFORMATS, false);
cconf.set(ConfigType.PARALLEL_CP_READ_BINARYFORMATS, false);
@@ -371,7 +371,7 @@ public class OptimizerUtils
}
//handle parallel matrix mult / rand configuration
- if (!dmlconf.getBooleanValue(DMLConfig.CP_PARALLEL_MATRIXMULT)) {
+ if (!dmlconf.getBooleanValue(DMLConfig.CP_PARALLEL_OPS)) {
cconf.set(ConfigType.PARALLEL_CP_MATRIX_OPERATIONS, false);
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/main/standalone/SystemML-config.xml
----------------------------------------------------------------------
diff --git a/src/main/standalone/SystemML-config.xml b/src/main/standalone/SystemML-config.xml
index 9fc2aef..9b52a6d 100644
--- a/src/main/standalone/SystemML-config.xml
+++ b/src/main/standalone/SystemML-config.xml
@@ -48,9 +48,9 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded matrix operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
</root>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/config/SystemML-config.xml
----------------------------------------------------------------------
diff --git a/src/test/config/SystemML-config.xml b/src/test/config/SystemML-config.xml
index cc22aee..9b52a6d 100644
--- a/src/test/config/SystemML-config.xml
+++ b/src/test/config/SystemML-config.xml
@@ -48,9 +48,9 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded matrix operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
</root>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/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 f9f5fbd..76deec5 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
@@ -200,14 +200,14 @@ public class GNMFTest extends AutomatedTestBase
if(numRegisteredOutputs >= 2) {
script.out("W");
- ml.setConfigProperty("cp.parallel.matrixmult", "false");
+ ml.setConfigProperty("cp.parallel.ops", "false");
}
MLResults results = ml.execute(script);
if(numRegisteredOutputs >= 2) {
String configStr = ConfigurationManager.getDMLConfig().getConfigInfo();
- if(configStr.contains("cp.parallel.matrixmult: true"))
+ if(configStr.contains("cp.parallel.ops: true"))
Assert.fail("Configuration not updated via setConfig");
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/scripts/functions/codegen/SystemML-config-codegen-compress.xml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/codegen/SystemML-config-codegen-compress.xml b/src/test/scripts/functions/codegen/SystemML-config-codegen-compress.xml
index ffdbaac..5c8a9b7 100644
--- a/src/test/scripts/functions/codegen/SystemML-config-codegen-compress.xml
+++ b/src/test/scripts/functions/codegen/SystemML-config-codegen-compress.xml
@@ -48,11 +48,11 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
<!-- enables automatic code generation -->
<compressed.linalg>true</compressed.linalg>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/scripts/functions/codegen/SystemML-config-codegen.xml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/codegen/SystemML-config-codegen.xml b/src/test/scripts/functions/codegen/SystemML-config-codegen.xml
index 5d623ae..95e0dba 100644
--- a/src/test/scripts/functions/codegen/SystemML-config-codegen.xml
+++ b/src/test/scripts/functions/codegen/SystemML-config-codegen.xml
@@ -48,11 +48,11 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
<!-- enables automatic code generation -->
<codegen.enabled>true</codegen.enabled>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/scripts/functions/codegen/SystemML-config-codegen6.xml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/codegen/SystemML-config-codegen6.xml b/src/test/scripts/functions/codegen/SystemML-config-codegen6.xml
index aa7f5bd..fc41c2a 100644
--- a/src/test/scripts/functions/codegen/SystemML-config-codegen6.xml
+++ b/src/test/scripts/functions/codegen/SystemML-config-codegen6.xml
@@ -48,11 +48,11 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
<!-- enables automatic code generation -->
<codegen.enabled>true</codegen.enabled>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/scripts/functions/compress/SystemML-config-compress.xml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/compress/SystemML-config-compress.xml b/src/test/scripts/functions/compress/SystemML-config-compress.xml
index 0728ecc..4d56c66 100644
--- a/src/test/scripts/functions/compress/SystemML-config-compress.xml
+++ b/src/test/scripts/functions/compress/SystemML-config-compress.xml
@@ -48,11 +48,11 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded matrix operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
<!-- enables compressed linear algebra for cp/spark -->
<compressed.linalg>true</compressed.linalg>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/scripts/functions/dmlscript/SystemML-config.xml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/dmlscript/SystemML-config.xml b/src/test/scripts/functions/dmlscript/SystemML-config.xml
index dfcbd87..dc1e298 100644
--- a/src/test/scripts/functions/dmlscript/SystemML-config.xml
+++ b/src/test/scripts/functions/dmlscript/SystemML-config.xml
@@ -20,6 +20,6 @@
<numreducers>10</numreducers>
<scratch>scratch_space</scratch>
<defaultblocksize>1000</defaultblocksize>
-<cp.parallel.matrixmult>true</cp.parallel.matrixmult>
-<cp.parallel.textio>false</cp.parallel.textio>
+<cp.parallel.ops>true</cp.parallel.ops>
+<cp.parallel.io>false</cp.parallel.io>
</root>
http://git-wip-us.apache.org/repos/asf/systemml/blob/a4ce0646/src/test/scripts/functions/gdfo/SystemML-config-globalopt.xml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/gdfo/SystemML-config-globalopt.xml b/src/test/scripts/functions/gdfo/SystemML-config-globalopt.xml
index 1771351..9cf9316 100644
--- a/src/test/scripts/functions/gdfo/SystemML-config-globalopt.xml
+++ b/src/test/scripts/functions/gdfo/SystemML-config-globalopt.xml
@@ -48,11 +48,11 @@
<!-- yarn application submission queue, relevant for default capacity scheduler -->
<dml.yarn.app.queue>default</dml.yarn.app.queue>
- <!-- enables multi-threaded matrix multiplications in singlenode control program -->
- <cp.parallel.matrixmult>true</cp.parallel.matrixmult>
+ <!-- enables multi-threaded operations in singlenode control program -->
+ <cp.parallel.ops>true</cp.parallel.ops>
- <!-- enables multi-threaded read/write of text formats in singlenode control program -->
- <cp.parallel.textio>true</cp.parallel.textio>
+ <!-- enables multi-threaded read/write in singlenode control program -->
+ <cp.parallel.io>true</cp.parallel.io>
<!-- piggybacked test for custom mapred/mapreduce configurations -->