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

MNT: rerender #158

Merged
merged 8 commits into from
Mar 22, 2024
+77 −51
Merged

MNT: rerender #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4db82c
dummy commit for rerendering
conda-forge-webservices[bot] Mar 21, 2024
b84b6aa
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and co…
Mar 21, 2024
2e08554
Set `build_number` to `2`
jakirkham Mar 21, 2024
39580a7
Update `cuda120.yaml`
jakirkham Mar 21, 2024
b72c779
Update `python312.yaml`
jakirkham Mar 21, 2024
9feb4c0
Pin `sysroot` to `2.17` on Linux
jakirkham Mar 22, 2024
75f6881
Use CentOS 7 on all Linuxes
jakirkham Mar 22, 2024
e32717a
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and co…
Mar 22, 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
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
4 changes: 2 additions & 2 deletions ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c_compiler:
c_compiler_version:
- '12'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -41,7 +41,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
2 changes: 1 addition & 1 deletion ...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 3 additions & 3 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.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.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.

4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop

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
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ conda_solver: libmamba
github:
branch_name: main
tooling_branch_name: main
os_version:
linux_64: cos7
linux_aarch64: cos7
linux_ppc64le: cos7
provider:
linux_aarch64: default
linux_ppc64le: default
Expand Down
5 changes: 4 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
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 = 1 %}
{% set build_number = 2 %}

{% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) %} # [cuda_compiler_version != "None"]
{% set string_prefix = "cpu" %} # [cuda_compiler_version == "None"]
Expand Down Expand Up @@ -30,6 +30,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"]
- sysroot_{{ target_platform }} 2.17 # [linux]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinned to sysroot to address issue: conda-forge/conda-forge-pinning-feedstock#5643

This will eventually be resolved upstream: conda-forge/linux-sysroot-feedstock#58

Though this workaround should be ok in any event

- cmake
- llvm-openmp # [osx]
- libgomp # [linux]
Expand All @@ -55,6 +56,7 @@ outputs:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} # [cuda_compiler != "None"]
- sysroot_{{ target_platform }} 2.17 # [linux]
- git
- cmake
- make
Expand Down Expand Up @@ -165,6 +167,7 @@ outputs:
- {{ compiler('m2w64_cxx') }} # [win]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- sysroot_{{ target_platform }} 2.17 # [linux]
- llvm-openmp # [osx]
- libgomp # [linux]
- git
Expand Down