diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6fbb6c17..9c030f25 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,39 +11,39 @@ jobs: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython: CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython: - 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 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython: CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython: CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - : 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 + ? linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython: CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython: CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - : CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 + ? linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12python3.9.____cpython + : CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython: CONFIG: linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 0b2b8043..4b472569 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,8 +11,8 @@ jobs: win_64_cuda_compilerNonecuda_compiler_versionNonepython3.9.____cpython: CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNonepython3.9.____cpython UPLOAD_PACKAGES: 'True' - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython: - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython + win_64_cuda_compilercuda-nvcccuda_compiler_version12.6python3.9.____cpython: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.6python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: 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 c2daff9c..84e460fc 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 @@ -23,7 +23,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 nccl: - '2' pin_run_as_build: @@ -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 eee7b5fd..3d1025cb 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 @@ -17,13 +17,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 nccl: - '2' pin_run_as_build: @@ -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_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index ea451aa3..b17b7cef 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:cos7 nccl: - '2' pin_run_as_build: @@ -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 4e7b4d4e..6dc5c041 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 @@ -27,7 +27,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 nccl: - '2' pin_run_as_build: @@ -46,7 +46,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 89% 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 81d4f862..7f75823a 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 @@ -21,13 +21,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 nccl: - '2' pin_run_as_build: @@ -46,7 +46,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_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 715f42ec..563017a9 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -27,7 +27,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:cos7 nccl: - '2' pin_run_as_build: @@ -46,7 +46,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_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index ba695050..9002ca43 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -23,7 +23,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 nccl: - '2' pin_run_as_build: @@ -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_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12python3.9.____cpython.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12python3.9.____cpython.yaml index 290bb05a..4eb48cf2 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12python3.9.____cpython.yaml @@ -17,13 +17,13 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.0' +- '12.4' 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 nccl: - '2' pin_run_as_build: @@ -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_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 99e08a19..958f3328 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:cos7 nccl: - '2' pin_run_as_build: @@ -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/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 97% 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 1c31313e..bcfe6b00 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 @@ -11,7 +11,7 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.0' +- '12.6' cxx_compiler: - vs2019 m2w64_c_compiler: diff --git a/README.md b/README.md index 32297f59..5becfb0c 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,10 @@ Current build status - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython - variant + variant @@ -69,10 +69,10 @@ Current build status - linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython - variant + variant @@ -90,10 +90,10 @@ Current build status - linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12python3.9.____cpython - variant + variant @@ -125,10 +125,10 @@ Current build status - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.9.____cpython + win_64_cuda_compilercuda-nvcccuda_compiler_version12.6python3.9.____cpython - variant + variant diff --git a/recipe/meta.yaml b/recipe/meta.yaml index abc3264a..405ffc0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "xgboost" %} {% set version = "2.1.2" %} -{% set build_number = 1 %} +{% set build_number = 2 %} {% set min_python = "3.9" %} {% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if (cuda_compiler_version or "None") != "None" else "cpu" %} @@ -54,7 +54,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"] missing_dso_whitelist: # Conda-build raises the missing `R.dll` linkage erroneously. # xref: https://github.com/conda/conda-build/pull/4786 @@ -74,12 +74,12 @@ outputs: - llvm-openmp # [osx] - libgomp # [linux] host: - - nccl # [linux and cuda_compiler != "None"] + - cuda-version {{ cuda_compiler_version }} # [cuda_compiler != "None"] + - nccl # [linux and cuda_compiler != "None"] run: - - __cuda # [cuda_compiler != "None"] - {% if (cuda_compiler_version or "").startswith("11") %} - - cuda-version >=11.2,<12 - {% endif %} + - __cuda # [cuda_compiler != "None"] + - cuda-version >=11.2,<12.0a0 # [(cuda_compiler_version or "").startswith("11")] + - cuda-version >=12.0,<13.0a0 # [(cuda_compiler_version or "").startswith("12")] test: commands: - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix]