Skip to content
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.

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

Release 2.0.3 #132

Merged
merged 47 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
5e56170
Release 2.0.0
PrimozGodec Sep 14, 2023
d3a4e7d
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and co…
Sep 14, 2023
db22c6d
Fix patchs
PrimozGodec Sep 18, 2023
c08fa24
Update patch
PrimozGodec Sep 19, 2023
9aac38e
Use pip install instead of setup.py install
PrimozGodec Sep 19, 2023
54002ca
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and co…
Sep 19, 2023
4e87a9c
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Oct 14, 2023
f4a3fd8
Merge conda-forge/main into PrimozGodec/release-2.0.0
jakirkham Oct 14, 2023
fd527a0
Merge conda-forge/main into PrimozGodec/release-2.0.0
jakirkham Oct 14, 2023
5231c77
Merge conda-forge/main into PrimozGodec/release-2.0.0
jakirkham Oct 18, 2023
edfa0a0
Workaround `conda-build` `outputs` bug w/`pip`
jakirkham Oct 18, 2023
b22e7fe
Require macOS 10.13+
jakirkham Oct 18, 2023
1fde14d
Move `script_env` under `build`
jakirkham Oct 18, 2023
5bb90d7
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Oct 18, 2023
2119d42
Bump to macOS 10.15+
jakirkham Oct 18, 2023
73df4d7
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Oct 18, 2023
2e1bd05
Switch from `setuptools` to `hatchling`
jakirkham Oct 18, 2023
f4b5ff8
Fix handling of paths on Windows
hcho3 Oct 20, 2023
7e58b72
Remove conflicting patch
hcho3 Oct 20, 2023
f333e39
Fix MacOS build
hcho3 Oct 20, 2023
18b91f1
Fix Windows build
hcho3 Oct 20, 2023
41ce4b0
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.27.1, and co…
hcho3 Oct 20, 2023
666b193
Update recipe/meta.yaml
hcho3 Oct 24, 2023
77ec806
Fix OpenMP build on MacOS
hcho3 Oct 31, 2023
b485d49
Merge remote-tracking branch 'upstream/main' into release-2.0.0
hcho3 Oct 31, 2023
aa7dcbd
Add verbose flag
hcho3 Nov 1, 2023
8662cf0
Specify include path for OpenMP
hcho3 Nov 1, 2023
f6e6f51
Attempt to fix PPC64
hcho3 Nov 1, 2023
26f4a64
Remove numpy
hcho3 Nov 1, 2023
b13a492
Escape quotes
hcho3 Nov 1, 2023
1d0feb7
Escape space
hcho3 Nov 1, 2023
e6898fd
Use Bash array
hcho3 Nov 1, 2023
217f95a
Avoid unbound variable error
hcho3 Nov 1, 2023
475df3e
Add back workaround conda-build outputs bug w/pip
hcho3 Nov 1, 2023
2cb581d
Use XGBoost 2.0.1 patch release
hcho3 Nov 1, 2023
c34adcd
Fix R build on MacOS
hcho3 Nov 1, 2023
e136765
Fix build for Windows
hcho3 Nov 1, 2023
b701569
Don't use mingw-w64 path when installing
hcho3 Nov 1, 2023
7df7e4c
Patch for C++17 on MacOS
hcho3 Nov 1, 2023
5b4a06b
Use mingw-w64 path
hcho3 Nov 1, 2023
da913e7
Try undoing dmlc/xgboost#9436
hcho3 Nov 2, 2023
48d5896
Merge branch 'main' into release-2.0.0
PrimozGodec Nov 17, 2023
990c1d0
Use XGBoost 2.0.2
hcho3 Dec 15, 2023
7a1d17f
Remove MACOSX_DEPLOYMENT_TARGET
hcho3 Dec 15, 2023
33f3848
Keep CMAKE_ARGS from compiler activation
hcho3 Dec 15, 2023
2c413b2
MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.1, and co…
Dec 15, 2023
228755e
Use 2.0.3
hcho3 Dec 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 0 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 3 additions & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.15'
MACOSX_SDK_VERSION:
- '10.15'
c_compiler:
- clang
c_compiler_version:
Expand Down
36 changes: 0 additions & 36 deletions .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions recipe/0001-conda-Unbundle-libxgboost.-dll-dylib-so.patch

This file was deleted.

86 changes: 86 additions & 0 deletions recipe/0002-libpath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
From 2cdc7f71d586cbb15322b81c17b98cf99cc98bbe Mon Sep 17 00:00:00 2001
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch will be part of the upcoming patch release 2.0.1 of XGBoost.

From: Hyunsu Cho <chohyu01@cs.washington.edu>
Date: Thu, 19 Oct 2023 18:35:01 -0700
Subject: [PATCH] Fix libpath logic for Windows

---
python-package/packager/nativelib.py | 32 +++++++++++++++++++---------
python-package/xgboost/libpath.py | 19 ++++++++---------
2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/python-package/packager/nativelib.py b/python-package/packager/nativelib.py
index ff38fa11..164bd09e 100644
--- a/python-package/packager/nativelib.py
+++ b/python-package/packager/nativelib.py
@@ -132,16 +132,28 @@ def locate_or_build_libxgboost(

if build_config.use_system_libxgboost:
# Find libxgboost from system prefix
- sys_base_prefix = pathlib.Path(sys.base_prefix).absolute().resolve()
- libxgboost_sys = sys_base_prefix / "lib" / _lib_name()
- if not libxgboost_sys.exists():
- raise RuntimeError(
- f"use_system_libxgboost was specified but {_lib_name()} is "
- f"not found in {libxgboost_sys.parent}"
- )
-
- logger.info("Using system XGBoost: %s", str(libxgboost_sys))
- return libxgboost_sys
+ sys_prefix = pathlib.Path(sys.prefix)
+ sys_prefix_candidates = [
+ sys_prefix / "lib",
+ # Paths possibly used on Windows
+ sys_prefix / "bin",
+ sys_prefix / "Library",
+ sys_prefix / "Library" / "bin",
+ sys_prefix / "Library" / "lib",
+ ]
+ sys_prefix_candidates = [
+ p.expanduser().resolve() for p in sys_prefix_candidates
+ ]
+ for candidate_dir in sys_prefix_candidates:
+ libtreelite_sys = candidate_dir / _lib_name()
+ if libtreelite_sys.exists():
+ logger.info("Using system XGBoost: %s", str(libtreelite_sys))
+ return libtreelite_sys
+ raise RuntimeError(
+ f"use_system_libxgboost was specified but {_lib_name()} is "
+ f"not found. Paths searched (in order): \n"
+ + "\n".join([f"* {str(p)}" for p in sys_prefix_candidates])
+ )

libxgboost = locate_local_libxgboost(toplevel_dir, logger=logger)
if libxgboost is not None:
diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py
index 0437f3a4..36a92cbc 100644
--- a/python-package/xgboost/libpath.py
+++ b/python-package/xgboost/libpath.py
@@ -31,16 +31,15 @@ def find_lib_path() -> List[str]:
]

if sys.platform == "win32":
- if platform.architecture()[0] == "64bit":
- dll_path.append(os.path.join(curr_path, "../../windows/x64/Release/"))
- # hack for pip installation when copy all parent source
- # directory here
- dll_path.append(os.path.join(curr_path, "./windows/x64/Release/"))
- else:
- dll_path.append(os.path.join(curr_path, "../../windows/Release/"))
- # hack for pip installation when copy all parent source
- # directory here
- dll_path.append(os.path.join(curr_path, "./windows/Release/"))
+ # On Windows, Conda may install libs in different paths
+ dll_path.extend(
+ [
+ os.path.join(sys.prefix, "bin"),
+ os.path.join(sys.prefix, "Library"),
+ os.path.join(sys.prefix, "Library", "bin"),
+ os.path.join(sys.prefix, "Library", "lib"),
+ ]
+ )
dll_path = [os.path.join(p, "xgboost.dll") for p in dll_path]
elif sys.platform.startswith(("linux", "freebsd", "emscripten")):
dll_path = [os.path.join(p, "libxgboost.so") for p in dll_path]
--
2.25.1