diff --git a/lang/cs/Org.Apache.REEF.Driver/ClassHierarchyGeneratingDriverStartObserver.cs b/lang/cs/Org.Apache.REEF.Driver/ClassHierarchyGeneratingDriverStartObserver.cs
deleted file mode 100644
index 3efcfbfe35..0000000000
--- a/lang/cs/Org.Apache.REEF.Driver/ClassHierarchyGeneratingDriverStartObserver.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Org.Apache.REEF.Common.Files;
-using Org.Apache.REEF.Common.Tasks;
-using Org.Apache.REEF.Driver.Bridge;
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Utilities.Logging;
-
-namespace Org.Apache.REEF.Driver
-{
- ///
- /// Utility class that generates the class hierarchy for the assemblies in the `global` folder.
- ///
- internal sealed class ClassHierarchyGeneratingDriverStartObserver : IObserver, IObserver
- {
- private static readonly Logger Logger = Logger.GetLogger(typeof(ClassHierarchyGeneratingDriverStartObserver));
-
- private readonly REEFFileNames _fileNames;
- private ISet _assemblies;
-
- [Inject]
- private ClassHierarchyGeneratingDriverStartObserver(REEFFileNames fileNames, [Parameter(typeof(DriverBridgeConfigurationOptions.SetOfAssemblies))] ISet assemlies)
- {
- _assemblies = assemlies;
- _fileNames = fileNames;
- }
-
- ///
- /// Generates the class hierarchy file
- ///
- ///
- public void OnNext(IDriverStarted value)
- {
- GenerateClassHierarchyBin();
- }
-
- ///
- /// Generates the class hierarchy file
- ///
- ///
- public void OnNext(IDriverRestarted value)
- {
- GenerateClassHierarchyBin();
- }
-
- ///
- /// Silently ignored, assuming that a user-bound Observer will catch it.
- ///
- ///
- public void OnError(Exception error)
- {
- // Silently ignored, assuming that a user-bound Observer will catch it.
- }
-
- ///
- /// Silently ignored, assuming that a user-bound Observer will catch it.
- ///
- public void OnCompleted()
- {
- // Silently ignored, assuming that a user-bound Observer will catch it.
- }
-
- ///
- /// Generates the clr class hierarchy.
- ///
- private void GenerateClassHierarchyBin()
- {
- if (_assemblies != null && _assemblies.Count > 0)
- {
- //adding system level assemblies
- _assemblies.Add(typeof(IDriver).Assembly.GetName().Name);
- _assemblies.Add(typeof(ITask).Assembly.GetName().Name);
-
- ClrHandlerHelper.GenerateClassHierarchy(_assemblies);
- }
- else
- {
- ClrHandlerHelper.GenerateClassHierarchy(GetAssembliesInGlobalFolder());
- }
- }
-
- ///
- ///
- /// The paths of all assemblies in the reef/global folder.
- private ISet GetAssembliesInGlobalFolder()
- {
- return new HashSet(Directory.GetFiles(_fileNames.GetGlobalFolderPath())
- .Where(e => !(string.IsNullOrWhiteSpace(e)))
- .Select(Path.GetFullPath)
- .Where(File.Exists)
- .Where(Org.Apache.REEF.Tang.Util.AssemblyLoader.IsAssembly)
- .Select(Path.GetFileNameWithoutExtension));
- }
- }
-}
\ No newline at end of file
diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs b/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs
index 9047c04614..c99036e259 100644
--- a/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs
@@ -233,10 +233,7 @@ public static ConfigurationModule ConfigurationModule
MaxApplicationSubmissions)
.BindNamedParameter(GenericType.Class,
DriverRestartEvaluatorRecoverySeconds)
- .Build()
- // TODO: Move this up
- .Set(OnDriverStarted, GenericType.Class)
- .Set(OnDriverRestarted, GenericType.Class);
+ .Build();
}
}
}
diff --git a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
index dd0b2cd955..e3e7d53bae 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
+++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
@@ -91,7 +91,6 @@ under the License.
-
diff --git a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
index 20f30a56f6..99934e2fce 100644
--- a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
@@ -122,8 +122,6 @@ public class KMeansDriverHandlers :
.Build();
_groupCommTaskStarter = new TaskStarter(_groupCommDriver, _totalEvaluators);
-
- CreateClassHierarchy();
}
public void OnNext(IAllocatedEvaluator allocatedEvaluator)
@@ -204,18 +202,6 @@ public void OnCompleted()
{
throw new NotImplementedException();
}
-
- private void CreateClassHierarchy()
- {
- HashSet clrDlls = new HashSet();
- clrDlls.Add(typeof(IDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(ITask).Assembly.GetName().Name);
- clrDlls.Add(typeof(LegacyKMeansTask).Assembly.GetName().Name);
- clrDlls.Add(typeof(INameClient).Assembly.GetName().Name);
- clrDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name);
-
- ClrHandlerHelper.GenerateClassHierarchy(clrDlls);
- }
}
[NamedParameter("Number of partitions")]
diff --git a/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/BroadcastReduceDriverAndTasks/BroadcastReduceDriver.cs b/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/BroadcastReduceDriverAndTasks/BroadcastReduceDriver.cs
index 6f1ad0f3ab..9220834b65 100644
--- a/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/BroadcastReduceDriverAndTasks/BroadcastReduceDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/BroadcastReduceDriverAndTasks/BroadcastReduceDriver.cs
@@ -114,8 +114,6 @@ public class BroadcastReduceDriver :
.Build();
_groupCommTaskStarter = new TaskStarter(_groupCommDriver, numEvaluators);
-
- CreateClassHierarchy();
}
public void OnNext(IAllocatedEvaluator allocatedEvaluator)
@@ -197,17 +195,6 @@ public void OnCompleted()
{
}
- private void CreateClassHierarchy()
- {
- HashSet clrDlls = new HashSet();
- clrDlls.Add(typeof(IDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(ITask).Assembly.GetName().Name);
- clrDlls.Add(typeof(BroadcastReduceDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(INameClient).Assembly.GetName().Name);
- clrDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name);
- ClrHandlerHelper.GenerateClassHierarchy(clrDlls);
- }
-
private class SumFunction : IReduceFunction
{
[Inject]
diff --git a/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/PipelineBroadcastReduceDriverAndTasks/PipelinedBroadcastReduceDriver.cs b/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/PipelineBroadcastReduceDriverAndTasks/PipelinedBroadcastReduceDriver.cs
index 9fb965244b..90c07092e7 100644
--- a/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/PipelineBroadcastReduceDriverAndTasks/PipelinedBroadcastReduceDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/PipelineBroadcastReduceDriverAndTasks/PipelinedBroadcastReduceDriver.cs
@@ -124,8 +124,6 @@ public class PipelinedBroadcastReduceDriver :
.Build();
_groupCommTaskStarter = new TaskStarter(_groupCommDriver, numEvaluators);
-
- CreateClassHierarchy();
}
public void OnNext(IAllocatedEvaluator allocatedEvaluator)
@@ -211,18 +209,6 @@ public void OnNext(IDriverStarted value)
_evaluatorRequestor.Submit(request);
}
- private void CreateClassHierarchy()
- {
- var clrDlls = new HashSet();
- clrDlls.Add(typeof(IDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(ITask).Assembly.GetName().Name);
- clrDlls.Add(typeof(PipelinedBroadcastReduceDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(INameClient).Assembly.GetName().Name);
- clrDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name);
-
- ClrHandlerHelper.GenerateClassHierarchy(clrDlls);
- }
-
private class SumFunction : IReduceFunction
{
[Inject]
diff --git a/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/ScatterReduceDriverAndTasks/ScatterReduceDriver.cs b/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/ScatterReduceDriverAndTasks/ScatterReduceDriver.cs
index eb4cf86fa2..5953c316c4 100644
--- a/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/ScatterReduceDriverAndTasks/ScatterReduceDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Network.Examples/GroupCommunication/ScatterReduceDriverAndTasks/ScatterReduceDriver.cs
@@ -101,8 +101,6 @@ public class ScatterReduceDriver :
.Build();
_groupCommTaskStarter = new TaskStarter(_groupCommDriver, numEvaluators);
-
- CreateClassHierarchy();
}
public void OnNext(IAllocatedEvaluator allocatedEvaluator)
@@ -167,18 +165,6 @@ public void OnCompleted()
{
}
- private void CreateClassHierarchy()
- {
- HashSet clrDlls = new HashSet();
- clrDlls.Add(typeof(IDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(ITask).Assembly.GetName().Name);
- clrDlls.Add(typeof(ScatterReduceDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(INameClient).Assembly.GetName().Name);
- clrDlls.Add(typeof(INetworkService<>).Assembly.GetName().Name);
-
- ClrHandlerHelper.GenerateClassHierarchy(clrDlls);
- }
-
private class SumFunction : IReduceFunction
{
[Inject]
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
index e9d39f9141..c809b2d303 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
@@ -52,7 +52,6 @@ public class MessageDriver :
[Inject]
public MessageDriver(IEvaluatorRequestor evaluatorRequestor)
{
- CreateClassHierarchy();
_evaluatorRequestor = evaluatorRequestor;
}
public void OnNext(IAllocatedEvaluator eval)
@@ -113,15 +112,5 @@ public void OnError(Exception error)
{
throw new NotImplementedException();
}
-
- private void CreateClassHierarchy()
- {
- HashSet clrDlls = new HashSet();
- clrDlls.Add(typeof(IDriver).Assembly.GetName().Name);
- clrDlls.Add(typeof(ITask).Assembly.GetName().Name);
- clrDlls.Add(typeof(MessageTask).Assembly.GetName().Name);
-
- ClrHandlerHelper.GenerateClassHierarchy(clrDlls);
- }
}
}
\ No newline at end of file