disable unit test on old version of scikit-learn

Author: xadupre

_cmake/finalize.cmake

@@ -9,12 +9,46 @@ else()
     config_content_cuda "HAS_CUDA = 0")
 endif()
 
+execute_process(
+  COMMAND ${Python3_EXECUTABLE} -c "import cython;print(cython.__version__)"
+  OUTPUT_VARIABLE CYTHON_VERSION
+  ERROR_VARIABLE CYTHON_version_error
+  RESULT_VARIABLE CYTHON_version_result
+  OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+
+execute_process(
+  COMMAND ${Python3_EXECUTABLE} -c "import sklearn;print(sklearn.__version__)"
+  OUTPUT_VARIABLE SKLEARN_VERSION
+  ERROR_VARIABLE SKLEARN_version_error
+  RESULT_VARIABLE SKLEARN_version_result
+  OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+  
+execute_process(
+  COMMAND ${Python3_EXECUTABLE} -c "import numpy;print(numpy.__version__)"
+  OUTPUT_VARIABLE NUMPY_VERSION
+  ERROR_VARIABLE NUMPY_version_error
+  RESULT_VARIABLE NUMPY_version_result
+  OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+  
+execute_process(
+  COMMAND ${Python3_EXECUTABLE} -c "import scipy;print(scipy.__version__)"
+  OUTPUT_VARIABLE SCIPY_VERSION
+  ERROR_VARIABLE SCIPY_version_error
+  RESULT_VARIABLE SCIPY_version_result
+  OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+  
 set(
   config_content_comma
   "${config_content_cuda}"
   "\nCXX_FLAGS = '${CMAKE_CXX_FLAGS}'"
   "\nCMAKE_CXX_STANDARD_REQUIRED = '${CMAKE_CXX_STANDARD_REQUIRED}'"
   "\nCMAKE_CXX_EXTENSIONS = '${CMAKE_CXX_EXTENSIONS}'"
-  "\nCMAKE_CXX_STANDARD = ${CMAKE_CXX_STANDARD}\n")
+  "\nCMAKE_CXX_STANDARD = ${CMAKE_CXX_STANDARD}"
+  "\n\n# Was compiled with the following versions."
+  "\nCYTHON_VERSION = '${CYTHON_VERSION}'"
+  "\nSKLEARN_VERSION = '${SKLEARN_VERSION}'"
+  "\nNUMPY_VERSION = '${NUMPY_VERSION}'"
+  "\nSCIPY_VERSION = '${SCIPY_VERSION}'"
+  "\n")
 
 string(REPLACE ";" "" config_content "${config_content_comma}")

_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 import unittest
 import warnings
+import packaging.version as pv
 import numpy
 from sklearn.tree._criterion import MSE
 from sklearn.tree import DecisionTreeRegressor
-from sklearn import datasets
+from sklearn import datasets, __version__ as skl_ver
 from mlinsights.ext_test_case import ExtTestCase
 from mlinsights.mlmodel.piecewise_tree_regression import PiecewiseTreeRegressor
 
@@ -17,6 +18,10 @@ class TestPiecewiseDecisionTreeExperiment(ExtTestCase):
     # may indicate binary incompatibility.
     # Expected 1360 from C header, got 1576 from PyObject
     # )
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_criterions(self):
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
@@ -178,6 +183,10 @@ def test_criterions(self):
             )  # 0 if the function is not called
             self.assertAlmostEqual(expected_p2[i - 2], p2, atol=1e-10)
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion(self):
         from mlinsights.mlmodel.piecewise_tree_regression_criterion import (
             SimpleRegressorCriterion,
@@ -218,6 +227,10 @@ def test_decision_tree_criterion(self):
         self.assertEqual(p1, p2)
         self.assertEqual(clr1.tree_.node_count, clr2.tree_.node_count)
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris(self):
         from mlinsights.mlmodel.piecewise_tree_regression_criterion import (
             SimpleRegressorCriterion,
@@ -237,6 +250,10 @@ def test_decision_tree_criterion_iris(self):
         p2 = clr2.predict(X)
         self.assertEqual(p1[:10], p2[:10])
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris_dtc(self):
         iris = datasets.load_iris()
         X, y = iris.data, iris.target

_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment_fast.py

@@ -2,9 +2,10 @@
 import unittest
 import warnings
 import numpy
+import packaging.version as pv
 from sklearn.tree._criterion import MSE
 from sklearn.tree import DecisionTreeRegressor
-from sklearn import datasets
+from sklearn import datasets, __version__ as skl_ver
 from mlinsights.ext_test_case import ExtTestCase
 from mlinsights.mlmodel.piecewise_tree_regression import PiecewiseTreeRegressor
 
@@ -28,10 +29,10 @@
 
 
 class TestPiecewiseDecisionTreeExperimentFast(ExtTestCase):
-    # @unittest.skip(
-    #    reason="self.y = y raises: Fatal Python error: "
-    #    "__pyx_fatalerror: Acquisition count is"
-    # )
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_criterions(self):
         X = numpy.array([[1.0, 2.0]]).T
         y = numpy.array([1.0, 2.0])
@@ -145,6 +146,10 @@ def test_criterions(self):
             p2 = _test_criterion_impurity_improvement(c2, 0.0, left2, right2)
             self.assertAlmostEqual(p1, p2)
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_fast(self):
         X = numpy.array([[1.0, 2.0, 10.0, 11.0]]).T
         y = numpy.array([0.9, 1.1, 1.9, 2.1])
@@ -159,6 +164,10 @@ def test_decision_tree_criterion_fast(self):
         self.assertEqual(p1, p2)
         self.assertEqual(clr1.tree_.node_count, clr2.tree_.node_count)
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris(self):
         iris = datasets.load_iris()
         X, y = iris.data, iris.target
@@ -172,6 +181,10 @@ def test_decision_tree_criterion_iris(self):
         p2 = clr2.predict(X)
         self.assertEqual(p1[:10], p2[:10])
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris_dtc(self):
         iris = datasets.load_iris()
         X, y = iris.data, iris.target

_unittests/ut_mlmodel/test_piecewise_decision_tree_experiment_linear.py

@@ -2,9 +2,10 @@
 import unittest
 import warnings
 import numpy
+import packaging.version as pv
 from sklearn.tree._criterion import MSE
 from sklearn.tree import DecisionTreeRegressor
-from sklearn import datasets
+from sklearn import datasets, __version__ as skl_ver
 from sklearn.model_selection import train_test_split
 from mlinsights.ext_test_case import ExtTestCase
 from mlinsights.mlmodel.piecewise_tree_regression import PiecewiseTreeRegressor
@@ -26,10 +27,10 @@
 
 
 class TestPiecewiseDecisionTreeExperimentLinear(ExtTestCase):
-    # @unittest.skip(
-    #    reason="self.y = y raises: Fatal Python error: "
-    #    "__pyx_fatalerror: Acquisition count is"
-    # )
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_criterions(self):
         X = numpy.array([[10.0, 12.0, 13.0]]).T
         y = numpy.array([20.0, 22.0, 23.0])
@@ -131,10 +132,10 @@ def test_criterions(self):
             self.assertGreater(dest[0], 0)
             self.assertGreater(dest[1], 0)
 
-    # @unittest.skip(
-    #    reason="self.y = y raises: Fatal Python error: "
-    #    "__pyx_fatalerror: Acquisition count is"
-    # )
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_criterions_check_value(self):
         X = numpy.array([[10.0, 12.0, 13.0]]).T
         y = numpy.array([[20.0, 22.0, 23.0]]).T
@@ -143,6 +144,10 @@ def test_criterions_check_value(self):
         c2.node_beta(coef)
         self.assertEqual(coef[:2], numpy.array([1, 10]))
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_linear(self):
         X = numpy.array([[1.0, 2.0, 10.0, 11.0]]).T
         y = numpy.array([0.9, 1.1, 1.9, 2.1])
@@ -157,6 +162,10 @@ def test_decision_tree_criterion_linear(self):
         self.assertEqual(p1, p2)
         self.assertEqual(clr1.tree_.node_count, clr2.tree_.node_count)
 
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris(self):
         iris = datasets.load_iris()
         X, y = iris.data, iris.target
@@ -168,10 +177,10 @@ def test_decision_tree_criterion_iris(self):
         p2 = clr2.predict(X)
         self.assertEqual(p1.shape, p2.shape)
 
-    # @unittest.skip(
-    #    reason="self.y = y raises: Fatal Python error: "
-    #    "__pyx_fatalerror: Acquisition count is"
-    # )
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris_dtc(self):
         iris = datasets.load_iris()
         X, y = iris.data, iris.target
@@ -195,10 +204,10 @@ def test_decision_tree_criterion_iris_dtc(self):
         self.assertIsInstance(mp, dict)
         self.assertGreater(len(mp), 2)
 
-    # @unittest.skip(
-    #    reason="self.y = y raises: Fatal Python error: "
-    #    "__pyx_fatalerror: Acquisition count is"
-    # )
+    @unittest.skipIf(
+        pv.Version(skl_ver) < pv.Version("1.3.3"),
+        reason="it works with the main branch and the same cython",
+    )
     def test_decision_tree_criterion_iris_dtc_traintest(self):
         iris = datasets.load_iris()
         X, y = iris.data, iris.target

_unittests/ut_xrun_doc/test_check_version.py

@@ -0,0 +1,12 @@
+import unittest
+from mlinsights.ext_test_case import ExtTestCase
+from mlinsights._config import CYTHON_VERSION
+
+
+class TestCheckVersion(ExtTestCase):
+    def test_version_cython(self):
+        self.assertVersionGreaterOrEqual(CYTHON_VERSION, "3.0.5")
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)

mlinsights/ext_test_case.py

@@ -327,6 +327,14 @@ def assertEndsWith(self, suffix: str, text: str):
         if not text.endswith(suffix):
             raise AssertionError(f"Unable to find {suffix!r} in {text!r}.")
 
+    def assertVersionGreaterOrEqual(self, v1, v2):
+        from packaging.version import Version
+
+        if Version(v1) < Version(v2):
+            raise AssertionError(
+                f"Unexpected version, condition {v1} >= {v2} is not true."
+            )
+
     @classmethod
     def tearDownClass(cls):
         for name, line, w in cls._warns: