Repository: systemml Updated Branches: refs/heads/master a22502583 -> debe6d231
[HOTFIX] Fix parfor repeated opt test (inconsistent degree of par) After the recent modifications regarding the sparse block size estimates and parfor optimizer accounting for shared reads, there has been a discrepancy between local and jenkins builds due to different degree of parallelism. This patch fixes this inconsistency by forcing a common degree of parallelism 8 (which will be available on nearly all platforms). Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/debe6d23 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/debe6d23 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/debe6d23 Branch: refs/heads/master Commit: debe6d23156a78b9406b5ea6aa8978721a006d46 Parents: a225025 Author: Matthias Boehm <[email protected]> Authored: Sat Apr 21 15:48:51 2018 -0700 Committer: Matthias Boehm <[email protected]> Committed: Sat Apr 21 15:48:51 2018 -0700 ---------------------------------------------------------------------- .../functions/parfor/ParForRepeatedOptimizationTest.java | 4 ++-- src/test/scripts/functions/parfor/parfor_repeatedopt1.dml | 2 +- src/test/scripts/functions/parfor/parfor_repeatedopt2.dml | 2 +- src/test/scripts/functions/parfor/parfor_repeatedopt3.dml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/debe6d23/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java index e0dbfd8..f12dbcb 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java @@ -47,8 +47,8 @@ public class ParForRepeatedOptimizationTest extends AutomatedTestBase private final static String TEST_CLASS_DIR = TEST_DIR + ParForRepeatedOptimizationTest.class.getSimpleName() + "/"; private final static double eps = 1e-8; - private final static int rows = 1000000; - private final static int cols = 10; + private final static int rows = 1000000; + private final static int cols = 10; private final static double sparsity = 0.7; @Override http://git-wip-us.apache.org/repos/asf/systemml/blob/debe6d23/src/test/scripts/functions/parfor/parfor_repeatedopt1.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_repeatedopt1.dml b/src/test/scripts/functions/parfor/parfor_repeatedopt1.dml index 724dc4b..e5d21a8 100644 --- a/src/test/scripts/functions/parfor/parfor_repeatedopt1.dml +++ b/src/test/scripts/functions/parfor/parfor_repeatedopt1.dml @@ -29,7 +29,7 @@ iter = 1; while( iter <= 3 ) { #repeated opt for each while iteration - parfor( i in 1:ncol(V), log=DEBUG ) + parfor( i in 1:ncol(V), log=DEBUG, opt=CONSTRAINED, par=8 ) { Xi = V[,i]; R[1,i] = R[1,i] + sum(Xi); http://git-wip-us.apache.org/repos/asf/systemml/blob/debe6d23/src/test/scripts/functions/parfor/parfor_repeatedopt2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_repeatedopt2.dml b/src/test/scripts/functions/parfor/parfor_repeatedopt2.dml index c61761f..9c9fef0 100644 --- a/src/test/scripts/functions/parfor/parfor_repeatedopt2.dml +++ b/src/test/scripts/functions/parfor/parfor_repeatedopt2.dml @@ -34,7 +34,7 @@ while( iter <= 3 ) } #repeated opt for each while iteration - parfor( i in 1:ncol(V), log=DEBUG ) + parfor( i in 1:ncol(V), log=DEBUG, opt=CONSTRAINED, par=8 ) { Xi = V[,i]; R[1,i] = R[1,i] + sum(Xi); http://git-wip-us.apache.org/repos/asf/systemml/blob/debe6d23/src/test/scripts/functions/parfor/parfor_repeatedopt3.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_repeatedopt3.dml b/src/test/scripts/functions/parfor/parfor_repeatedopt3.dml index 4647431..3cefc94 100644 --- a/src/test/scripts/functions/parfor/parfor_repeatedopt3.dml +++ b/src/test/scripts/functions/parfor/parfor_repeatedopt3.dml @@ -37,7 +37,7 @@ while( iter <= 3 ) } #repeated opt for each while iteration - parfor( i in 1:ncol(V), log=DEBUG ) + parfor( i in 1:ncol(V), log=DEBUG, opt=CONSTRAINED, par=8 ) { Xi = V[,i]; R[1,i] = R[1,i] + sum(Xi);
