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 3 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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
From 674b1e1eafd3ddbcabbd990d7da3c82eb539d851 Mon Sep 17 00:00:00 2001
From: Deepali Chourasia <deepch23@in.ibm.com>
Date: Tue, 8 Nov 2022 07:44:57 +0000
Subject: [PATCH] use centralized cuda capabilities
From 77cda4dbda989789a7bd8b3b568ac5130faca69e Mon Sep 17 00:00:00 2001
From: Aman-Surkar <aman_surkar@persistent.com>
Date: Wed, 4 Oct 2023 05:30:22 +0000
Subject: [PATCH] Use central cuda capabilities

---
cmake/Utils.cmake | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
cmake/Utils.cmake | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index f28c1f27..f0b6f1b2 100644
index 08050205..4ea974d7 100644
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -90,8 +90,13 @@ function(format_gencode_flags flags out)
endif()
# Set up architecture flags
@@ -92,6 +92,13 @@ function(format_gencode_flags flags out)
if(NOT flags)
- if (CUDA_VERSION VERSION_GREATER_EQUAL "11.1")
- set(flags "50;60;70;80")
+ if (CUDA_VERSION VERSION_GREATER_EQUAL "11.4")
if (CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
set(flags "50;60;70;80;90")
+ elseif (CUDA_VERSION VERSION_GREATER_EQUAL "11.4")
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add change to use $ENV{cuda_levels} in the cuda 11.8 block.

Copy link
Contributor

Choose a reason for hiding this comment

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

You may update this in a follow up PR

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Update the patch.

+ string(REPLACE "," ";" tmpflags "$ENV{cuda_levels}")
+ string(REPLACE "." "" flags "${tmpflags}")
+ elseif (CUDA_VERSION VERSION_GREATER_EQUAL "11.1")
Expand All @@ -27,7 +25,7 @@ index f28c1f27..f0b6f1b2 100644
elseif (CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
set(flags "50;60;70;80")
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "10.0")
@@ -101,6 +106,7 @@ function(format_gencode_flags flags out)
@@ -101,6 +108,7 @@ function(format_gencode_flags flags out)
else()
set(flags "35;50;60")
endif()
Expand All @@ -36,5 +34,5 @@ index f28c1f27..f0b6f1b2 100644

if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.18")
--
2.34.1
2.40.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From dcd417d2eea224efcaab4256dff5f94f230f6076 Mon Sep 17 00:00:00 2001
From: Aman-Surkar <aman_surkar@persistent.com>
Date: Wed, 4 Oct 2023 05:54:14 +0000
Subject: [PATCH] conda Unbundle libxgboost.-dll-dylib-so

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

diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py
index 0437f3a4..b4fb2918 100644
--- a/python-package/xgboost/libpath.py
+++ b/python-package/xgboost/libpath.py
@@ -1,3 +1,4 @@
+
# coding: utf-8
"""Find the path to xgboost dynamic library files."""

@@ -31,6 +32,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':
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
--
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.0" %}
{% 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