diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index 45aa22c8..2d81ece1 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_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/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml similarity index 89% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml index 4460aff7..3cf7505f 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_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/.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 80e87954..03737a80 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 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/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml similarity index 83% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml index 32ee4333..2f56753e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_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 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/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.6python3.9.____cpython.yaml similarity index 98% rename from .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml rename to .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.6python3.9.____cpython.yaml index bb05c3c8..7c70b6af 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_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 index 4e2d7b7d..bf0f904e 100644 --- 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 index 97cb86a1..8b83147e 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,8 +6,9 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} -MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" ( startgroup "Provisioning base env with micromamba" ) 2> /dev/null MICROMAMBA_VERSION="1.5.10-0" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 58f5e5db..9bd6281b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -36,6 +36,7 @@ if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% del /S /Q "%MAMBA_ROOT_PREFIX%" >nul del /S /Q "%MICROMAMBA_TMPDIR%" >nul +call :end_group call :start_group "Configuring conda" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d12bc4a4..f8f7cafa 100644 --- 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 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.