davechallis · Apr 29, 2024 · Apr 29, 2024 · Apr 29, 2024 · Apr 29, 2024 · Apr 29, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "xgboost-sys/xgboost"]
 	path = xgboost-sys/xgboost
-	url = https://github.com/davechallis/xgboost
-	branch = master
+	url = https://github.com/dmlc/xgboost
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,11 +8,15 @@ homepage = "https://github.com/davechallis/rust-xgboost"
 description = "Machine learning using XGBoost"
 documentation = "https://docs.rs/xgboost"
 readme = "README.md"
+edition = "2021"
 
 [dependencies]
-xgboost-sys = "0.2.0"
+xgboost-sys = { path = "xgboost-sys" }
 libc = "0.2"
-derive_builder = "0.5"
+derive_builder = "0.20"
 log = "0.4"
-tempfile = "3.0"
-indexmap = "1.0"
+tempfile = "3.15"
+indexmap = "2.7"
+
+[features]
+cuda = ["xgboost-sys/cuda"]
diff --git a/README.md b/README.md
@@ -5,6 +5,12 @@
 
 Rust bindings for the [XGBoost](https://xgboost.ai) gradient boosting library.
 
+## Requirements
+
+- Clang v16.0.0
+
+## Documentation
+
 * [Documentation](https://docs.rs/xgboost)
 
 Basic usage example:
@@ -81,7 +87,7 @@ more detailed examples of different features.
 Currently in a very early stage of development, so the API is changing as usability issues occur,
 or new features are supported.
 
-Builds against XGBoost 0.81.
+Builds against XGBoost 2.0.3.
 
 ### Platforms
 

diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs
@@ -12,9 +12,9 @@ fn main() {
 
     // load train and test matrices from text files (in LibSVM format).
     println!("Loading train and test matrices...");
-    let dtrain = DMatrix::load("../../xgboost-sys/xgboost/demo/data/agaricus.txt.train").unwrap();
+    let dtrain = DMatrix::load(r#"{"uri": "../../xgboost-sys/xgboost/demo/data/agaricus.txt.train?format=libsvm"}"#).unwrap();
     println!("Train matrix: {}x{}", dtrain.num_rows(), dtrain.num_cols());
-    let dtest = DMatrix::load("../../xgboost-sys/xgboost/demo/data/agaricus.txt.test").unwrap();
+    let dtest = DMatrix::load(r#"{"uri": "../../xgboost-sys/xgboost/demo/data/agaricus.txt.test?format=libsvm"}"#).unwrap();
     println!("Test matrix: {}x{}", dtest.num_rows(), dtest.num_cols());
 
     // configure objectives, metrics, etc.
@@ -66,15 +66,15 @@ fn main() {
 
     // save and load model file
     println!("\nSaving and loading Booster model...");
-    booster.save("xgb.model").unwrap();
-    let booster = Booster::load("xgb.model").unwrap();
+    booster.save("xgb.json").unwrap();
+    let booster = Booster::load("xgb.json").unwrap();
     let preds2 = booster.predict(&dtest).unwrap();
     assert_eq!(preds, preds2);
 
     // save and load data matrix file
     println!("\nSaving and loading matrix data...");
     dtest.save("test.dmat").unwrap();
-    let dtest2 = DMatrix::load("test.dmat").unwrap();
+    let dtest2 = DMatrix::load_binary("test.dmat").unwrap();
     assert_eq!(booster.predict(&dtest2).unwrap(), preds);
 
     // error handling example

diff --git a/examples/custom_objective/src/main.rs b/examples/custom_objective/src/main.rs
@@ -6,8 +6,8 @@ use xgboost::{parameters, DMatrix, Booster};
 fn main() {
     // load train and test matrices from text files (in LibSVM format)
     println!("Custom objective example...");
-    let dtrain = DMatrix::load("../../xgboost-sys/xgboost/demo/data/agaricus.txt.train").unwrap();
-    let dtest = DMatrix::load("../../xgboost-sys/xgboost/demo/data/agaricus.txt.test").unwrap();
+    let dtrain = DMatrix::load(r#"{"uri": "../../xgboost-sys/xgboost/demo/data/agaricus.txt.train?format=libsvm"}"#).unwrap();
+    let dtest = DMatrix::load(r#"{"uri": "../../xgboost-sys/xgboost/demo/data/agaricus.txt.test?format=libsvm"}"#).unwrap();
 
     // specify datasets to evaluate against during training
     let evaluation_sets = [(&dtest, "test"), (&dtrain, "train")];

diff --git a/examples/generalised_linear_model/src/main.rs b/examples/generalised_linear_model/src/main.rs
@@ -12,8 +12,8 @@ fn main() {
 
     // load train and test matrices from text files (in LibSVM format)
     println!("Custom objective example...");
-    let dtrain = DMatrix::load("../../xgboost-sys/xgboost/demo/data/agaricus.txt.train").unwrap();
-    let dtest = DMatrix::load("../../xgboost-sys/xgboost/demo/data/agaricus.txt.test").unwrap();
+    let dtrain = DMatrix::load(r#"{"uri": "../../xgboost-sys/xgboost/demo/data/agaricus.txt.train?format=libsvm"}"#).unwrap();
+    let dtest = DMatrix::load(r#"{"uri": "../../xgboost-sys/xgboost/demo/data/agaricus.txt.test?format=libsvm"}"#).unwrap();
 
     // configure objectives, metrics, etc.
     let learning_params = parameters::learning::LearningTaskParametersBuilder::default()

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1,2 @@
+max_width = 120
+single_line_if_else_max_width = 80
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		max_width = 120
		single_line_if_else_max_width = 80