Merge pull request #6570 from PrimozGodec/fix-xgboost

Gradient boosting - Adapt tests to version xgboost=2; move xgboost/catboost to regular requirements

Author: markotoplak

.github/workflows/test.yml

@@ -148,10 +148,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install system dependencies on MacOS
-        run: brew install libomp
-        if: runner.os == 'macOS'
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

Orange/widgets/model/tests/test_owgradientboosting.py

@@ -36,6 +36,14 @@
 from Orange.widgets.widget import OWWidget
 
 
+def get_tree_train_params(model):
+    ln = json.loads(model.skl_model.get_booster().save_config())["learner"]
+    try:
+        return ln["gradient_booster"]["tree_train_param"]
+    except KeyError:
+        return ln["gradient_booster"]["updater"]["grow_colmaker"]["train_param"]
+
+
 def create_parent(editor_class):
     class DummyWidget(OWWidget):
         name = "Mock"
@@ -158,9 +166,7 @@ def test_default_parameters_cls(self):
         booster = XGBClassifier()
         model = booster(data)
         params = model.skl_model.get_params()
-        booster_params = json.loads(model.skl_model.get_booster().save_config())
-        updater = booster_params["learner"]["gradient_booster"]["updater"]
-        tp = updater["grow_colmaker"]["train_param"]
+        tp = get_tree_train_params(model)
         self.assertEqual(params["n_estimators"], self.editor.n_estimators)
         self.assertEqual(
             round(float(tp["learning_rate"]), 1), self.editor.learning_rate
@@ -178,9 +184,7 @@ def test_default_parameters_reg(self):
         booster = XGBRegressor()
         model = booster(data)
         params = model.skl_model.get_params()
-        booster_params = json.loads(model.skl_model.get_booster().save_config())
-        updater = booster_params["learner"]["gradient_booster"]["updater"]
-        tp = updater["grow_colmaker"]["train_param"]
+        tp = get_tree_train_params(model)
         self.assertEqual(params["n_estimators"], self.editor.n_estimators)
         self.assertEqual(
             round(float(tp["learning_rate"]), 1), self.editor.learning_rate
@@ -223,9 +227,7 @@ def test_default_parameters_cls(self):
         booster = XGBRFClassifier()
         model = booster(data)
         params = model.skl_model.get_params()
-        booster_params = json.loads(model.skl_model.get_booster().save_config())
-        updater = booster_params["learner"]["gradient_booster"]["updater"]
-        tp = updater["grow_colmaker"]["train_param"]
+        tp = get_tree_train_params(model)
         self.assertEqual(params["n_estimators"], self.editor.n_estimators)
         self.assertEqual(
             round(float(tp["learning_rate"]), 1), self.editor.learning_rate
@@ -243,9 +245,7 @@ def test_default_parameters_reg(self):
         booster = XGBRFRegressor()
         model = booster(data)
         params = model.skl_model.get_params()
-        booster_params = json.loads(model.skl_model.get_booster().save_config())
-        updater = booster_params["learner"]["gradient_booster"]["updater"]
-        tp = updater["grow_colmaker"]["train_param"]
+        tp = get_tree_train_params(model)
         self.assertEqual(params["n_estimators"], self.editor.n_estimators)
         self.assertEqual(
             round(float(tp["learning_rate"]), 1), self.editor.learning_rate

conda-recipe/meta.yaml

@@ -69,6 +69,8 @@ requirements:
     - cachecontrol >=0.12.6
     - qtconsole >=4.7.2
     - pygments >=2.8.0
+    - catboost >=1.0.1
+    - xgboost >=1.7.4
 
 test:
   # Python imports

requirements-core.txt

@@ -26,3 +26,5 @@ pandas>=1.4.0,!=1.5.0,!=2.0.0
 pyyaml
 openpyxl
 httpx>=0.21.0
+catboost>=1.0.1
+xgboost>=1.7.4

requirements-opt.txt

@@ -3,6 +3,4 @@ cython
 -r requirements-doc.txt
 -r requirements-gui.txt
 -r requirements-pyqt.txt
-# for orange data mining library catboost and xgboost required
--r requirements-opt.txt
 -e .

requirements-readthedocs.txt

@@ -30,7 +30,6 @@ deps =
     pyqt5==5.15.*;platform_system!="Windows" or python_version>='3.10'
     pyqtwebengine==5.12.*;platform_system=="Windows" and python_version<'3.10'
     pyqtwebengine==5.15.*;platform_system!="Windows" or python_version>='3.10'
-    -r {toxinidir}/requirements-opt.txt
     coverage
     psycopg2-binary
     pymssql<3.0
@@ -66,7 +65,7 @@ deps =
     # oldest: pyyaml
     # oldest: openpyxl
     oldest: httpx==0.21.0
-    oldest: xgboost==1.5.0
+    oldest: xgboost==1.7.4
     oldest: catboost==1.0.1
 
 commands_pre =