Fix cutting edge CI (#185)

XGBoost 1.6.0 takes longer to train

Author: Yard1

.github/workflows/test.yaml

@@ -30,7 +30,7 @@ jobs:
 
   test_linux_ray_master:
     runs-on: ubuntu-latest
-    timeout-minutes: 100
+    timeout-minutes: 120
     strategy:
       matrix:
         python-version: [3.6.9, 3.7, 3.8]
@@ -62,7 +62,7 @@ jobs:
     - name: Run tests
       uses: nick-invision/retry@v2
       with:
-        timeout_minutes: 30
+        timeout_minutes: 35
         max_attempts: 3
         command: bash ./run_ci_tests.sh
     - name: Run examples
@@ -74,7 +74,7 @@ jobs:
 
   test_linux_ray_release:
     runs-on: ubuntu-latest
-    timeout-minutes: 100
+    timeout-minutes: 120
     strategy:
       matrix:
         python-version: [3.6.9, 3.7, 3.8]
@@ -99,7 +99,7 @@ jobs:
     - name: Run tests
       uses: nick-invision/retry@v2
       with:
-        timeout_minutes: 30
+        timeout_minutes: 35
         max_attempts: 3
         command: bash ./run_ci_tests.sh
     - name: Run examples
@@ -113,7 +113,7 @@ jobs:
     # Test compatibility when some optional libraries are missing
     # Test runs on latest ray release
     runs-on: ubuntu-latest
-    timeout-minutes: 100
+    timeout-minutes: 120
     strategy:
       matrix:
         python-version: [3.6.9, 3.7, 3.8]
@@ -143,7 +143,7 @@ jobs:
     - name: Run tests
       uses: nick-invision/retry@v2
       with:
-        timeout_minutes: 30
+        timeout_minutes: 35
         max_attempts: 3
         command: bash ./run_ci_tests.sh --no-tune
     - name: Run examples
@@ -156,7 +156,7 @@ jobs:
   test_linux_cutting_edge:
     # Tests on cutting edge, i.e. latest Ray master, latest XGBoost master
     runs-on: ubuntu-latest
-    timeout-minutes: 100
+    timeout-minutes: 120
     strategy:
       matrix:
         python-version: [3.6.9, 3.7, 3.8]
@@ -205,7 +205,7 @@ jobs:
     - name: Run tests
       uses: nick-invision/retry@v2
       with:
-        timeout_minutes: 30
+        timeout_minutes: 35
         max_attempts: 3
         command: bash ./run_ci_tests.sh
     - name: Run examples
@@ -218,7 +218,7 @@ jobs:
   test_linux_xgboost_legacy:
     # Tests on XGBoost 0.90 and latest Ray release
     runs-on: ubuntu-latest
-    timeout-minutes: 100
+    timeout-minutes: 120
     strategy:
       matrix:
         python-version: [3.6.9]
@@ -246,7 +246,7 @@ jobs:
     - name: Run tests
       uses: nick-invision/retry@v2
       with:
-        timeout_minutes: 30
+        timeout_minutes: 35
         max_attempts: 3
         command: bash ./run_ci_tests.sh
     - name: Run examples

xgboost_ray/tests/test_sklearn.py

@@ -387,7 +387,10 @@ def test_parameter_tuning(self):
         )
         clf.fit(X, y)
         assert clf.best_score_ < 0.7
-        assert clf.best_params_ == {"n_estimators": 100, "max_depth": 4}
+        if XGBOOST_VERSION_TUPLE >= (1, 6, 0):
+            assert clf.best_params_ == {"n_estimators": 200, "max_depth": 2}
+        else:
+            assert clf.best_params_ == {"n_estimators": 100, "max_depth": 4}
 
     def test_regression_with_custom_objective(self):
         self._init_ray()
@@ -960,8 +963,14 @@ def test_constraint_parameters(self):
         reg.fit(X, y)
 
         config = json.loads(reg.get_booster().save_config())
-        assert (config["learner"]["gradient_booster"]["updater"]["prune"][
-            "train_param"]["interaction_constraints"] == "[[0, 1], [2, 3, 4]]")
+        if XGBOOST_VERSION_TUPLE >= (1, 6, 0):
+            assert (config["learner"]["gradient_booster"]["updater"][
+                "grow_histmaker"]["train_param"]["interaction_constraints"] ==
+                    "[[0, 1], [2, 3, 4]]")
+        else:
+            assert (config["learner"]["gradient_booster"]["updater"]["prune"][
+                "train_param"]["interaction_constraints"] ==
+                    "[[0, 1], [2, 3, 4]]")
 
     # TODO check why this is not working (output is empty, probably due to Ray)
     # def test_parameter_validation(self):