Changeset 6398

Timestamp:

06/08/11 15:52:16 (14 years ago)

Author:

svonolfe

Message:

Added MPIEngine view (#1542)

Location:

branches/MPI

Files:

• HeuristicLab.MPIAlgorithmRunner/3.3/AlgorithmBroker.cs (modified) (3 diffs)
• HeuristicLab.MPIAlgorithmRunner/3.3/IAlgorithmBroker.cs (modified) (1 diff)
• HeuristicLab.MPIAlgorithmRunner/3.3/Program.cs (modified) (2 diffs)
• HeuristicLab.MPIEngine/3.3/HeuristicLab.MPIEngine-3.3.csproj (modified) (3 diffs)
• HeuristicLab.MPIEngine/3.3/HeuristicLabMPIEnginePlugin.cs.frame (modified) (1 diff)
• HeuristicLab.MPIEngine/3.3/MPIEngine.cs (modified) (6 diffs)
• HeuristicLab.MPIEngine/3.3/MPIEngineView.cs (added)
• HeuristicLab.MPIEngine/3.3/MPIEngineView.designer.cs (added)

branches/MPI/HeuristicLab.MPIAlgorithmRunner/3.3/AlgorithmBroker.cs

@@ -58 +58 @@
       quotas.MaxArrayLength = int.MaxValue;
       netTCPBinding.ReaderQuotas = quotas;
+      netTCPBinding.SendTimeout = new TimeSpan(100000000);
+      netTCPBinding.ReceiveTimeout = new TimeSpan(100000000);
       endpoint.Binding = netTCPBinding;
       int port = FindFreeTcpPort();
@@ -90 +92 @@
     #region IAlgorithmBroker Members
 
-    public void TransmitAlgorithm(MPITransportWrapper<IAlgorithm> algorithm) {
+    public void TransmitAlgorithm(MPITransportWrapper<IAlgorithm> algorithm, int updateInterval) {
       Console.WriteLine("Transmitting Algorithm...");
       int clients = MPI.Communicator.world.Group.Size - 1;
@@ -97 +99 @@
         int client = i + 1;
         communicator.Send<MPITransportWrapper<IAlgorithm>>(algorithm, client, 0);
+        communicator.Send<int>(updateInterval, client, 1);
       }
     }

branches/MPI/HeuristicLab.MPIAlgorithmRunner/3.3/IAlgorithmBroker.cs

@@ -33 +33 @@
   public interface IAlgorithmBroker {
     [OperationContract]
-    void TransmitAlgorithm(MPITransportWrapper<IAlgorithm> algorithm);
+    void TransmitAlgorithm(MPITransportWrapper<IAlgorithm> algorithm, int updateInterval);
 
     [OperationContract]

branches/MPI/HeuristicLab.MPIAlgorithmRunner/3.3/Program.cs

@@ -68 +68 @@
         Console.WriteLine("Clients: " + clients);
 
-        int updateInterval = 5000;
-
         MPI.Communicator communicator = MPI.Communicator.world.Clone() as MPI.Communicator;
 
@@ -119 +117 @@
         } else {
           Program p = new Program();
-          p.StartAlgorithm(updateInterval, communicator);
+          p.StartAlgorithm(communicator);
         }
       }
     }
 
-    public void StartAlgorithm(int updateInterval, MPI.Communicator communicator) {
+    public void StartAlgorithm(MPI.Communicator communicator) {
       IAlgorithm alg = communicator.Receive<MPITransportWrapper<IAlgorithm>>(0, 0).InnerItem;
+      int updateInterval = communicator.Receive<int>(0, 1);
 
       Console.WriteLine("Starting algorithm...");

branches/MPI/HeuristicLab.MPIEngine/3.3/HeuristicLab.MPIEngine-3.3.csproj

@@ -110 +110 @@
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Core.Views-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
@@ -133 +145 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -141 +155 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MPIEngineView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MPIEngineView.designer.cs">
+      <DependentUpon>MPIEngineView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabMPIEnginePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/MPI/HeuristicLab.MPIEngine/3.3/HeuristicLabMPIEnginePlugin.cs.frame

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
   [PluginDependency("HeuristicLab.MPInet", "1.0.0")]
   [PluginDependency("HeuristicLab.MPIAlgorithmRunner", "3.3")]

branches/MPI/HeuristicLab.MPIEngine/3.3/MPIEngine.cs

@@ -37 +37 @@
 using Microsoft.Hpc.Scheduler.Properties;
 using System.Xml;
+using System.ComponentModel;
 
 namespace HeuristicLab.MPIEngine {
@@ -47 +48 @@
   public class MPIEngine : Engine {
     private string username;
+
+    [Category("MPISettings")]
+    [Browsable(true)]
+    public string UserName {
+      get {
+        return username;
+      }
+
+      set {
+        username = value;
+      }
+    }
+
     private string password;
 
+    [Category("MPISettings")]
+    [Browsable(true)]
+    [PasswordPropertyText(true)]
+    public string Password {
+      get {
+        return password;
+      }
+
+      set {
+        password = value;
+      }
+    }
+
     [Storable]
     private string headNode;
 
+    [Category("MPISettings")]
+    [Browsable(true)]
+    public string HeadNode {
+      get {
+        return headNode;
+      }
+
+      set {
+        headNode = value;
+      }
+    }
+
     [Storable]
     private string path;
 
+    [Category("MPISettings")]
+    [Browsable(true)]
+    public string Path {
+      get {
+        return path;
+      }
+
+      set {
+        path = value;
+      }
+    }
+
+    [Storable]
+    private int updateInterval;
+
+    [Category("MPISettings")]
+    [Browsable(true)]
+    public int UpdateInterval {
+      get {
+        return updateInterval;
+      }
+
+      set {
+        updateInterval = value;
+      }
+    }
+
     [Storable]
     private int cpuPerNode;
 
+    [Category("MPISettings")]
+    [Browsable(true)]
+    public int CpuPerNode {
+      get {
+        return cpuPerNode;
+      }
+
+      set {
+        cpuPerNode = value;
+      }
+    }
+
     [Storable]
     private List<string> requestedNodes;
+
+    [Category("MPISettings")]
+    [Browsable(true)]
+    public List<string> RequestedNodes {
+      get {
+        return requestedNodes;
+      }
+
+      set {
+        requestedNodes = value;
+      }
+    }
 
     [StorableConstructor]
@@ -69 +159 @@
       headNode = original.headNode;
       path = original.path;
+      updateInterval = original.updateInterval;
       cpuPerNode = original.cpuPerNode;
       requestedNodes = new List<string>();
@@ -80 +171 @@
       headNode = "blade00.hpc.fh-hagenberg.at";
       path = @"C:\public\MPISupport";
-      cpuPerNode = 8;
+      updateInterval = 5000;
+      cpuPerNode = 3;
       requestedNodes = new List<string>();
       requestedNodes.Add("BLADE00");
@@ -172 +264 @@
           netTCPBinding.ReaderQuotas = quotas;
           netTCPBinding.MaxReceivedMessageSize = int.MaxValue;
+          netTCPBinding.SendTimeout = new TimeSpan(100000000);
+          netTCPBinding.ReceiveTimeout = new TimeSpan(100000000);
           ChannelFactory<IAlgorithmBroker> factory = new ChannelFactory<IAlgorithmBroker>(netTCPBinding, address);
           IAlgorithmBroker proxy = factory.CreateChannel();
 
-          proxy.TransmitAlgorithm(new MPITransportWrapper<IAlgorithm>(algorithm));
+          proxy.TransmitAlgorithm(new MPITransportWrapper<IAlgorithm>(algorithm), updateInterval);
 
           while (!proxy.IsAlgorithmTerminated()) {
@@ -191 +285 @@
             }
 
-            System.Threading.Thread.Sleep(5000);
+            System.Threading.Thread.Sleep(updateInterval);
           }
         }