Skip to content

intel/m1 compatibility #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2024
Merged

intel/m1 compatibility #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/booster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ impl Booster {
dmats
};

let mut bst = Booster::new_with_cached_dmats(&params.booster_params, &cached_dmats)?;
let bst = Booster::new_with_cached_dmats(&params.booster_params, &cached_dmats)?;
for i in 0..params.boost_rounds as i32 {
if let Some(eval_sets) = params.evaluation_sets {
let mut dmat_eval_results = bst.eval_set(eval_sets, i)?;
Expand Down
20 changes: 12 additions & 8 deletions xgboost-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,21 @@ fn main() {
#[cfg(not(feature = "cuda"))]
let mut dst = Config::new(&xgb_root);

let dst = dst.uses_cxx11()
let mut dst = dst.uses_cxx11()
.define("BUILD_STATIC_LIB", "ON");

#[cfg(target_os = "macos")]
let dst =
dst
.define("CMAKE_C_COMPILER", "/opt/homebrew/opt/llvm/bin/clang")
.define("CMAKE_CXX_COMPILER", "/opt/homebrew/opt/llvm/bin/clang++")
.define("OPENMP_LIBRARIES", "/opt/homebrew/opt/llvm/lib")
.define("OPENMP_INCLUDES", "/opt/homebrew/opt/llvm/include");

{
let path = PathBuf::from("/opt/homebrew/"); // check for m1 vs intel config
if let Ok(_dir) = std::fs::read_dir(&path) {
dst =
dst
.define("CMAKE_C_COMPILER", "/opt/homebrew/opt/llvm/bin/clang")
.define("CMAKE_CXX_COMPILER", "/opt/homebrew/opt/llvm/bin/clang++")
.define("OPENMP_LIBRARIES", "/opt/homebrew/opt/llvm/lib")
.define("OPENMP_INCLUDES", "/opt/homebrew/opt/llvm/include");
};
}
let dst = dst.build();

let xgb_root = xgb_root.canonicalize().unwrap();
Expand Down