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.

Sign up for GitHub

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

Jump to bottom

Merge conda-forge/main into rapidsai/main (pt. 16) #73

Merged
merged 6 commits into from
Sep 25, 2024
Merged

Merge conda-forge/main into rapidsai/main (pt. 16) #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de61948
Fix `pip check` for py-xgboost (#191)
hcho3 Aug 28, 2024
e27cee8
Bump `min_python` to `3.9`
jakirkham Sep 25, 2024
081f342
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and co…
Sep 25, 2024
3f80746
Bump `build_number` to `3`
jakirkham Sep 25, 2024
5902bbc
MNT: rerender (#193)
github-actions[bot] Sep 25, 2024
a3b4ae7
Merge conda-forge/main into rapidsai/main
jakirkham Sep 25, 2024
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
2 changes: 1 addition & 1 deletion ...piler_version11python3.8.____cpython.yaml → ...piler_version11python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...piler_version12python3.8.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...piler_version11python3.8.____cpython.yaml → ...piler_version11python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...piler_version12python3.8.____cpython.yaml → ...piler_version12python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
106 changes: 0 additions & 106 deletions .ci_support/migrations/cuda120.yaml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...support/osx_64_python3.8.____cpython.yaml → ...support/osx_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions ...port/osx_arm64_python3.8.____cpython.yaml → ...port/osx_arm64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...ler_version12.0python3.8.____cpython.yaml → ...ler_version12.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/conda-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 2 additions & 0 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}

Expand All @@ -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 }}
Expand Down Expand Up @@ -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') }}
Expand All @@ -124,8 +127,11 @@ outputs:
test:
requires:
- python
- pip
imports:
- xgboost
commands:
- pip check
script: test-py-xgboost.py

- name: xgboost
Expand Down
24 changes: 24 additions & 0 deletions recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Loading
Loading