update

Author: LittleLittleCloud

src/Microsoft.ML.AutoML/AutoMLExperiment/AutoMLExperiment.cs

@@ -252,11 +252,16 @@ public async Task<TrialResult> RunAsync(CancellationToken ct = default)
                 monitor?.ReportRunningTrial(trialSettings);
                 var stopTrialManager = new CancellationTokenStopTrainingManager(trialCancellationTokenSource.Token, null);
                 aggregateTrainingStopManager.AddTrainingStopManager(stopTrialManager);
+                void handler(object o, EventArgs e)
+                {
+                    trialCancellationTokenSource.Cancel();
+                }
                 try
                 {
                     using (var performanceMonitor = serviceProvider.GetService<IPerformanceMonitor>())
                     using (var runner = serviceProvider.GetRequiredService<ITrialRunner>())
                     {
+                        aggregateTrainingStopManager.OnStopTraining += handler;
                         performanceMonitor.PerformanceMetricsUpdated += (o, metrics) =>
                         {
                             performanceMonitor.OnPerformanceMetricsUpdatedHandler(trialSettings, metrics, trialCancellationTokenSource);
@@ -329,7 +334,7 @@ Abandoning Trial {trialSettings.TrialId} and continue training.
                 }
                 finally
                 {
-                    aggregateTrainingStopManager.RemoveTrainingStopManagerIfExist(stopTrialManager);
+                    aggregateTrainingStopManager.OnStopTraining -= handler;
                 }
             }
 

test/Microsoft.ML.AutoML.Tests/AutoMLExperimentTests.cs

@@ -39,16 +39,18 @@ public async Task AutoMLExperiment_throw_timeout_exception_when_ct_is_canceled_a
                       {
                           var channel = serviceProvider.GetService<IChannel>();
                           var settings = serviceProvider.GetService<AutoMLExperiment.AutoMLExperimentSettings>();
-                          return new DummyTrialRunner(settings, 5, channel);
+                          return new DummyTrialRunner(settings, 50, channel);
                       })
                       .SetTuner<RandomSearchTuner>();
 
             var cts = new CancellationTokenSource();
 
             context.Log += (o, e) =>
             {
+                this.Output.WriteLine(e.RawMessage);
                 if (e.RawMessage.Contains("Update Running Trial"))
                 {
+                    this.Output.WriteLine(e.RawMessage);
                     cts.Cancel();
                 }
             };