Merge branch 'master' into unpin_dask

hcho3 · Feb 7, 2025 · 47b620e · 47b620e
2 parents af500b3 + 7103baf
commit 47b620e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 61 deletions.
diff --git a/.github/workflows/update_rapids.yml b/.github/workflows/update_rapids.yml
diff --git a/R-package/R/utils.R b/R-package/R/utils.R
@@ -139,8 +139,24 @@ check.custom.obj <- function(params, objective) {
   if (!is.null(params[['objective']]) && !is.null(objective))
     stop("Setting objectives in 'params' and 'objective' at the same time is not allowed")
 
-  if (!is.null(objective) && typeof(objective) != 'closure')
+  if (!is.null(objective) && typeof(objective) != 'closure') {
+    if (is.character(objective)) {
+      msg <- paste(
+        "Argument 'objective' is only for custom objectives.",
+        "For built-in objectives, pass the objective under 'params'.",
+        sep = " "
+      )
+      error_on_deprecated <- getOption("xgboost.strict_mode", default = FALSE)
+      if (error_on_deprecated) {
+        stop(msg)
+      } else {
+        warning(msg, " This warning will become an error in a future version.")
+      }
+      params$objective <- objective
+      return(list(params = params, objective = NULL))
+    }
     stop("'objective' must be a function")
+  }
 
   # handle the case when custom objective function was provided through params
   if (!is.null(params[['objective']]) &&

diff --git a/ops/script/update_rapids.sh b/ops/script/update_rapids.sh