From 0cd682cc56d8b5c44b157571fe9587028c0c94a1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:43:27 -0600 Subject: [PATCH] xgboost v2.1.3 (#203) * updated v2.1.3 * MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.8, and conda-forge-pinning 2024.11.26.23.29.58 * Readd NCCL wheel removal patch * Refresh NCCL removal patch for XGBoost 2.1.3 * Refresh Patch no. 3 * Formating fix --------- Co-authored-by: jakirkham Co-authored-by: Hyunsu Cho --- ...mpiler_version11python3.9.____cpython.yaml | 4 ---- ...mpiler_version12python3.9.____cpython.yaml | 4 ---- ...mpiler_version13python3.9.____cpython.yaml | 4 ---- recipe/meta.yaml | 13 +++++----- ...nvidia-nccl-cu12-from-pyproject.toml.patch | 24 +++++++++++++++++++ ...k-wheels-as-any-platform-compatible.patch} | 2 +- 6 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch rename recipe/patches/{0002-Mark-wheels-as-any-platform-compatible.patch => 0003-Mark-wheels-as-any-platform-compatible.patch} (96%) diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index 6dc5c041..91bebb69 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu ace: - 8.0.1 c_compiler: @@ -10,8 +8,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml index 7f75823a..024038bb 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu ace: - 8.0.1 c_compiler: @@ -10,8 +8,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 563017a9..cf4a4644 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu ace: - 8.0.1 c_compiler: @@ -10,8 +8,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 405ffc0b..fb85e3c2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "xgboost" %} -{% set version = "2.1.2" %} -{% set build_number = 2 %} +{% set version = "2.1.3" %} +{% set build_number = 0 %} {% set min_python = "3.9" %} {% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if (cuda_compiler_version or "None") != "None" else "cpu" %} @@ -11,11 +11,12 @@ package: source: url: https://github.com/dmlc/xgboost/releases/download/v{{ version }}/xgboost-{{ version }}.tar.gz - sha256: a84fc7d9846c24659a2ad16788a7eefa9640b19eea9bbc65f30e0a9d53c52453 + sha256: 90b1b7b770803299b337dd9b9206760d9c16f418403c77acce74b350c6427667 patches: # xgboost patches - - patches/0001-Enable-latest-libcxx-on-MacOS.patch # [osx] - - patches/0002-Mark-wheels-as-any-platform-compatible.patch + - patches/0001-Enable-latest-libcxx-on-MacOS.patch # [osx] + - patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch + - patches/0003-Mark-wheels-as-any-platform-compatible.patch build: number: {{ build_number }} @@ -108,7 +109,7 @@ outputs: - PIP_CACHE_DIR=pip_cache - PIP_NO_INDEX=True requirements: - build: # [build_platform != target_platform] + build: # [build_platform != target_platform] - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] host: diff --git a/recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch b/recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch new file mode 100644 index 00000000..a4568f9a --- /dev/null +++ b/recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch @@ -0,0 +1,24 @@ +From e2c4aa25cf84ad7db68748ca7d0c8275e5dcef91 Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Wed, 27 Nov 2024 00:51:35 -0800 +Subject: [PATCH] Remove nvidia-nccl-cu12 from pyproject.toml + +--- + python-package/pyproject.toml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/python-package/pyproject.toml b/python-package/pyproject.toml +index e6cfde49d..0201c8dea 100644 +--- a/python-package/pyproject.toml ++++ b/python-package/pyproject.toml +@@ -31,7 +31,6 @@ classifiers = [ + dependencies = [ + "numpy", + "scipy", +- "nvidia-nccl-cu12 ; platform_system == 'Linux' and platform_machine != 'aarch64'", + ] + + [project.urls] +-- +2.47.0 + diff --git a/recipe/patches/0002-Mark-wheels-as-any-platform-compatible.patch b/recipe/patches/0003-Mark-wheels-as-any-platform-compatible.patch similarity index 96% rename from recipe/patches/0002-Mark-wheels-as-any-platform-compatible.patch rename to recipe/patches/0003-Mark-wheels-as-any-platform-compatible.patch index 6e983f8c..c778d1d0 100644 --- a/recipe/patches/0002-Mark-wheels-as-any-platform-compatible.patch +++ b/recipe/patches/0003-Mark-wheels-as-any-platform-compatible.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Mark wheels as any platform compatible 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python-package/hatch_build.py b/python-package/hatch_build.py -index 925c917..710530c 100644 +index d81a21cd5..710530ce4 100644 --- a/python-package/hatch_build.py +++ b/python-package/hatch_build.py @@ -6,13 +6,11 @@ Here, we customize the tag of the generated wheels.