[SYSTEMML-1427] Fix test expected compiled mr jobs (w/ correct mem est) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/95be80c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/95be80c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/95be80c5
Branch: refs/heads/master Commit: 95be80c5b7542097c8c6830d8b5037ec26a3b55c Parents: 75e7ad6 Author: Matthias Boehm <[email protected]> Authored: Tue Mar 21 22:30:40 2017 -0700 Committer: Matthias Boehm <[email protected]> Committed: Tue Mar 21 22:30:40 2017 -0700 ---------------------------------------------------------------------- .../functions/recompile/BranchRemovalTest.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/95be80c5/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java index 74d3826..733df84 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java @@ -107,9 +107,6 @@ public class BranchRemovalTest extends AutomatedTestBase boolean oldFlagBranchRemoval = OptimizerUtils.ALLOW_BRANCH_REMOVAL; boolean oldFlagIPA = OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS; - //boolean oldFlagRand1 = OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE; - //boolean oldFlagRand3 = OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION; - int val = (condition?1:0); try @@ -131,10 +128,6 @@ public class BranchRemovalTest extends AutomatedTestBase OptimizerUtils.ALLOW_BRANCH_REMOVAL = branchRemoval; OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = IPA; - //disable rand specific recompile - //OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE = false; - //OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = false; - double[][] V = getRandomMatrix(rows, cols, -1, 1, 1.0d, 7); writeInputMatrix("X", V, true); @@ -147,24 +140,20 @@ public class BranchRemovalTest extends AutomatedTestBase TestUtils.compareMatrices(dmlfile, rfile, 0, "Stat-DML", "Stat-R"); //check expected number of compiled and executed MR jobs - int expectedNumCompiled = 4; //reblock, 3xGMR (append), write + int expectedNumCompiled = 5; //reblock, 3xGMR (append), write int expectedNumExecuted = 0; if( branchRemoval && IPA ) expectedNumCompiled = 1; //reblock else if( branchRemoval ){ - expectedNumCompiled = 3; //reblock, GMR (append), write + expectedNumCompiled = condition ? 4 : 3; //reblock, GMR (append), write } checkNumCompiledMRJobs(expectedNumCompiled); checkNumExecutedMRJobs(expectedNumExecuted); } - finally - { + finally { OptimizerUtils.ALLOW_BRANCH_REMOVAL = oldFlagBranchRemoval; OptimizerUtils.ALLOW_INTER_PROCEDURAL_ANALYSIS = oldFlagIPA; - - //OptimizerUtils.ALLOW_RAND_JOB_RECOMPILE = oldFlagRand1; - //OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = oldFlagRand3; } }
