Changeset 9323

Timestamp:

03/20/13 16:51:58 (12 years ago)

Author:

mkommend

Message:

#2024: Changed parallel engine to use parallel.foreach instead of spawning task manually to enable more options for parallelization.

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (5 diffs)
• HeuristicLab.ParallelEngine.Views (added)
• HeuristicLab.ParallelEngine.Views/3.3 (added)
• HeuristicLab.ParallelEngine.Views/3.3/HeuristicLab.ParallelEngine.Views.csproj (added)
• HeuristicLab.ParallelEngine.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.ParallelEngine.Views/3.3/ParallelEngineView.Designer.cs (added)
• HeuristicLab.ParallelEngine.Views/3.3/ParallelEngineView.cs (added)
• HeuristicLab.ParallelEngine.Views/3.3/Plugin.cs.frame (added)
• HeuristicLab.ParallelEngine.Views/3.3/Properties (added)
• HeuristicLab.ParallelEngine.Views/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (3 diffs)

trunk/sources/HeuristicLab 3.3.sln

@@ -28 +28 @@
     {B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9} = {B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9}
     {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
+    {D34A7620-3E23-40D9-8647-637BE901F271} = {D34A7620-3E23-40D9-8647-637BE901F271}
     {F62BCD22-FB83-4444-9401-8031C2487A86} = {F62BCD22-FB83-4444-9401-8031C2487A86}
     {E0B45023-CB84-48A1-A1B7-8295B64B7BAD} = {E0B45023-CB84-48A1-A1B7-8295B64B7BAD}
@@ -376 +377 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Scheduling-3.3", "HeuristicLab.Problems.Instances.Scheduling\3.3\HeuristicLab.Problems.Instances.Scheduling-3.3.csproj", "{9D792B6D-836B-46DC-9D69-50B4B1E7B87F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine.Views", "HeuristicLab.ParallelEngine.Views\3.3\HeuristicLab.ParallelEngine.Views.csproj", "{D34A7620-3E23-40D9-8647-637BE901F271}"
+EndProject
 Global
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -386 +389 @@
   EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x64.ActiveCfg = Debug|x64
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x64.Build.0 = Debug|x64
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x86.ActiveCfg = Debug|x86
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x86.Build.0 = Debug|x86
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x64.ActiveCfg = Release|x64
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x64.Build.0 = Release|x64
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x86.ActiveCfg = Release|x86
+    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x86.Build.0 = Release|x86
     {94186A6A-5176-4402-AE83-886557B53CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {94186A6A-5176-4402-AE83-886557B53CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -506 +521 @@
     {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}.Release|x86.ActiveCfg = Release|x86
     {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}.Release|x86.Build.0 = Release|x86
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x64.ActiveCfg = Debug|x64
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x64.Build.0 = Debug|x64
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x86.ActiveCfg = Debug|x86
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Debug|x86.Build.0 = Debug|x86
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|Any CPU.Build.0 = Release|Any CPU
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x64.ActiveCfg = Release|x64
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x64.Build.0 = Release|x64
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x86.ActiveCfg = Release|x86
-    {B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}.Release|x86.Build.0 = Release|x86
     {EE2034D9-6E27-48A1-B855-42D45F69A4FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {EE2034D9-6E27-48A1-B855-42D45F69A4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -1826 +1829 @@
     {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|x86.ActiveCfg = Release|x86
     {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}.Release|x86.Build.0 = Release|x86
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Debug|x64.ActiveCfg = Debug|x64
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Debug|x64.Build.0 = Debug|x64
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Debug|x86.ActiveCfg = Debug|x86
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Debug|x86.Build.0 = Debug|x86
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|Any CPU.Build.0 = Release|Any CPU
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x64.ActiveCfg = Release|x64
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x64.Build.0 = Release|x64
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.ActiveCfg = Release|x86
+    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

@@ -37 +37 @@
   public class ParallelEngine : Engine {
     private CancellationToken cancellationToken;
+    private ParallelOptions parallelOptions;
+
+    [Storable(DefaultValue = -1)]
+    private int degreeOfParallelism;
+    public int DegreeOfParallelism {
+      get { return degreeOfParallelism; }
+      set {
+        if (degreeOfParallelism != value) {
+          degreeOfParallelism = value;
+          OnDegreeOfParallelismChanged();
+        }
+      }
+    }
 
     [StorableConstructor]
     protected ParallelEngine(bool deserializing) : base(deserializing) { }
-    protected ParallelEngine(ParallelEngine original, Cloner cloner) : base(original, cloner) { }
+    protected ParallelEngine(ParallelEngine original, Cloner cloner)
+      : base(original, cloner) {
+      this.DegreeOfParallelism = original.DegreeOfParallelism;
+    }
     public ParallelEngine() : base() { }
 
@@ -47 +63 @@
     }
 
+    public event EventHandler DegreeOfParallelismChanged;
+    protected void OnDegreeOfParallelismChanged() {
+      var handler = DegreeOfParallelismChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+
     protected override void Run(CancellationToken cancellationToken) {
       this.cancellationToken = cancellationToken;
+      parallelOptions = new ParallelOptions();
+      parallelOptions.MaxDegreeOfParallelism = DegreeOfParallelism;
       Run(ExecutionStack);
     }
@@ -65 +90 @@
           coll = (OperationCollection)next;
           if (coll.Parallel) {
-            Task[] tasks = new Task[coll.Count];
             Stack<IOperation>[] stacks = new Stack<IOperation>[coll.Count];
             for (int i = 0; i < coll.Count; i++) {
               stacks[i] = new Stack<IOperation>();
               stacks[i].Push(coll[i]);
-              tasks[i] = Task.Factory.StartNew(Run, stacks[i], cancellationToken);
             }
             try {
-              Task.WaitAll(tasks);
+              Parallel.ForEach(stacks, parallelOptions, Run);
             }
             catch (AggregateException ex) {