Merge pull request #76 from jakirkham-feedstocks/merge_upstream_18

Merge `conda-forge/main` into `rapidsai/main` (pt. 18)
rapidsai · Dec 3, 2024 · ac99b87 · ac99b87
2 parents ef6f3af + 964da99
commit ac99b87
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 40 deletions.
diff --git a/...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.8
+- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
 librmm:
 - '25.02'
 nccl:
@@ -42,7 +42,6 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - c_stdlib_version
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml b/...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
@@ -15,13 +15,13 @@ channel_targets:
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.0'
+- '12.6'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 librmm:
 - '25.02'
 nccl:
@@ -42,7 +42,6 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - c_stdlib_version
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml
@@ -1,5 +1,3 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
 c_compiler:
 - gcc
 c_compiler_version:
@@ -8,8 +6,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_arch:
-- aarch64
 cdt_name:
 - conda
 channel_sources:
@@ -25,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '11'
 docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.8
+- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
 librmm:
 - '25.02'
 nccl:
@@ -46,7 +42,6 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - c_stdlib_version
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml b/...piler_version12python3.9.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
@@ -1,5 +1,3 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
 c_compiler:
 - gcc
 c_compiler_version:
@@ -8,8 +6,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_arch:
-- aarch64
 cdt_name:
 - conda
 channel_sources:
@@ -19,13 +15,13 @@ channel_targets:
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.0'
+- '12.6'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:cos7
 librmm:
 - '25.02'
 nccl:
@@ -46,7 +42,6 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-  - c_stdlib_version
   - cuda_compiler
   - cuda_compiler_version
   - docker_image
diff --git a/...ler_version12.0python3.9.____cpython.yaml → ...ler_version12.6python3.9.____cpython.yaml b/...ler_version12.0python3.9.____cpython.yaml → ...ler_version12.6python3.9.____cpython.yaml
@@ -9,7 +9,7 @@ channel_targets:
 cuda_compiler:
 - cuda-nvcc
 cuda_compiler_version:
-- '12.0'
+- '12.6'
 cxx_compiler:
 - vs2019
 m2w64_c_compiler:

diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -27,22 +27,22 @@ jobs:
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
-          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7
+          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7
           - CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
-          - CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
+          - CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7
           - CONFIG: osx_64_python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: macos
@@ -51,7 +51,7 @@ jobs:
             UPLOAD_PACKAGES: True
             os: macos
             runs_on: ['macos-13']
-          - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython
+          - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.6python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: windows
             runs_on: ['windows-latest']

diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "xgboost" %}
-{% set version = "2.1.2" %}
+{% set version = "2.1.3" %}
 {% set build_number = 0 %}
 {% set min_python = "3.9" %}
 
@@ -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 }}
@@ -55,7 +56,7 @@ outputs:
       activate_in_script: true
       string: {{ string_prefix }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
       ignore_run_exports_from:
-        - {{ compiler('cuda') }}  # [(cuda_compiler_version or "").startswith("11")]
+        - {{ compiler('cuda') }}  # [cuda_compiler != "None"]
         - librmm                  # [linux and cuda_compiler != "None"]
       missing_dso_whitelist:
         # Conda-build raises the missing `R.dll` linkage erroneously.
@@ -76,12 +77,12 @@ outputs:
         - llvm-openmp  # [osx]
         - libgomp      # [linux]
       host:
-        - nccl         # [linux and cuda_compiler != "None"]
-        - librmm       # [linux and cuda_compiler != "None"]
+        - cuda-version {{ cuda_compiler_version }}       # [cuda_compiler != "None"]
+        - nccl                                           # [linux and cuda_compiler != "None"]
+        - librmm                                         # [linux and cuda_compiler != "None"]
       run:
-        {% if (cuda_compiler_version or "").startswith("11") %}
-        - cuda-version >=11.2,<12
-        {% endif %}
+        - cuda-version >=11.2,<12.0a0                    # [(cuda_compiler_version or "").startswith("11")]
+        - cuda-version >=12.0,<13.0a0                    # [(cuda_compiler_version or "").startswith("12")]
       run_constrained:
         - {{ pin_compatible('librmm', max_pin='x.x') }}  # [linux and cuda_compiler != "None"]
     test:
@@ -106,7 +107,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
@@ -0,0 +1,24 @@
+From e2c4aa25cf84ad7db68748ca7d0c8275e5dcef91 Mon Sep 17 00:00:00 2001
+From: Hyunsu Cho <[email protected]>
+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/...k-wheels-as-any-platform-compatible.patch → ...k-wheels-as-any-platform-compatible.patch b/...k-wheels-as-any-platform-compatible.patch → ...k-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.