Merge pull request #89 from stonebig/master

stonebig · web-flow · commit e3ffef27e9ff · 2024-05-19T15:52:13.000+02:00
tweak from @FeldrinH suggestions
diff --git a/docs/free-threading_test/sudoku_thread_perf_comparison.py b/docs/free-threading_test/sudoku_thread_perf_comparison.py
@@ -12,6 +12,11 @@
 ##   values is a dict of possible values, e.g. {'A1':'12349', 'A2':'8', ...}
 
 import os
+import sys
+try:
+    _is_gil_enabled = sys._is_gil_enabled()
+except:
+    _is_gil_enabled = True
 
 def cross(A, B):
     "Cross product of elements in A and elements in B."
@@ -155,9 +160,9 @@ def solve_all(grids, name='', showif=0.0, nbthreads=1):
     When showif is a number of seconds, display puzzles that take longer.
     When showif is None, don't display any puzzles."""
     def time_solve(grid):
-        start = time.time()
+        start = time.perf_counter()
         values = solve(grid)
-        t = time.time()-start
+        t = time.perf_counter()-start
         ## Display puzzles that take long enough
         if showif is not None and t > showif:
             display(grid_values(grid))
@@ -198,12 +203,12 @@ def random_puzzle(N=17):
     test()
     nbsudoku = 40
     thread_list = ( 1, 2, 4, 8, 16)
-    print(f'there is {os.cpu_count()} logical processors, {os.cpu_count()/2} physical processors')
+    print(f'there is {os.cpu_count()} logical processors, {os.cpu_count()/2} physical processors, Gil Enabled = {_is_gil_enabled}')
     reference_delta = 0
     for nbthreads in thread_list:
-        startall = time.time()
+        startall = time.perf_counter()
         solve_all([hard2]*nbsudoku, "hard2", None, nbthreads=nbthreads)
-        new_delta = time.time()-startall
+        new_delta = time.perf_counter()-startall
         if reference_delta ==0 :
            reference_delta = new_delta
         ratio = reference_delta/(new_delta) 
diff --git a/docs/free-threading_test/sudoku_thread_perf_comparison_typed.py b/docs/free-threading_test/sudoku_thread_perf_comparison_typed.py
@@ -18,6 +18,11 @@
 import re
 import time, random
 from concurrent.futures import ThreadPoolExecutor
+import sys
+try:
+    _is_gil_enabled = sys._is_gil_enabled()
+except:
+    _is_gil_enabled = True
 
 DigitSet = str  # e.g. '123'
 Square   = str  # e.g. 'A9'
@@ -141,9 +146,9 @@ def solve_all(puzzles, name, showif=0.0, nbthreads=1):
     When showif is a number of seconds, display puzzles that take longer.
     When showif is None, don't display any puzzles."""
     def time_solve(puzzle):
-        start = time.time()
+        start = time.perf_counter()
         solution = search(constrain(puzzle))
-        t = time.time()-start
+        t = time.perf_counter()-start
         ## Display puzzles that take long enough
         if showif is not None and t > showif and is_solution(solution, puzzle):
             print('\nPuzzle            ', sep, 'Solution')
@@ -215,16 +220,16 @@ def random_puzzle(N=17):
     #print(picture(grid1))
     nbsudoku = 40
     thread_list = ( 1, 2, 4, 8, 16)
-    print(f'there is {os.cpu_count()} logical processors, {os.cpu_count()/2} physical processors')
+    print(f'there is {os.cpu_count()} logical processors, {os.cpu_count()/2} physical processors, Gil Enabled = {_is_gil_enabled}')
     reference_delta = 0
     my_puzzles = parse_grids([hard2]*nbsudoku)
     for nbthreads in thread_list:
-        startall = time.time()
+        startall = time.perf_counter()
         #hardest  = parse_grids(open('hardest.txt'))
         #grids10k = parse_grids(open('sudoku10k.txt'))
         #solve(puzzles=my_puzzles, verbose=False)
         solve_all(puzzles=my_puzzles, name='hard2', showif=None, nbthreads=nbthreads) 
-        new_delta = time.time()-startall
+        new_delta = time.perf_counter()-startall
         if reference_delta ==0 :
            reference_delta = new_delta
         ratio = reference_delta/(new_delta) 
diff --git a/docs/free-threading_test/thread1.py b/docs/free-threading_test/thread1.py
@@ -2,19 +2,24 @@
 import time, random
 from concurrent.futures import ThreadPoolExecutor
 
-print(f"nogil={getattr(sys.flags, 'nogil', False)}")
+try:
+    _is_gil_enabled = sys._is_gil_enabled()
+except:
+    _is_gil_enabled = True
+
+print(f"Gil Enabled = {_is_gil_enabled}")
 
 def fib(n):
     if n < 2: return 1
     return fib(n-1) + fib(n-2)
 
 threads = 1
-start = time.time()
+start = time.perf_counter()
 if len(sys.argv) > 1:
     threads = int(sys.argv[1])
 
 with ThreadPoolExecutor(max_workers=threads) as executor:
     for _ in range(threads):
         executor.submit(lambda: print(fib(34)))
-t = time.time()-start
+t = time.perf_counter()-start
 print("Solved g %.2f secs " %t) 
diff --git a/docs/free-threading_test/thread20.py b/docs/free-threading_test/thread20.py
@@ -2,19 +2,24 @@
 import time, random
 from concurrent.futures import ThreadPoolExecutor
 
-print(f"nogil={getattr(sys.flags, 'nogil', False)}")
+try:
+    _is_gil_enabled = sys._is_gil_enabled()
+except:
+    _is_gil_enabled = True
+
+print(f"Gil Enabled = {_is_gil_enabled}")
 
 def fib(n):
     if n < 2: return 1
     return fib(n-1) + fib(n-2)
 
 threads = 20
-start = time.time()
+start = time.perf_counter()
 if len(sys.argv) > 1:
     threads = int(sys.argv[1])
 
 with ThreadPoolExecutor(max_workers=threads) as executor:
     for _ in range(threads):
         executor.submit(lambda: print(fib(34)))
-t = time.time()-start
+t = time.perf_counter()-start
 print("Solved g %.2f secs " %t) 
diff --git a/docs/free-threading_test/thread4.py b/docs/free-threading_test/thread4.py
@@ -2,19 +2,24 @@
 import time, random
 from concurrent.futures import ThreadPoolExecutor
 
-print(f"nogil={getattr(sys.flags, 'nogil', False)}")
+try:
+    _is_gil_enabled = sys._is_gil_enabled()
+except:
+    _is_gil_enabled = True
+
+print(f"Gil Enabled = {_is_gil_enabled}")
 
 def fib(n):
     if n < 2: return 1
     return fib(n-1) + fib(n-2)
 
 threads = 4
-start = time.time()
+start = time.perf_counter()
 if len(sys.argv) > 1:
     threads = int(sys.argv[1])
 
 with ThreadPoolExecutor(max_workers=threads) as executor:
     for _ in range(threads):
         executor.submit(lambda: print(fib(34)))
-t = time.time()-start
+t = time.perf_counter()-start
 print("Solved g %.2f secs " %t) 
