Repository: reef Updated Branches: refs/heads/master 9d6ecfedb -> c90f8aa63
[REEF-1362] Deprecate DriverBridgeConfigurationOptions.SetOfAssemblies This change * marks DriverBridgeConfigurationOptions.SetOfAssemblies as deprecated * removes its uses from tests and examples JIRA: [REEF-1362](https://issues.apache.org/jira/browse/REEF-1362) Pull request: This closes #972 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/c90f8aa6 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/c90f8aa6 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/c90f8aa6 Branch: refs/heads/master Commit: c90f8aa639dedae2ec44e43415bf3ddc6603a601 Parents: 9d6ecfe Author: Mariia Mykhailova <[email protected]> Authored: Tue Apr 26 16:41:17 2016 -0700 Committer: Markus Weimer <[email protected]> Committed: Tue Apr 26 17:12:24 2016 -0700 ---------------------------------------------------------------------- .../Bridge/DriverBridgeConfigurationOptions.cs | 1 + .../Org.Apache.REEF.Examples.AllHandlers/AllHandlers.cs | 7 +------ .../BroadcastAndReduceClient.cs | 7 ------- .../PipelineBroadcastAndReduceClient.cs | 8 -------- .../Functional/Bridge/TestFailedTaskEventHandler.cs | 8 ++------ .../Functional/Bridge/TestSimpleEventHandlers.cs | 4 +--- .../Functional/Group/BroadcastReduceTest.cs | 11 ++--------- .../Functional/Group/PipelinedBroadcastReduceTest.cs | 11 ++--------- .../Functional/Group/ScatterReduceTest.cs | 11 ++--------- .../Functional/ML/KMeans/TestKMeans.cs | 9 +-------- .../Functional/Messaging/TestTaskMessage.cs | 11 ++--------- .../Functional/RuntimeName/RuntimeNameTest.cs | 11 ++--------- 12 files changed, 16 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs index 73c5d72..7edea2f 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs @@ -159,6 +159,7 @@ namespace Org.Apache.REEF.Driver.Bridge } [NamedParameter] + [Obsolete("Deprecated in 0.15, will be removed.")] public class SetOfAssemblies : Name<ISet<string>> { } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Examples.AllHandlers/AllHandlers.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/AllHandlers.cs b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/AllHandlers.cs index 3d3eb0a..d3c5d0a 100644 --- a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/AllHandlers.cs +++ b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/AllHandlers.cs @@ -71,13 +71,8 @@ namespace Org.Apache.REEF.Examples.AllHandlers .Set(DriverConfiguration.OnDriverRestartTaskRunning, GenericType<HelloDriverRestartRunningTaskHandler>.Class) .Build(); - var driverConfig = TangFactory.GetTang().NewConfigurationBuilder(helloDriverConfiguration) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(HelloTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - var helloJobSubmission = _jobRequestBuilder - .AddDriverConfiguration(driverConfig) + .AddDriverConfiguration(helloDriverConfiguration) .AddGlobalAssemblyForType(typeof(HelloDriverStartHandler)) .SetJobIdentifier("HelloDriver") .Build(); http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Network.Examples.Client/BroadcastAndReduceClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples.Client/BroadcastAndReduceClient.cs b/lang/cs/Org.Apache.REEF.Network.Examples.Client/BroadcastAndReduceClient.cs index f2871cc..dbff6ca 100644 --- a/lang/cs/Org.Apache.REEF.Network.Examples.Client/BroadcastAndReduceClient.cs +++ b/lang/cs/Org.Apache.REEF.Network.Examples.Client/BroadcastAndReduceClient.cs @@ -81,13 +81,6 @@ namespace Org.Apache.REEF.Network.Examples.Client IConfiguration merged = Configurations.Merge(driverConfig, groupCommDriverConfig); - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(MasterTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - merged = Configurations.Merge(merged, taskConfig); - string runPlatform = runOnYarn ? "yarn" : "local"; TestRun(merged, typeof(BroadcastReduceDriver), numTasks, "BroadcastReduceDriver", runPlatform); } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Network.Examples.Client/PipelineBroadcastAndReduceClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples.Client/PipelineBroadcastAndReduceClient.cs b/lang/cs/Org.Apache.REEF.Network.Examples.Client/PipelineBroadcastAndReduceClient.cs index 9f8c3e1..afd11a7 100644 --- a/lang/cs/Org.Apache.REEF.Network.Examples.Client/PipelineBroadcastAndReduceClient.cs +++ b/lang/cs/Org.Apache.REEF.Network.Examples.Client/PipelineBroadcastAndReduceClient.cs @@ -72,14 +72,6 @@ namespace Org.Apache.REEF.Network.Examples.Client IConfiguration merged = Configurations.Merge(driverConfig, groupCommDriverConfig); - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(PipelinedMasterTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(PipelinedSlaveTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - merged = Configurations.Merge(merged, taskConfig); - string runPlatform = runOnYarn ? "yarn" : "local"; BroadcastAndReduceClient.TestRun(merged, typeof(PipelinedBroadcastReduceDriver), numTasks, "PipelinedBroadcastReduceDriver", runPlatform); } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs index e49b148..4e64f5a 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs @@ -50,17 +50,13 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge CleanUp(testFolder); } - public IConfiguration DriverConfigurations() + private IConfiguration DriverConfigurations() { - var driverConfig = DriverConfiguration.ConfigurationModule + return DriverConfiguration.ConfigurationModule .Set(DriverConfiguration.OnDriverStarted, GenericType<FailedTaskDriver>.Class) .Set(DriverConfiguration.OnEvaluatorAllocated, GenericType<FailedTaskDriver>.Class) .Set(DriverConfiguration.OnTaskFailed, GenericType<FailedTaskDriver>.Class) .Build(); - - return TangFactory.GetTang().NewConfigurationBuilder(driverConfig) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(FailTask).Assembly.GetName().Name) - .Build(); } private sealed class FailedTaskDriver : IObserver<IDriverStarted>, IObserver<IAllocatedEvaluator>, http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs index da0d724..6b1e465 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs @@ -48,7 +48,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge CleanUp(testFolder); } - public IConfiguration DriverConfigurations() + private IConfiguration DriverConfigurations() { var helloDriverConfiguration = REEF.Driver.DriverConfiguration.ConfigurationModule .Set(REEF.Driver.DriverConfiguration.OnDriverStarted, GenericType<HelloSimpleEventHandlers>.Class) @@ -67,8 +67,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge .Build(); return TangFactory.GetTang().NewConfigurationBuilder(helloDriverConfiguration) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(HelloTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) .BindNamedParameter<IsRetain, bool>(GenericType<IsRetain>.Class, "false") .BindNamedParameter<NumberOfEvaluators, int>(GenericType<NumberOfEvaluators>.Class, "1") .Build(); http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs index 3297aa1..e810702 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs @@ -58,7 +58,7 @@ namespace Org.Apache.REEF.Tests.Functional.Group TestRun(DriverConfigurations(numTasks), typeof(BroadcastReduceDriver), numTasks, "BroadcastReduceDriver", runPlatform, testFolder); } - public IConfiguration DriverConfigurations(int numTasks) + private IConfiguration DriverConfigurations(int numTasks) { IConfiguration driverConfig = TangFactory.GetTang().NewConfigurationBuilder( DriverConfiguration.ConfigurationModule @@ -84,14 +84,7 @@ namespace Org.Apache.REEF.Tests.Functional.Group .BindIntNamedParam<GroupCommConfigurationOptions.NumberOfTasks>(numTasks.ToString(CultureInfo.InvariantCulture)) .Build(); - IConfiguration merged = Configurations.Merge(driverConfig, groupCommDriverConfig); - - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(MasterTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - return Configurations.Merge(merged, taskConfig); + return Configurations.Merge(driverConfig, groupCommDriverConfig); } } } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs index fd80195..a44b418 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs @@ -58,7 +58,7 @@ namespace Org.Apache.REEF.Tests.Functional.Group TestRun(DriverConfigurations(numTasks), typeof(PipelinedBroadcastReduceDriver), numTasks, "PipelinedBroadcastReduceDriver", runPlatform, testFolder); } - public IConfiguration DriverConfigurations(int numTasks) + private IConfiguration DriverConfigurations(int numTasks) { IConfiguration driverConfig = TangFactory.GetTang().NewConfigurationBuilder( DriverConfiguration.ConfigurationModule @@ -87,14 +87,7 @@ namespace Org.Apache.REEF.Tests.Functional.Group .BindIntNamedParam<GroupCommConfigurationOptions.NumberOfTasks>(numTasks.ToString(CultureInfo.InvariantCulture)) .Build(); - IConfiguration merged = Configurations.Merge(driverConfig, groupCommDriverConfig); - - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(PipelinedMasterTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - return Configurations.Merge(merged, taskConfig); + return Configurations.Merge(driverConfig, groupCommDriverConfig); } } } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs index 49f8305..30b371d 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs @@ -58,7 +58,7 @@ namespace Org.Apache.REEF.Tests.Functional.Group TestRun(DriverConfigurations(numTasks), typeof(ScatterReduceDriver), numTasks, "ScatterReduceDriver", runPlatform, testFolder); } - public IConfiguration DriverConfigurations(int numTasks) + private IConfiguration DriverConfigurations(int numTasks) { IConfiguration driverConfig = TangFactory.GetTang().NewConfigurationBuilder( DriverConfiguration.ConfigurationModule @@ -81,14 +81,7 @@ namespace Org.Apache.REEF.Tests.Functional.Group .BindIntNamedParam<GroupCommConfigurationOptions.NumberOfTasks>(numTasks.ToString()) .Build(); - IConfiguration merged = Configurations.Merge(driverConfig, groupCommDriverConfig); - - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(MasterTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - return Configurations.Merge(merged, taskConfig); + return Configurations.Merge(driverConfig, groupCommDriverConfig); } } } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs index feae03d..0e42ef6 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs @@ -158,14 +158,7 @@ namespace Org.Apache.REEF.Tests.Functional.ML.KMeans .BindIntNamedParam<GroupCommConfigurationOptions.NumberOfTasks>(totalEvaluators.ToString()) .Build(); - IConfiguration merged = Configurations.Merge(driverConfig, groupCommunicationDriverConfig); - - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(KMeansMasterTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - return Configurations.Merge(merged, taskConfig); + return Configurations.Merge(driverConfig, groupCommunicationDriverConfig); } } } http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs index b23e5e1..c5c2170 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs @@ -63,9 +63,9 @@ namespace Org.Apache.REEF.Tests.Functional.Messaging CleanUp(testFolder); } - public IConfiguration DriverConfigurations() + private IConfiguration DriverConfigurations() { - IConfiguration driverConfig = DriverConfiguration.ConfigurationModule + return DriverConfiguration.ConfigurationModule .Set(DriverConfiguration.OnDriverStarted, GenericType<MessageDriver>.Class) .Set(DriverConfiguration.OnEvaluatorAllocated, GenericType<MessageDriver>.Class) .Set(DriverConfiguration.OnTaskMessage, GenericType<MessageDriver>.Class) @@ -73,13 +73,6 @@ namespace Org.Apache.REEF.Tests.Functional.Messaging .Set(DriverConfiguration.CustomTraceListeners, GenericType<DefaultCustomTraceListener>.Class) .Set(DriverConfiguration.CustomTraceLevel, Level.Info.ToString()) .Build(); - - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(MessageTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - return Configurations.Merge(driverConfig, taskConfig); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/c90f8aa6/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs index 6e39c30..2d2975b 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs @@ -99,23 +99,16 @@ namespace Org.Apache.REEF.Tests.Functional.Driver CleanUp(testFolder); } - public IConfiguration DriverConfigurationsWithEvaluatorRequest<T>(GenericType<T> type) + private IConfiguration DriverConfigurationsWithEvaluatorRequest<T>(GenericType<T> type) where T : IObserver<IAllocatedEvaluator>, IObserver<IDriverStarted>, IObserver<IRunningTask> { - IConfiguration driverConfig = DriverConfiguration.ConfigurationModule + return DriverConfiguration.ConfigurationModule .Set(DriverConfiguration.OnDriverStarted, type) .Set(DriverConfiguration.OnEvaluatorAllocated, type) .Set(DriverConfiguration.OnTaskRunning, type) .Set(DriverConfiguration.CustomTraceListeners, GenericType<DefaultCustomTraceListener>.Class) .Set(DriverConfiguration.CustomTraceLevel, Level.Info.ToString()) .Build(); - - IConfiguration taskConfig = TangFactory.GetTang().NewConfigurationBuilder() - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(RuntimeNameTask).Assembly.GetName().Name) - .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(NameClient).Assembly.GetName().Name) - .Build(); - - return Configurations.Merge(driverConfig, taskConfig); } } }
