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

Update 2.0.0 #59

Merged
merged 4 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions config/build-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
recipes:
- name : xgboost-1.7
path : xgboost-1.7/recipe
- name : xgboost-2.0
path : xgboost-2.0/recipe

6 changes: 0 additions & 6 deletions config/conda_build_config.yaml

This file was deleted.

This file was deleted.

40 changes: 0 additions & 40 deletions xgboost-1.7/recipe/0004-Use-central-cuda-capabilities.patch

This file was deleted.

26 changes: 26 additions & 0 deletions xgboost-2.0/recipe/0001-Use-central-cuda-capabilities.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From f93655fdf7ea1bc125c6e943399c7ee7ecbb5d3c Mon Sep 17 00:00:00 2001
From: Aman-Surkar <aman_surkar@persistent.com>
Date: Mon, 8 Jan 2024 12:59:09 +0000
Subject: [PATCH] Use-central-cuda-capabilities

---
cmake/Utils.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index 08050205c..700bf86b0 100644
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -91,7 +91,8 @@ function(format_gencode_flags flags out)
# Set up architecture flags
if(NOT flags)
if (CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
- set(flags "50;60;70;80;90")
+ string(REPLACE "," ";" tmpflags "$ENV{cuda_levels}")
+ string(REPLACE "." "" flags "${tmpflags}")
elseif (CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
set(flags "50;60;70;80")
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
--
2.40.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From fe9487352675c8b0be26f30be9e9e2af0c103fab Mon Sep 17 00:00:00 2001
From: Aman-Surkar <aman_surkar@persistent.com>
Date: Mon, 8 Jan 2024 13:00:50 +0000
Subject: [PATCH] conda-Unbundle-libxgboost.-dll-dylib-so

---
python-package/xgboost/libpath.py | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py
index 58c78df09..bb682b929 100644
--- a/python-package/xgboost/libpath.py
+++ b/python-package/xgboost/libpath.py
@@ -31,6 +31,10 @@ def find_lib_path() -> List[str]:
]

if sys.platform == "win32":
+ dll_path = [os.path.join(sys.prefix, 'Library', 'mingw-w64', 'bin')]
+ else:
+ dll_path = [os.path.join(sys.prefix, 'lib')]
+ if sys.platform == 'win32':
# On Windows, Conda may install libs in different paths
dll_path.extend(
[
--
2.40.1

Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,10 @@
. activate "${PREFIX}"

pushd ${SRC_DIR}/python-package
${PYTHON} setup.py install --single-version-externally-managed --record=record.txt
if [[ $build_type == "cuda" ]]
then
${PYTHON} -m pip install -v . --no-deps --ignore-installed --config-settings use_cuda=True --config-settings use_nccl=True
else
${PYTHON} -m pip install -v . --no-deps --ignore-installed
fi
popd
4 changes: 2 additions & 2 deletions xgboost-1.7/recipe/meta.yaml → xgboost-2.0/recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builds the CPU and CUDA variants of libxgboost and xgboost packages
{% set version = "1.7.6" %}
{% set version = "2.0.3" %}
{% set build_ext_version = version %}
{% set proc_build_number = "1" %}

Expand All @@ -16,7 +16,7 @@ source:
# xgboost patches
- 0001-conda-Unbundle-libxgboost.-dll-dylib-so.patch
- 0002-Fix-R-package-PKGROOT.patch
- 0004-Use-central-cuda-capabilities.patch #[build_type == 'cuda']
- 0001-Use-central-cuda-capabilities.patch #[build_type == 'cuda']

build:
number: 1
Expand Down
Loading