Repository: incubator-reef Updated Branches: refs/heads/master 987d4f37d -> 3686317b3
[REEF-244] Adding Group Communication test cases on YARN This PR is to add test cases for group communication running on YARN JIRA: [REEF-244](https://issues.apache.org/jira/browse/REEF-244) Pull Request: This closes #141 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/3686317b Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/3686317b Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/3686317b Branch: refs/heads/master Commit: 3686317b332e9a82b1b4dcc1f9cf56b29ffd5e17 Parents: 987d4f3 Author: Julia Wang <[email protected]> Authored: Thu Apr 9 16:31:03 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Mon Apr 13 09:45:32 2015 -0700 ---------------------------------------------------------------------- .../BroadcastReduceTest/BroadcastReduceTest.cs | 19 ++++++++++++++++--- .../PipelinedBroadcastReduceTest.cs | 18 +++++++++++++++--- .../MPI/ScatterReduceTest/ScatterReduceTest.cs | 18 +++++++++++++++--- 3 files changed, 46 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3686317b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceTest.cs index d3e74f8..fea51de 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceTest.cs @@ -51,10 +51,24 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.BroadcastReduceTest } [TestMethod] - public void TestBroadcastAndReduce() + public void TestBroadcastAndReduceOnLocalRuntime() { int numTasks = 9; + TestBroadcastAndReduce(false, numTasks); + ValidateSuccessForLocalRuntime(numTasks); + } + + [Ignore] + [TestMethod] + public void TestBroadcastAndReduceOnYarn() + { + int numTasks = 9; + TestBroadcastAndReduce(true, numTasks); + } + [TestMethod] + public void TestBroadcastAndReduce(bool runOnYarn, int numTasks) + { IConfiguration driverConfig = TangFactory.GetTang().NewConfigurationBuilder( DriverBridgeConfiguration.ConfigurationModule .Set(DriverBridgeConfiguration.OnDriverStarted, GenericType<BroadcastReduceDriver>.Class) @@ -89,8 +103,7 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.BroadcastReduceTest appDlls.Add(typeof(INameClient).Assembly.GetName().Name); appDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name); - TestRun(appDlls, merged, false, JavaLoggingSetting.VERBOSE); - ValidateSuccessForLocalRuntime(numTasks); + TestRun(appDlls, merged, runOnYarn, JavaLoggingSetting.VERBOSE); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3686317b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/PipelinedBroadcastReduceTest/PipelinedBroadcastReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/PipelinedBroadcastReduceTest/PipelinedBroadcastReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/PipelinedBroadcastReduceTest/PipelinedBroadcastReduceTest.cs index 0df71e6..05d0b9b 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/PipelinedBroadcastReduceTest/PipelinedBroadcastReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/PipelinedBroadcastReduceTest/PipelinedBroadcastReduceTest.cs @@ -50,10 +50,23 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.PipelinedBroadcastReduceTest } [TestMethod] - public void TestBroadcastAndReduce() + public void TestPipelinedBroadcastAndReduceOnLocalRuntime() { const int numTasks = 9; + TestBroadcastAndReduce(false, numTasks); + ValidateSuccessForLocalRuntime(numTasks); + } + [Ignore] + [TestMethod] + public void TestPipelinedBroadcastAndReduceOnYarn() + { + const int numTasks = 9; + TestBroadcastAndReduce(true, numTasks); + } + + public void TestBroadcastAndReduce(bool runOnYarn, int numTasks) + { IConfiguration driverConfig = TangFactory.GetTang().NewConfigurationBuilder( DriverBridgeConfiguration.ConfigurationModule .Set(DriverBridgeConfiguration.OnDriverStarted, GenericType<PipelinedBroadcastReduceDriver>.Class) @@ -91,8 +104,7 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.PipelinedBroadcastReduceTest appDlls.Add(typeof(INameClient).Assembly.GetName().Name); appDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name); - TestRun(appDlls, merged, false, JavaLoggingSetting.VERBOSE); - ValidateSuccessForLocalRuntime(numTasks); + TestRun(appDlls, merged, runOnYarn, JavaLoggingSetting.VERBOSE); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3686317b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceTest.cs index 59e27b4..d3afddc 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceTest.cs @@ -50,10 +50,23 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.ScatterReduceTest } [TestMethod] - public void TestScatterAndReduce() + public void TestScatterAndReduceOnLocalRuntime() { int numTasks = 5; + TestScatterAndReduce(false, numTasks); + ValidateSuccessForLocalRuntime(numTasks); + } + + [TestMethod] + public void TestScatterAndReduceOnYarn() + { + int numTasks = 5; + TestScatterAndReduce(true, numTasks); + } + [TestMethod] + public void TestScatterAndReduce(bool runOnYarn, int numTasks) + { IConfiguration driverConfig = TangFactory.GetTang().NewConfigurationBuilder( DriverBridgeConfiguration.ConfigurationModule .Set(DriverBridgeConfiguration.OnDriverStarted, GenericType<ScatterReduceDriver>.Class) @@ -85,8 +98,7 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.ScatterReduceTest appDlls.Add(typeof(INameClient).Assembly.GetName().Name); appDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name); - TestRun(appDlls, merged, false, JavaLoggingSetting.VERBOSE); - ValidateSuccessForLocalRuntime(numTasks); + TestRun(appDlls, merged, runOnYarn, JavaLoggingSetting.VERBOSE); } } }
