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.

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

Merge conda-forge/main into rapidsai/main (pt. 10) #54

Merged
merged 13 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
16 changes: 16 additions & 0 deletions .ci_support/migrations/cuda120.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,25 @@ __migrator:
- quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]

# case: CUDA 11.2
- quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
# case: native compilation (build == target)
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
# case: cross-compilation (build != target)
- quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]

# case: CUDA 11.8
- quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
# case: native compilation (build == target)
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
# case: cross-compilation (build != target)
- quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]

# case: non-CUDA builds
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
cuda_compiler_version:
Expand All @@ -51,6 +63,7 @@ __migrator:
- 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
commit_message: |
Rebuild for CUDA 12 w/arch + Windows support
Expand All @@ -77,6 +90,9 @@ cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "F
fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

c_stdlib_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

Expand Down
56 changes: 28 additions & 28 deletions .ci_support/migrations/python312.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
migrator_ts: 1695046563
__migrator:
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 30
max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 30
max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false

python:
- 3.12.* *_cpython
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@ jobs:
os: ubuntu
runs_on: ['ubuntu-latest']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0
UPLOAD_PACKAGES: True
os: windows
runs_on: ['windows-latest']
- CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8
UPLOAD_PACKAGES: True
os: windows
runs_on: ['windows-latest']
- CONFIG: osx_64_
UPLOAD_PACKAGES: True
os: macos
Expand All @@ -59,6 +51,14 @@ jobs:
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-latest']
- CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0
UPLOAD_PACKAGES: True
os: windows
runs_on: ['windows-latest']
- CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8
UPLOAD_PACKAGES: True
os: windows
runs_on: ['windows-latest']
steps:

- name: Manage disk space
Expand All @@ -82,11 +82,10 @@ jobs:
microsoft-edge-stable
sudo apt-get autoremove -y >& /dev/null
sudo apt-get autoclean -y >& /dev/null
sudo docker image prune --all --force
df -h

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build on Linux
if: matrix.os == 'ubuntu'
Expand Down
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

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

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

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

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

5 changes: 3 additions & 2 deletions build-locally.py

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

6 changes: 5 additions & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ github_actions:
artifact_retention_days: 7
free_disk_space: true
upload_packages: true
os_version:
linux_64: cos7
linux_aarch64: cos7
linux_ppc64le: cos7
provider:
linux: github_actions
linux_aarch64: github_actions
osx: github_actions
win: github_actions
test_on_native_only: true
test: native_and_emulated
upload_on_branch: main
7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "xgboost" %}
{% set version = "2.0.3" %}
{% set build_number = 2 %}
{% set build_number = 3 %}

package:
name: xgboost-split
Expand All @@ -27,8 +27,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"]
- git # [not win]
- m2-git # [win]
- sysroot_{{ target_platform }} 2.17 # [linux]
- cmake
- llvm-openmp # [osx]
- libgomp # [linux]
Expand Down Expand Up @@ -56,6 +55,7 @@ outputs:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} # [cuda_compiler != "None"]
- sysroot_{{ target_platform }} 2.17 # [linux]
- git
- cmake
- make
Expand Down Expand Up @@ -137,6 +137,7 @@ outputs:
- {{ compiler('m2w64_cxx') }} # [win]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- sysroot_{{ target_platform }} 2.17 # [linux]
- llvm-openmp # [osx]
- libgomp # [linux]
- git
Expand Down
Loading