-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
- Loading branch information
There are no files selected for viewing
This file was deleted.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 59ac1090da5ba692238f4baf87d46a4c81b9282c Mon Sep 17 00:00:00 2001 | ||
From: Hyunsu Cho <chohyu01@cs.washington.edu> | ||
Date: Wed, 1 Nov 2023 01:01:34 -0700 | ||
Subject: [PATCH] Enable latest libcxx on MacOS | ||
|
||
--- | ||
R-package/src/Makevars.in | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/R-package/src/Makevars.in b/R-package/src/Makevars.in | ||
index 9e7cbfed..8b3af0ae 100644 | ||
--- a/R-package/src/Makevars.in | ||
+++ b/R-package/src/Makevars.in | ||
@@ -7,7 +7,7 @@ CXX_STD = CXX17 | ||
|
||
XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\ | ||
-DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\ | ||
- -DDMLC_LOG_CUSTOMIZE=1 | ||
+ -DDMLC_LOG_CUSTOMIZE=1 -D_LIBCPP_DISABLE_AVAILABILITY | ||
|
||
# disable the use of thread_local for 32 bit windows: | ||
ifeq ($(R_OSTYPE)$(WIN),windows) | ||
-- | ||
2.25.1 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
From 8007af85d3dab8369fbb89234e33ebb06d58dca6 Mon Sep 17 00:00:00 2001 | ||
From: Hyunsu Cho <chohyu01@cs.washington.edu> | ||
Date: Wed, 1 Nov 2023 08:47:29 -0700 | ||
Subject: [PATCH] Use mingw-w64 path | ||
|
||
--- | ||
python-package/packager/nativelib.py | 3 +++ | ||
python-package/xgboost/libpath.py | 3 +++ | ||
2 files changed, 6 insertions(+) | ||
|
||
diff --git a/python-package/packager/nativelib.py b/python-package/packager/nativelib.py | ||
index 9d3fec2b..74942f42 100644 | ||
--- a/python-package/packager/nativelib.py | ||
+++ b/python-package/packager/nativelib.py | ||
@@ -140,6 +140,9 @@ def locate_or_build_libxgboost( | ||
sys_prefix / "Library", | ||
sys_prefix / "Library" / "bin", | ||
sys_prefix / "Library" / "lib", | ||
+ sys_prefix / "Library" / "mingw-w64", | ||
+ sys_prefix / "Library" / "mingw-w64" / "bin", | ||
+ sys_prefix / "Library" / "mingw-w64" / "lib", | ||
] | ||
sys_prefix_candidates = [ | ||
p.expanduser().resolve() for p in sys_prefix_candidates | ||
diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py | ||
index 58c78df0..92d46a0b 100644 | ||
--- a/python-package/xgboost/libpath.py | ||
+++ b/python-package/xgboost/libpath.py | ||
@@ -38,6 +38,9 @@ def find_lib_path() -> List[str]: | ||
os.path.join(sys.base_prefix, "Library"), | ||
os.path.join(sys.base_prefix, "Library", "bin"), | ||
os.path.join(sys.base_prefix, "Library", "lib"), | ||
+ os.path.join(sys.base_prefix, "Library", "mingw-w64"), | ||
+ os.path.join(sys.base_prefix, "Library", "mingw-w64", "bin"), | ||
+ os.path.join(sys.base_prefix, "Library", "mingw-w64", "lib"), | ||
] | ||
) | ||
dll_path = [os.path.join(p, "xgboost.dll") for p in dll_path] | ||
-- | ||
2.25.1 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#!/bin/bash | ||
|
||
pushd ${SRC_DIR}/python-package | ||
${PYTHON} setup.py install --use-system-libxgboost --single-version-externally-managed --record=record.txt | ||
${PYTHON} -m pip install . -vv --config-settings use_system_libxgboost=True | ||
popd |