Changeset 15337 for branches/ParallelExperiment
- Timestamp:
- 08/22/17 14:08:52 (7 years ago)
- Location:
- branches/ParallelExperiment
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ParallelExperiment/HeuristicLab.Optimization.Views/3.3/ExperimentView.Designer.cs
r14185 r15337 47 47 this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl(); 48 48 this.optimizersTabPage = new System.Windows.Forms.TabPage(); 49 this.experimentTreeView = new HeuristicLab.Optimization.Views.ExperimentTreeView(); 49 50 this.runsTabPage = new System.Windows.Forms.TabPage(); 50 51 this.runsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 51 this.experimentTreeView = new HeuristicLab.Optimization.Views.ExperimentTreeView(); 52 this.workersNumericUpDown = new System.Windows.Forms.NumericUpDown(); 53 this.workersLabel = new System.Windows.Forms.Label(); 52 54 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 53 55 this.tabControl.SuspendLayout(); 54 56 this.optimizersTabPage.SuspendLayout(); 55 57 this.runsTabPage.SuspendLayout(); 58 ((System.ComponentModel.ISupportInitialize)(this.workersNumericUpDown)).BeginInit(); 56 59 this.SuspendLayout(); 57 60 // … … 119 122 this.optimizersTabPage.Text = "Optimizers"; 120 123 this.optimizersTabPage.UseVisualStyleBackColor = true; 124 // 125 // experimentTreeView 126 // 127 this.experimentTreeView.Caption = "Experiment View"; 128 this.experimentTreeView.Content = null; 129 this.experimentTreeView.Dock = System.Windows.Forms.DockStyle.Fill; 130 this.experimentTreeView.Location = new System.Drawing.Point(3, 3); 131 this.experimentTreeView.Name = "experimentTreeView"; 132 this.experimentTreeView.ReadOnly = false; 133 this.experimentTreeView.Size = new System.Drawing.Size(665, 395); 134 this.experimentTreeView.TabIndex = 0; 121 135 // 122 136 // runsTabPage … … 147 161 this.runsViewHost.ViewType = null; 148 162 // 149 // experimentTreeView 150 // 151 this.experimentTreeView.Caption = "Experiment View"; 152 this.experimentTreeView.Content = null; 153 this.experimentTreeView.Dock = System.Windows.Forms.DockStyle.Fill; 154 this.experimentTreeView.Location = new System.Drawing.Point(3, 3); 155 this.experimentTreeView.Name = "experimentTreeView"; 156 this.experimentTreeView.ReadOnly = false; 157 this.experimentTreeView.Size = new System.Drawing.Size(665, 395); 158 this.experimentTreeView.TabIndex = 0; 163 // workersNumericUpDown 164 // 165 this.workersNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 166 this.workersNumericUpDown.Location = new System.Drawing.Point(193, 461); 167 this.workersNumericUpDown.Minimum = new decimal(new int[] { 168 1, 169 0, 170 0, 171 0}); 172 this.workersNumericUpDown.Name = "workersNumericUpDown"; 173 this.workersNumericUpDown.Size = new System.Drawing.Size(59, 20); 174 this.workersNumericUpDown.TabIndex = 16; 175 this.workersNumericUpDown.Value = new decimal(new int[] { 176 1, 177 0, 178 0, 179 0}); 180 this.workersNumericUpDown.ValueChanged += new System.EventHandler(this.workersNumericUpDown_ValueChanged); 181 // 182 // workersLabel 183 // 184 this.workersLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 185 this.workersLabel.AutoSize = true; 186 this.workersLabel.Location = new System.Drawing.Point(140, 464); 187 this.workersLabel.Name = "workersLabel"; 188 this.workersLabel.Size = new System.Drawing.Size(53, 13); 189 this.workersLabel.TabIndex = 17; 190 this.workersLabel.Text = "Workers: "; 159 191 // 160 192 // ExperimentView 161 193 // 162 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);163 194 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 195 this.Controls.Add(this.workersLabel); 196 this.Controls.Add(this.workersNumericUpDown); 164 197 this.Controls.Add(this.tabControl); 165 198 this.Name = "ExperimentView"; … … 175 208 this.Controls.SetChildIndex(this.nameLabel, 0); 176 209 this.Controls.SetChildIndex(this.nameTextBox, 0); 210 this.Controls.SetChildIndex(this.workersNumericUpDown, 0); 211 this.Controls.SetChildIndex(this.workersLabel, 0); 177 212 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); 178 213 this.tabControl.ResumeLayout(false); 179 214 this.optimizersTabPage.ResumeLayout(false); 180 215 this.runsTabPage.ResumeLayout(false); 216 ((System.ComponentModel.ISupportInitialize)(this.workersNumericUpDown)).EndInit(); 181 217 this.ResumeLayout(false); 182 218 this.PerformLayout(); … … 190 226 private HeuristicLab.MainForm.WindowsForms.ViewHost runsViewHost; 191 227 private ExperimentTreeView experimentTreeView; 192 228 private System.Windows.Forms.NumericUpDown workersNumericUpDown; 229 private System.Windows.Forms.Label workersLabel; 193 230 } 194 231 } -
branches/ParallelExperiment/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs
r14185 r15337 20 20 #endregion 21 21 22 using System; 22 23 using System.Linq; 23 24 using System.Windows.Forms; … … 43 44 experimentTreeView.Content = null; 44 45 runsViewHost.Content = null; 46 workersNumericUpDown.Value = 1; 45 47 } else { 46 48 experimentTreeView.Content = Content; 47 49 runsViewHost.Content = Content.Runs; 50 workersNumericUpDown.Value = Content.NumberOfWorkers; 48 51 } 49 52 } … … 66 69 base.OnClosed(e); 67 70 } 71 72 protected override void Content_ExecutionStateChanged(object sender, EventArgs e) { 73 base.Content_ExecutionStateChanged(sender, e); 74 workersNumericUpDown.Enabled = Content.ExecutionState != ExecutionState.Started; 75 } 76 77 #region Events 78 private void workersNumericUpDown_ValueChanged(object sender, System.EventArgs e) { 79 Content.NumberOfWorkers = (int)workersNumericUpDown.Value; 80 } 81 #endregion 68 82 } 69 83 } -
branches/ParallelExperiment/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs
r15302 r15337 80 80 try { 81 81 Run((object)cancellationTokenSource.Token); 82 } 83 catch (OperationCanceledException) { 84 } 85 catch (AggregateException ae) { 82 } catch (OperationCanceledException) { 83 } catch (AggregateException ae) { 86 84 OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae); 87 } 88 catch (Exception e) { 85 } catch (Exception e) { 89 86 OnExceptionOccurred(e); 90 87 } … … 104 101 base.Pause(); 105 102 pausePending = true; 106 CancellationTokenSource .Cancel();103 CancellationTokenSource?.Cancel(); 107 104 } 108 105 … … 112 109 base.Stop(); 113 110 if (ExecutionState == ExecutionState.Paused) OnStopped(); 114 else CancellationTokenSource .Cancel();111 else CancellationTokenSource?.Cancel(); 115 112 } 116 113 … … 127 124 initialized = true; 128 125 Run(cancellationToken); 129 } 130 finally { 126 } finally { 131 127 timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed); 132 128 timer.Stop(); -
branches/ParallelExperiment/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs
r15287 r15337 258 258 if (ExecutionState == ExecutionState.Paused || ExecutionState == ExecutionState.Stopped) break; 259 259 Optimizer.Prepare(); 260 if (ExecutionState == ExecutionState.Paused || ExecutionState == ExecutionState.Stopped) break; 260 261 } 261 262 } … … 271 272 if (Optimizer.ExecutionState != ExecutionState.Started) return; 272 273 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 273 try { Optimizer.Pause(); } catch (InvalidOperationException) { } 274 try { Optimizer.Pause(); } catch (InvalidOperationException) { } catch (NotSupportedException) { } 274 275 } 275 276 public void Stop() { … … 385 386 } 386 387 private void Optimizer_Prepared(object sender, EventArgs e) { 387 if (batchRunAction == BatchRunAction.Prepare || ExecutionState == ExecutionState.Stopped) {388 if (batchRunAction == BatchRunAction.Prepare/* || ExecutionState == ExecutionState.Stopped*/) { 388 389 ExecutionTime = TimeSpan.Zero; 389 390 runsExecutionTime = TimeSpan.Zero; -
branches/ParallelExperiment/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs
r15328 r15337 97 97 } 98 98 99 [Storable] 100 private int numberOfWorkers = 1; 101 public int NumberOfWorkers { 102 get { return numberOfWorkers; } 103 set { 104 if (value < 1) throw new ArgumentException("Number of Workers must not be lower than one."); 105 numberOfWorkers = value; 106 } 107 } 108 99 109 public IEnumerable<IOptimizer> NestedOptimizers { 100 110 get { … … 111 121 private bool experimentStarted = false; 112 122 private bool experimentStopped = false; 123 113 124 private ManualResetEventSlim allOptimizerFinished; // this indicates that all started optimizers have been paused or stopped 125 private SemaphoreSlim availableWorkers; // limits the number of concurrent optimizer executions 114 126 115 127 public Experiment() … … 155 167 experimentStarted = original.experimentStarted; 156 168 experimentStopped = original.experimentStopped; 169 numberOfWorkers = original.numberOfWorkers; 157 170 Initialize(); 158 171 } … … 189 202 Start(CancellationToken.None); 190 203 } 204 191 205 public void Start(CancellationToken cancellationToken) { 192 206 if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused)) … … 197 211 experimentStopped = false; 198 212 allOptimizerFinished = new ManualResetEventSlim(false); 199 200 IOptimizer optimizer; 201 while ((optimizer = Optimizers.FirstOrDefault(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) != null) { 202 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 203 try { optimizer.Start(cancellationToken); } catch (InvalidOperationException) { } 204 if (ExecutionState == ExecutionState.Paused || ExecutionState == ExecutionState.Stopped) break; 213 availableWorkers = new SemaphoreSlim(NumberOfWorkers, NumberOfWorkers); 214 215 var runnableOptimizers = Optimizers.Where(o => o.ExecutionState == ExecutionState.Prepared || o.ExecutionState == ExecutionState.Paused).ToList(); 216 if (!runnableOptimizers.Any()) return; 217 218 while (runnableOptimizers.Any()) { 219 try { 220 availableWorkers.Wait(cancellationToken); // an optimizer was pause/stopped previously 221 if (experimentStopped || !experimentStarted) break; 222 // some optimizers might be started manually somewhere else 223 runnableOptimizers.RemoveAll(o => !(o.ExecutionState == ExecutionState.Prepared || o.ExecutionState == ExecutionState.Paused)); 224 var optimizer = runnableOptimizers.FirstOrDefault(); 225 runnableOptimizers.Remove(optimizer); 226 optimizer?.StartAsync(cancellationToken); 227 } catch (InvalidOperationException) { } catch (OperationCanceledException) { } 205 228 } 206 229 … … 220 243 foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState == ExecutionState.Started)) { 221 244 // a race-condition may occur when the optimizer has changed the state by itself in the meantime 222 try { optimizer.Pause(); } catch (InvalidOperationException) { } 245 try { optimizer.Pause(); } catch (InvalidOperationException) { } catch (NotSupportedException) { } 223 246 } 224 247 } … … 273 296 EventHandler handler = Paused; 274 297 if (handler != null) handler(this, EventArgs.Empty); 298 allOptimizerFinished.Set(); 275 299 } 276 300 public event EventHandler Stopped; … … 279 303 EventHandler handler = Stopped; 280 304 if (handler != null) handler(this, EventArgs.Empty); 305 allOptimizerFinished.Set(); 281 306 } 282 307 public event EventHandler<EventArgs<Exception>> ExceptionOccurred; … … 372 397 } 373 398 private void optimizer_Paused(object sender, EventArgs e) { 374 lock (locker) 399 lock (locker) { 400 if (availableWorkers.CurrentCount < NumberOfWorkers) 401 availableWorkers.Release(); 375 402 if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) { 376 403 OnPaused(); 377 allOptimizerFinished.Set();378 404 } 405 } 379 406 } 380 407 private void optimizer_Prepared(object sender, EventArgs e) { … … 388 415 private void optimizer_Stopped(object sender, EventArgs e) { 389 416 lock (locker) { 417 if (availableWorkers.CurrentCount < NumberOfWorkers) 418 availableWorkers.Release(); 390 419 if (experimentStopped) { 391 420 if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) { 392 421 OnStopped(); 393 allOptimizerFinished.Set();394 422 } 395 423 } else { … … 397 425 else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) { 398 426 OnStopped(); 399 allOptimizerFinished.Set();400 427 } else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) { 401 428 OnPaused(); 402 allOptimizerFinished.Set();403 429 } 404 430 }
Note: See TracChangeset
for help on using the changeset viewer.