use cmake

Author: vaaaaanquish

src/booster.rs

@@ -361,6 +361,7 @@ impl Booster {
                                                 dmat.handle,
                                                 option_mask,
                                                 ntree_limit,
+                                                0,
                                                 &mut out_len,
                                                 &mut out_result))?;
 
@@ -381,10 +382,10 @@ impl Booster {
                                                 dmat.handle,
                                                 option_mask,
                                                 ntree_limit,
+                                                1,
                                                 &mut out_len,
                                                 &mut out_result))?;
         assert!(!out_result.is_null());
-
         let data = unsafe { slice::from_raw_parts(out_result, out_len as usize).to_vec() };
         Ok(data)
     }
@@ -403,6 +404,7 @@ impl Booster {
                                                 dmat.handle,
                                                 option_mask,
                                                 ntree_limit,
+                                                0,
                                                 &mut out_len,
                                                 &mut out_result))?;
         assert!(!out_result.is_null());
@@ -429,6 +431,7 @@ impl Booster {
                                                 dmat.handle,
                                                 option_mask,
                                                 ntree_limit,
+                                                0,
                                                 &mut out_len,
                                                 &mut out_result))?;
         assert!(!out_result.is_null());
@@ -456,6 +459,7 @@ impl Booster {
                                                 dmat.handle,
                                                 option_mask,
                                                 ntree_limit,
+                                                0,
                                                 &mut out_len,
                                                 &mut out_result))?;
         assert!(!out_result.is_null());

xgboost-sys/Cargo.toml

@@ -14,3 +14,4 @@ libc = "0.2"
 
 [build-dependencies]
 bindgen = "0.59"
+cmake = "0.1"

xgboost-sys/build.rs

@@ -1,5 +1,7 @@
 extern crate bindgen;
+extern crate cmake;
 
+use cmake::Config;
 use std::process::Command;
 use std::env;
 use std::path::{Path, PathBuf};
@@ -19,23 +21,20 @@ fn main() {
             });
     }
 
-    // TODO: allow for dynamic/static linking
-    // TODO: check whether rabit should be built/linked
-    if !xgb_root.join("lib").exists() {
-        // TODO: better checks for build completion, currently xgboost's build script can run
-        // `make clean_all` if openmp build fails
-        Command::new(xgb_root.join("build.sh"))
-            .current_dir(&xgb_root)
-            .status()
-            .expect("Failed to execute XGBoost build.sh script.");
-    }
+    // CMake
+    let dst = Config::new(&xgb_root)
+        .uses_cxx11()
+        .define("BUILD_STATIC_LIB", "ON")
+        .build();
 
     let xgb_root = xgb_root.canonicalize().unwrap();
 
     let bindings = bindgen::Builder::default()
         .header("wrapper.h")
+        .clang_args(&["-x", "c++", "-std=c++11"])
         .clang_arg(format!("-I{}", xgb_root.join("include").display()))
         .clang_arg(format!("-I{}", xgb_root.join("rabit/include").display()))
+        .clang_arg(format!("-I{}", xgb_root.join("dmlc-core/include").display()))
         .generate()
         .expect("Unable to generate bindings.");
 
@@ -48,21 +47,17 @@ fn main() {
     println!("cargo:rustc-link-search={}", xgb_root.join("rabit/lib").display());
     println!("cargo:rustc-link-search={}", xgb_root.join("dmlc-core").display());
 
-    // check if built with multithreading support, otherwise link to dummy lib
-    if xgb_root.join("rabit/lib/librabit.a").exists() {
-        println!("cargo:rustc-link-lib=static=rabit");
-        println!("cargo:rustc-link-lib=dylib=gomp");
-    } else {
-        println!("cargo:rustc-link-lib=static=rabit_empty");
-    }
-
     // link to appropriate C++ lib
     if target.contains("apple") {
         println!("cargo:rustc-link-lib=c++");
+        println!("cargo:rustc-link-lib=dylib=omp");
     } else {
         println!("cargo:rustc-link-lib=stdc++");
+        println!("cargo:rustc-link-lib=dylib=gomp");
     }
 
+    println!("cargo:rustc-link-search=native={}", dst.display());
+    println!("cargo:rustc-link-search=native={}", dst.join("lib").display());
     println!("cargo:rustc-link-lib=static=dmlc");
     println!("cargo:rustc-link-lib=static=xgboost");
 }