Merge branch 'main' into rapids-24.10

recipe/install-r-xgboost.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
 pushd ${SRC_DIR}/R-package
-  # Remove src/Makevars.win because it says:
-  # This file is only used for windows compilation from github
-  # It will be replaced with Makevars.in for the CRAN version
-  # rm src/Makevars.win
-  ${R} CMD INSTALL --preclean --build . --configure-args="CXXFLAGS=-D_LIBCPP_DISABLE_AVAILABILITY" ${R_ARGS}
+  ${R} CMD INSTALL --preclean --build . ${R_ARGS}
 popd

recipe/meta.yaml

@@ -1,21 +1,20 @@
 {% set name = "xgboost" %}
-{% set version = "2.1.0" %}
+{% set version = "2.1.1" %}
 {% set build_number = 2 %}
 {% set min_python = "3.8" %}
 
+{% set string_prefix = "rapidsai" %}
+
 package:
   name: xgboost-split
   version: {{ version }}
 
 source:
   url: https://github.com/dmlc/xgboost/releases/download/v{{ version }}/xgboost-{{ version }}.tar.gz
-  sha256: 28bec8e821b1fefcea722d96add66024adba399063f723bc5c815f7af4a5f5e4
+  sha256: a47ca87f3345d2a866cd7ec40933564aa2b7250592d0e9bf613951630fc1fa6f
   patches:
     # xgboost patches
-    - patches/0001-Force-endian-flag-in-cross-compilation-mode.patch  # [arm64 or aarch64 or ppc64le]
-    - patches/0002-Enable-latest-libcxx-on-MacOS.patch  # [osx]
-    - patches/0003-Use-mingw-w64-path.patch
-    - patches/0004-Backport-fixes.patch
+    - patches/0001-Enable-latest-libcxx-on-MacOS.patch  # [osx]
 
 build:
   number: {{ build_number }}
@@ -26,11 +25,8 @@ build:
   # Windows CUDA 11.8 fails due to a compilation error
   # xref: https://github.com/conda-forge/xgboost-feedstock/issues/173
   {% if python is defined and cuda_compiler_version is defined %}
-  skip: {{ (
-      ((linux or win) and cuda_compiler_version == "None") or
-      python.split(".")[:2] != min_python.split(".")[:2] or
-      (win and cuda_compiler_version == "11.8")
-  ) }}
+  skip: >-
+    {{ ((linux or win) and cuda_compiler_version == "None") or python.split(".")[:2] != min_python.split(".")[:2] or (win and cuda_compiler_version == "11.8") }}
   {% endif %}
 
 requirements:
@@ -55,8 +51,8 @@ outputs:
     script: install-libxgboost.sh  # [not win]
     script: install-win-wrapper.bat  # [win]
     build:
-      activate_in_script: True
-      string: rapidsai_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
+      activate_in_script: true
+      string: {{ string_prefix }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
       ignore_run_exports_from:
         - {{ compiler('cuda') }}  # [(cuda_compiler_version or "").startswith("11")]
         - librmm                  # [linux and cuda_compiler != "None"]
@@ -97,7 +93,7 @@ outputs:
     script: install-win-wrapper.bat  # [win]
     build:
       noarch: python
-      string: rapidsai_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
+      string: {{ string_prefix }}_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
       force_use_keys:
         - librmm                  # [linux and cuda_compiler != "None"]
       script_env:
@@ -114,13 +110,13 @@ outputs:
         - cross-python_{{ target_platform }}  # [build_platform != target_platform]
       host:
         - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }}
-        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
+        - libxgboost =*={{ string_prefix }}_h*_{{ PKG_BUILDNUM }}
         - python >={{ min_python }}
         - hatchling >=1.12.1
         - pip
       run:
         - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }}
-        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
+        - libxgboost =*={{ string_prefix }}_h*_{{ PKG_BUILDNUM }}
         - python >={{ min_python }}
         - numpy
         - scipy
@@ -134,17 +130,18 @@ outputs:
 
   - name: xgboost
     build:
-      string: rapidsai_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
+      string: {{ string_prefix }}_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
       force_use_keys:
         - librmm                  # [linux and cuda_compiler != "None"]
     requirements:
       host:
         - python >={{ min_python }}
         - {{ pin_subpackage('py-xgboost', max_pin="x.x.x.x.x.x") }}
+        - py-xgboost =*={{ string_prefix }}_pyh*_{{ PKG_BUILDNUM }}
       run:
         - python >={{ min_python }}
         - {{ pin_subpackage('py-xgboost', max_pin="x.x.x.x.x.x") }}
-        - py-xgboost =*=rapidsai_pyh*_{{ PKG_BUILDNUM }}
+        - py-xgboost =*={{ string_prefix }}_pyh*_{{ PKG_BUILDNUM }}
     test:
       requires:
         - python
@@ -155,8 +152,8 @@ outputs:
     script: install-r-xgboost.sh  # [not win]
     script: install-r-xgboost.bat  # [win]
     build:
-      skip: True  # [r_base in ("4.1", "4.2") or win]
-      string: rapidsai_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
+      skip: true  # [r_base in ("4.1", "4.2") or win]
+      string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
       rpaths:
         - lib/R/lib
       force_use_keys:
@@ -188,7 +185,7 @@ outputs:
         - r-knitr                      # [build_platform != target_platform]
       host:
         - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }}
-        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
+        - libxgboost =*={{ string_prefix }}_h*_{{ PKG_BUILDNUM }}
         - r-base
         - r-matrix
         - r-data.table
@@ -197,7 +194,7 @@ outputs:
         - r-knitr
       run:
         - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }}
-        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
+        - libxgboost =*={{ string_prefix }}_h*_{{ PKG_BUILDNUM }}
         - r-base
         - r-matrix
         - r-data.table