MultiThreadedUnitTestEvaluator: Fixed when using ThreadCount==1

Nucs · Nucs · commit 44d58bcd3ca9 · 2019-08-30T19:50:21.000+03:00
Set all methods inside as Hidden
diff --git a/test/TensorFlowNET.UnitTest/Utilities/MultiThreadedUnitTestExecuter.cs b/test/TensorFlowNET.UnitTest/Utilities/MultiThreadedUnitTestExecuter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Diagnostics;
 using System.Threading;
 
 namespace TensorFlowNET.UnitTest
@@ -20,13 +21,15 @@ public class MultiThreadedUnitTestExecuter : IDisposable
 
         #region Static
 
+        [DebuggerHidden]
         public static void Run(int threadCount, MultiThreadedTestDelegate workload)
         {
             if (workload == null) throw new ArgumentNullException(nameof(workload));
             if (threadCount <= 0) throw new ArgumentOutOfRangeException(nameof(threadCount));
             new MultiThreadedUnitTestExecuter(threadCount).Run(workload);
         }
 
+        [DebuggerHidden]
         public static void Run(int threadCount, params MultiThreadedTestDelegate[] workloads)
         {
             if (workloads == null) throw new ArgumentNullException(nameof(workloads));
@@ -35,6 +38,7 @@ public static void Run(int threadCount, params MultiThreadedTestDelegate[] workl
             new MultiThreadedUnitTestExecuter(threadCount).Run(workloads);
         }
 
+        [DebuggerHidden]
         public static void Run(int threadCount, MultiThreadedTestDelegate workload, Action<MultiThreadedUnitTestExecuter> postRun)
         {
             if (workload == null) throw new ArgumentNullException(nameof(workload));
@@ -58,6 +62,7 @@ public MultiThreadedUnitTestExecuter(int threadCount)
             barrier_threadstarted = new SemaphoreSlim(0, threadCount);
         }
 
+        [DebuggerHidden]
         public void Run(params MultiThreadedTestDelegate[] workloads)
         {
             if (workloads == null)
@@ -67,7 +72,15 @@ public void Run(params MultiThreadedTestDelegate[] workloads)
 
             if (ThreadCount == 1)
             {
-                workloads[0](0);
+                new Thread(() =>
+                {
+                    workloads[0](0);
+                    done_barrier2.Release(1);
+                }).Start();
+                
+                done_barrier2.Wait();
+                PostRun?.Invoke(this);
+
                 return;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Diagnostics;`
`2`	`3`	`using System.Threading;`
`3`	`4`
`4`	`5`	`namespace TensorFlowNET.UnitTest`
`@@ -20,13 +21,15 @@ public class MultiThreadedUnitTestExecuter : IDisposable`
`20`	`21`
`21`	`22`	`#region Static`
`22`	`23`
	`24`	`+ [DebuggerHidden]`
`23`	`25`	`public static void Run(int threadCount, MultiThreadedTestDelegate workload)`
`24`	`26`	`{`
`25`	`27`	`if (workload == null) throw new ArgumentNullException(nameof(workload));`
`26`	`28`	`if (threadCount <= 0) throw new ArgumentOutOfRangeException(nameof(threadCount));`
`27`	`29`	`new MultiThreadedUnitTestExecuter(threadCount).Run(workload);`
`28`	`30`	`}`
`29`	`31`
	`32`	`+ [DebuggerHidden]`
`30`	`33`	`public static void Run(int threadCount, params MultiThreadedTestDelegate[] workloads)`
`31`	`34`	`{`
`32`	`35`	`if (workloads == null) throw new ArgumentNullException(nameof(workloads));`
`@@ -35,6 +38,7 @@ public static void Run(int threadCount, params MultiThreadedTestDelegate[] workl`
`35`	`38`	`new MultiThreadedUnitTestExecuter(threadCount).Run(workloads);`
`36`	`39`	`}`
`37`	`40`
	`41`	`+ [DebuggerHidden]`
`38`	`42`	`public static void Run(int threadCount, MultiThreadedTestDelegate workload, Action<MultiThreadedUnitTestExecuter> postRun)`
`39`	`43`	`{`
`40`	`44`	`if (workload == null) throw new ArgumentNullException(nameof(workload));`
`@@ -58,6 +62,7 @@ public MultiThreadedUnitTestExecuter(int threadCount)`
`58`	`62`	`barrier_threadstarted = new SemaphoreSlim(0, threadCount);`
`59`	`63`	`}`
`60`	`64`
	`65`	`+ [DebuggerHidden]`
`61`	`66`	`public void Run(params MultiThreadedTestDelegate[] workloads)`
`62`	`67`	`{`
`63`	`68`	`if (workloads == null)`
`@@ -67,7 +72,15 @@ public void Run(params MultiThreadedTestDelegate[] workloads)`
`67`	`72`
`68`	`73`	`if (ThreadCount == 1)`
`69`	`74`	`{`
`70`		`- workloads[0](0);`
	`75`	`+ new Thread(() =>`
	`76`	`+ {`
	`77`	`+ workloads[0](0);`
	`78`	`+ done_barrier2.Release(1);`
	`79`	`+ }).Start();`
	`80`	`+`
	`81`	`+ done_barrier2.Wait();`
	`82`	`+ PostRun?.Invoke(this);`
	`83`	`+`
`71`	`84`	`return;`
`72`	`85`	`}`
`73`	`86`