Merge pull request #73 from jakirkham-feedstocks/merge_upstream_16

Merge `conda-forge/main` into `rapidsai/main` (pt. 16)
rapidsai · Sep 25, 2024 · d78cce8 · d78cce8
2 parents 16b6b7d + a3b4ae7
commit d78cce8
Show file tree

Hide file tree

Showing 15 changed files with 110 additions and 131 deletions.
diff --git a/...piler_version11python3.8.____cpython.yaml → ...piler_version11python3.9.____cpython.yaml b/...piler_version11python3.8.____cpython.yaml → ...piler_version11python3.9.____cpython.yaml
@@ -34,7 +34,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...piler_version12python3.8.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml b/...piler_version12python3.8.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
@@ -34,7 +34,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...piler_version11python3.8.____cpython.yaml → ...piler_version11python3.9.____cpython.yaml b/...piler_version11python3.8.____cpython.yaml → ...piler_version11python3.9.____cpython.yaml
@@ -38,7 +38,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...piler_version12python3.8.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml b/...piler_version12python3.8.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
@@ -38,7 +38,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml
diff --git a/...support/osx_64_python3.8.____cpython.yaml → ...support/osx_64_python3.9.____cpython.yaml b/...support/osx_64_python3.8.____cpython.yaml → ...support/osx_64_python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,9 +21,9 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 llvm_openmp:
-- '16'
+- '17'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -34,7 +34,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...port/osx_arm64_python3.8.____cpython.yaml → ...port/osx_arm64_python3.9.____cpython.yaml b/...port/osx_arm64_python3.8.____cpython.yaml → ...port/osx_arm64_python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,9 +21,9 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 llvm_openmp:
-- '16'
+- '17'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:
@@ -34,7 +34,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...ler_version12.0python3.8.____cpython.yaml → ...ler_version12.0python3.9.____cpython.yaml b/...ler_version12.0python3.8.____cpython.yaml → ...ler_version12.0python3.9.____cpython.yaml
@@ -21,7 +21,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.8.* *_cpython
+- 3.9.* *_cpython
 target_platform:
 - win-64
 zip_keys:

diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -23,35 +23,35 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython
+          - CONFIG: linux_64_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_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython
+          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython
+          - 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.8.____cpython
+          - CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: osx_64_python3.8.____cpython
+          - CONFIG: osx_64_python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: macos
             runs_on: ['macos-13']
-          - CONFIG: osx_arm64_python3.8.____cpython
+          - CONFIG: osx_arm64_python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: macos
             runs_on: ['macos-13']
-          - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython
+          - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: windows
             runs_on: ['windows-latest']

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,7 +1,7 @@
 {% set name = "xgboost" %}
 {% set version = "2.1.1" %}
-{% set build_number = 4 %}
-{% set min_python = "3.8" %}
+{% set build_number = 5 %}
+{% set min_python = "3.9" %}
 
 {% set string_prefix = "rapidsai" %}
 
@@ -15,6 +15,8 @@ source:
   patches:
     # xgboost patches
     - patches/0001-Enable-latest-libcxx-on-MacOS.patch  # [osx]
+    - patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch
+    - patches/0003-Use-correct-platform-tag-from-Pip.patch
 
 build:
   number: {{ build_number }}
@@ -113,6 +115,7 @@ outputs:
         - libxgboost =*={{ string_prefix }}_h*_{{ PKG_BUILDNUM }}
         - python >={{ min_python }}
         - hatchling >=1.12.1
+        - packaging >=21.3
         - pip
       run:
         - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }}
@@ -124,8 +127,11 @@ outputs:
     test:
       requires:
         - python
+        - pip
       imports:
         - xgboost
+      commands:
+        - pip check
       script: test-py-xgboost.py
 
   - name: xgboost

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 b38f9983fd5edfef8c6604c42779f33f897b1a46 Mon Sep 17 00:00:00 2001
+From: Hyunsu Cho <phcho@nvidia.com>
+Date: Tue, 27 Aug 2024 14:24:42 -0700
+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 05bbe998c..a470bb21f 100644
+--- a/python-package/pyproject.toml
++++ b/python-package/pyproject.toml
+@@ -30,7 +30,6 @@ classifiers = [
+ dependencies = [
+     "numpy",
+     "scipy",
+-    "nvidia-nccl-cu12 ; platform_system == 'Linux' and platform_machine != 'aarch64'"
+ ]
+
+ [project.urls]
+-- 
+2.34.1
+