POL5802 harmonize async() with python 3.12 (PolusAI#286)

Author: friskluft

src/nyx/workflow_wholeslide.cpp

@@ -76,15 +76,6 @@ namespace Nyxus
 		if (vroi.aux_image_matrix._pix_plane.size())
 			std::vector<PixIntens>().swap(vroi.aux_image_matrix._pix_plane);
 
-		// allow heyboard interrupt
-		#ifdef WITH_PYTHON_H
-		if (PyErr_CheckSignals() != 0)
-		{
-			sureprint("\nAborting per user input\n");
-			throw pybind11::error_already_set();
-		}
-		#endif
-
 		// no need to calculate neighbor features in WSI, returning
 		return true;
 	}
@@ -200,15 +191,6 @@ namespace Nyxus
 		// Not saving nested ROI related info because this image is single-ROI (whole-slide)
 		//
 
-		// allow heyboard interrupt
-		#ifdef WITH_PYTHON_H
-		if (PyErr_CheckSignals() != 0)
-		{
-			sureprint("\nAborting per user input\n");
-			throw pybind11::error_already_set();
-		}
-		#endif
-
 		rv = 0; // success
 	}
 
@@ -336,6 +318,15 @@ namespace Nyxus
 						rval);
 				}
 			}
+
+			// allow keyboard interrupt
+			#ifdef WITH_PYTHON_H
+			if (PyErr_CheckSignals() != 0)
+			{
+				sureprint("\nAborting per user input\n");
+				throw pybind11::error_already_set();
+			}
+			#endif		
 		}
 
 		//**** finalize Apache output

tests/python/test_nyxus.py

@@ -695,7 +695,34 @@ def test_image_quality_montage_single_roi(self):
 
             assert directory_features.shape[1] > 3
 
-        @pytest.mark.skipif(sys.version_info[:2] == (3, 12), reason="Skipped for Python 3.12")            
+        def test_nonimq_wsi_scalability (self):
+            '''
+            Test of consistency of scalable regular 2D feature calculation 
+            via the whole-slide workflow at 
+            varying number of threads.
+            '''
+
+            path = str(pathlib.Path(__file__).parent.resolve())
+            data_path = path + '/data/'
+            nyx = nyxus.Nyxus (["*WHOLESLIDE*"])
+
+            p = { "n_feature_calc_threads": 1}
+            nyx.set_params(**p)
+            f1 = nyx.featurize_directory (data_path + 'int/', data_path + 'int/')      
+            s1 = f1.sum(numeric_only=True, axis=0)
+
+            p = { "n_feature_calc_threads": 2}
+            nyx.set_params(**p)
+            f2 = nyx.featurize_directory (data_path + 'int/', data_path + 'int/')      
+            s2 = f2.sum(numeric_only=True, axis=0)
+
+            p = { "n_feature_calc_threads": 4}
+            nyx.set_params(**p)
+            f4 = nyx.featurize_directory (data_path + 'int/', data_path + 'int/')      
+            s4 = f4.sum(numeric_only=True, axis=0)
+
+            assert s1.equals(s2) and s1.equals(s4)
+
         def test_featureset_consistency (self):
             '''
             This test checks if 2D and image quality features are isolated