Merge pull request #443 from sathvikbhagavan/sb/xgboost_bump

Use XGBoost 2
SciML · Sep 22, 2023 · 996f662 · 996f662
2 parents 67a95be + 50567c2
commit 996f662
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -25,5 +25,5 @@ SurrogatesMOE = "0.1.0"
 SurrogatesPolyChaos = "0.1.0"
 SurrogatesRandomForest = "0.1.0"
 SurrogatesSVM = "0.1.0"
-XGBoost = "1.5"
+XGBoost = "2"
 Zygote = "0.6.49"
diff --git a/lib/SurrogatesMOE/Project.toml b/lib/SurrogatesMOE/Project.toml
@@ -24,7 +24,7 @@ Surrogates = "6.0"
 SurrogatesFlux = "0.1.0"
 SurrogatesPolyChaos = "0.1.0"
 SurrogatesRandomForest = "0.1.0"
-XGBoost = "1.5.2"
+XGBoost = "2"
 
 [extras]
 Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"

diff --git a/lib/SurrogatesRandomForest/Project.toml b/lib/SurrogatesRandomForest/Project.toml
@@ -9,7 +9,7 @@ XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9"
 
 [compat]
 Surrogates = "6"
-XGBoost = "1.5"
+XGBoost = "2"
 julia = "1.6"
 
 [extras]

diff --git a/lib/SurrogatesRandomForest/src/SurrogatesRandomForest.jl b/lib/SurrogatesRandomForest/src/SurrogatesRandomForest.jl
@@ -14,7 +14,7 @@ mutable struct RandomForestSurrogate{X, Y, B, L, U, N} <: AbstractSurrogate
 end
 
 function RandomForestSurrogate(x, y, lb::Number, ub::Number; num_round::Int = 1)
-    bst = xgboost(reshape(x, length(x), 1), num_round, label = y)
+    bst = xgboost((reshape(x, length(x), 1), y); num_round)
     RandomForestSurrogate(x, y, bst, lb, ub, num_round)
 end
 
@@ -35,7 +35,7 @@ function RandomForestSurrogate(x, y, lb, ub; num_round::Int = 1)
     for j in 1:length(x)
         X[j, :] = vec(collect(x[j]))
     end
-    bst = xgboost(X, num_round, label = y)
+    bst = xgboost((X, y); num_round)
     RandomForestSurrogate(x, y, bst, lb, ub, num_round)
 end
 
@@ -50,8 +50,7 @@ function add_point!(rndfor::RandomForestSurrogate, x_new, y_new)
         #1D
         rndfor.x = vcat(rndfor.x, x_new)
         rndfor.y = vcat(rndfor.y, y_new)
-        rndfor.bst = xgboost(reshape(rndfor.x, length(rndfor.x), 1), rndfor.num_round,
-                             label = rndfor.y)
+        rndfor.bst = xgboost((reshape(rndfor.x, length(rndfor.x), 1), rndfor.y); num_round = rndfor.num_round)
     else
         n_previous = length(rndfor.x)
         a = vcat(rndfor.x, x_new)
@@ -75,7 +74,7 @@ function add_point!(rndfor::RandomForestSurrogate, x_new, y_new)
         end
         rndfor.x = vcat(rndfor.x, x_new)
         rndfor.y = vcat(rndfor.y, y_new)
-        rndfor.bst = xgboost(X, rndfor.num_round, label = rndfor.y)
+        rndfor.bst = xgboost((X, rndfor.y); num_round = rndfor.num_round)
     end
     nothing
 end