Changeset 1898 for trunk

Timestamp:

05/26/09 13:37:27 (15 years ago)

Author:

gkronber

Message:

Implemented and integrated first version of backend for execution of CEDMA runs on HL.Hive. #642 (Hive backend for CEDMA)

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• ExecuterBase.cs (added)
• GridExecuter.cs (moved) (moved from trunk/sources/HeuristicLab.CEDMA.Server/3.3/Executer.cs) (5 diffs)
• HeuristicLab.CEDMA.Server-3.3.csproj (modified) (2 diffs)
• HiveExecuter.cs (added)
• IExecuter.cs (added)
• ServerForm.cs (modified) (2 diffs)
• ServerForm.designer.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs

@@ -40 +40 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  public class Executer {
-    private IDispatcher dispatcher;
+  public class GridExecuter : ExecuterBase {
     private JobManager jobManager;
-    private IStore store;
     private Dictionary<WaitHandle, Execution> activeExecutions;
 
@@ -54 +52 @@
     }
 
-    private int maxActiveJobs;
-    public int MaxActiveJobs {
-      get { return maxActiveJobs; }
-      set {
-        if (value < 0) throw new ArgumentException("Only positive values are allowed for MaxActiveJobs");
-        maxActiveJobs = value;
-      }
-    }
-
-    public Executer(IDispatcher dispatcher, IStore store, string gridUrl) {
-      activeExecutions = new Dictionary<WaitHandle, Execution>();
-      maxActiveJobs = 10;
-      this.dispatcher = dispatcher;
-      this.store = store;
+    public GridExecuter(IDispatcher dispatcher, IStore store, string gridUrl) : base(dispatcher, store) {
       this.jobManager = new JobManager(gridUrl);
       jobManager.Reset();
     }
 
-    internal void Start() {
-      new Thread(StartJobs).Start();
-    }
-
-    private void StartJobs() {
+    protected override void StartJobs() {
       List<WaitHandle> wh = new List<WaitHandle>();
       Dictionary<WaitHandle, AtomicOperation> activeOperations = new Dictionary<WaitHandle, AtomicOperation>();
@@ -85 +66 @@
             Thread.Sleep(StartJobInterval);
             // get an execution from the dispatcher and execute in grid via job-manager
-            Execution execution = dispatcher.GetNextJob();
+            Execution execution = Dispatcher.GetNextJob();
             if (execution != null) {
               AtomicOperation op = new AtomicOperation(execution.Engine.OperatorGraph.InitialOperator, execution.Engine.GlobalScope);
@@ -109 +90 @@
             }
             activeOperations.Remove(readyHandle);
+            readyHandle.Close();
             ProcessingEngine finishedEngine = null;
             try {
@@ -127 +109 @@
     }
 
-    private void StoreResults(Execution finishedExecution, ProcessingEngine finishedEngine) {
-      Entity model = new Entity(Ontology.CedmaNameSpace + Guid.NewGuid());
-      store.Add(new Statement(finishedExecution.DataSetEntity, Ontology.PredicateHasModel, model));
-      StoreModelAttribute(model, Ontology.TargetVariable, finishedExecution.TargetVariable);
-      StoreModelAttribute(model, Ontology.AlgorithmName, finishedExecution.Description);
-      Scope bestModelScope = finishedEngine.GlobalScope.GetVariableValue<Scope>("BestValidationSolution", false);
-      StoreModelVariable(model, Ontology.TrainingMeanSquaredError, bestModelScope, "Quality");
-      StoreModelVariable(model, Ontology.ValidationMeanSquaredError, bestModelScope, "ValidationQuality");
-      StoreModelVariable(model, Ontology.TestMeanSquaredError, bestModelScope, "TestQuality");
-      StoreModelVariable(model, Ontology.TrainingMeanAbsolutePercentageError, bestModelScope, "TrainingMAPE");
-      StoreModelVariable(model, Ontology.ValidationMeanAbsolutePercentageError, bestModelScope, "ValidationMAPE");
-      StoreModelVariable(model, Ontology.TestMeanAbsolutePercentageError, bestModelScope, "TestMAPE");
-      StoreModelVariable(model, Ontology.TrainingMeanAbsolutePercentageOfRangeError, bestModelScope, "TrainingMAPRE");
-      StoreModelVariable(model, Ontology.ValidationMeanAbsolutePercentageOfRangeError, bestModelScope, "ValidationMAPRE");
-      StoreModelVariable(model, Ontology.TestMeanAbsolutePercentageOfRangeError, bestModelScope, "TestMAPRE");
-      StoreModelVariable(model, Ontology.TrainingCoefficientOfDetermination, bestModelScope, "TrainingR2");
-      StoreModelVariable(model, Ontology.ValidationCoefficientOfDetermination, bestModelScope, "ValidationR2");
-      StoreModelVariable(model, Ontology.TestCoefficientOfDetermination, bestModelScope, "TestR2");
-      StoreModelVariable(model, Ontology.TrainingCoefficientOfDetermination, bestModelScope, "TrainingVAF");
-      StoreModelVariable(model, Ontology.ValidationCoefficientOfDetermination, bestModelScope, "ValidationVAF");
-      StoreModelVariable(model, Ontology.TestCoefficientOfDetermination, bestModelScope, "TestVAF");
-      StoreModelVariable(model, Ontology.TrainingTheilsInequalityCoefficient, bestModelScope, "TrainingTheilInequalityCoefficient");
-      StoreModelVariable(model, Ontology.ValidationTheilsInequalityCoefficient, bestModelScope, "ValidationTheilInequalityCoefficient");
-      StoreModelVariable(model, Ontology.TestTheilsInequalityCoefficient, bestModelScope, "TestTheilInequalityCoefficient");
-      StoreModelVariable(model, Ontology.TrainingAccuracy, bestModelScope, "TrainingAccuracy");
-      StoreModelVariable(model, Ontology.ValidationAccuracy, bestModelScope, "ValidationAccuracy");
-      StoreModelVariable(model, Ontology.TestAccuracy, bestModelScope, "TestAccuracy");
-      StoreModelVariable(model, Ontology.TreeSize, bestModelScope, "TreeSize");
-      StoreModelVariable(model, Ontology.TreeHeight, bestModelScope, "TreeHeight");
-      StoreModelVariable(model, Ontology.EvaluatedSolutions, bestModelScope, "EvaluatedSolutions");
-
-      byte[] serializedModel = PersistenceManager.SaveToGZip(bestModelScope.GetVariableValue("FunctionTree", false));
-      store.Add(new Statement(model, Ontology.PredicateSerializedData, new Literal(Convert.ToBase64String(serializedModel))));
-    }
-
-    private void StoreModelVariable(Entity model, Entity entity, Scope scope, string variableName) {
-      if (scope.GetVariable(variableName) != null)
-        StoreModelAttribute(model, entity, scope.GetVariableValue<ObjectData>(variableName, false).Data);
-    }
-
-    private void StoreModelAttribute(Entity model, Entity predicate, object value) {
-      store.Add(new Statement(model, predicate, new Literal(value)));
-    }
-
-    internal string[] GetJobs() {
+    public override string[] GetJobs() {
       lock (activeExecutions) {
         string[] retVal = new string[activeExecutions.Count];

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExecuterBase.cs" />
+    <Compile Include="HiveExecuter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IExecuter.cs" />
     <Compile Include="DispatcherBase.cs" />
+    <Compile Include="GridExecuter.cs" />
     <Compile Include="IDispatcher.cs" />
     <Compile Include="Execution.cs" />
-    <Compile Include="Executer.cs" />
     <Compile Include="Server.cs" />
     <Compile Include="ServerApplication.cs" />
@@ -136 +141 @@
       <Name>HeuristicLab.Grid-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Engine\3.2\HeuristicLab.Hive.Engine-3.2.csproj">
+      <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
+      <Name>HeuristicLab.Hive.Engine-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
       <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerForm.cs

@@ -45 +45 @@
     private Store store;
     private IDispatcher dispatcher;
-    private Executer executer;
+    private IExecuter executer;
 
     private static readonly string rdfFile = AppDomain.CurrentDomain.BaseDirectory + "rdf_store.db3";
@@ -64 +64 @@
     private void connectButton_Click(object sender, EventArgs e) {
       dispatcher = new SimpleDispatcher(store);
-      executer = new Executer(dispatcher, store, gridAddress.Text);
+      if (address.Text.Contains("ExecutionEngine")) {
+        executer = new HiveExecuter(dispatcher, store, address.Text);
+      } else { 
+        // default is grid backend
+        executer = new GridExecuter(dispatcher, store, address.Text);
+      }
       executer.Start();
       maxActiveJobsUpDown.Enabled = true;

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerForm.designer.cs

@@ -49 +49 @@
       this.externalAddressLabel = new System.Windows.Forms.Label();
       this.gridAddressLabel = new System.Windows.Forms.Label();
-      this.gridAddress = new System.Windows.Forms.TextBox();
+      this.address = new System.Windows.Forms.TextBox();
       this.connectButton = new System.Windows.Forms.Button();
       this.listBox = new System.Windows.Forms.ListBox();
@@ -86 +86 @@
       // gridAddress
       // 
-      this.gridAddress.Location = new System.Drawing.Point(106, 32);
-      this.gridAddress.Name = "gridAddress";
-      this.gridAddress.Size = new System.Drawing.Size(160, 20);
-      this.gridAddress.TabIndex = 8;
+      this.address.Location = new System.Drawing.Point(106, 32);
+      this.address.Name = "gridAddress";
+      this.address.Size = new System.Drawing.Size(160, 20);
+      this.address.TabIndex = 8;
       // 
       // connectButton
@@ -151 +151 @@
       this.Controls.Add(this.connectButton);
       this.Controls.Add(this.gridAddressLabel);
-      this.Controls.Add(this.gridAddress);
+      this.Controls.Add(this.address);
       this.Controls.Add(this.externalAddressLabel);
       this.Controls.Add(this.addressTextBox);
@@ -167 +167 @@
     private System.Windows.Forms.Label externalAddressLabel;
     private System.Windows.Forms.Label gridAddressLabel;
-    private System.Windows.Forms.TextBox gridAddress;
+    private System.Windows.Forms.TextBox address;
     private System.Windows.Forms.Button connectButton;
     private System.Windows.Forms.ListBox listBox;