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

Rebuild for r-base 4.4 and UCRT mingw toolchain #177

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
+130 −27
Open

Rebuild for r-base 4.4 and UCRT mingw toolchain #177

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e119024
Rebuild for r-base 4.4 and UCRT mingw toolchain
regro-cf-autotick-bot Jul 27, 2024
fc4f7b7
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
regro-cf-autotick-bot Jul 27, 2024
8dd5658
Readd Windows on R
jakirkham Jul 27, 2024
2cf77d3
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
Jul 27, 2024
040e4f1
Merge conda-forge/main into regro-cf-autotick-bot/rebuild-r-base44_an…
jakirkham Jul 31, 2024
df347ad
Merge conda-forge/main into regro-cf-autotick-bot/rebuild-r-base44_an…
jakirkham Jul 31, 2024
f445a42
Drop `posix` from `r-xgboost` on Windows
jakirkham Jul 31, 2024
6571c3e
Add `{{ stdlib('m2w64_c') }}` on Windows
jakirkham Jul 31, 2024
41a0a5a
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
Jul 31, 2024
2ac39ff
Use `m2-bash` in `r-xgboost` Windows build
jakirkham Jul 31, 2024
663dc93
Just use MinGW-w64 in `r-xgboost` Windows
jakirkham Jul 31, 2024
4ccf854
Try MinGW Fortran for Windows OpenMP search
jakirkham Jul 31, 2024
cbef2fe
Add `{{ compiler('m2w64_fortran') }}` to top-level
jakirkham Jul 31, 2024
c9df956
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
Jul 31, 2024
fdf1c7b
Slightly reorder top-level requirements
jakirkham Jul 31, 2024
dbef2b8
Merge conda-forge/main into regro-cf-autotick-bot/rebuild-r-base44_an…
jakirkham Aug 3, 2024
8603bd7
Merge conda-forge/main into regro-cf-autotick-bot/rebuild-r-base44_an…
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
1 change: 1 addition & 0 deletions ...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...uda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...uda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...uda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...uda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions ...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
50 changes: 50 additions & 0 deletions .ci_support/migrations/r-base44_and_m2w64-ucrt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
migrator_ts: 1718391654
__migrator:
kind: version
migration_number: 1
bump_number: 1
commit_message: "Rebuild for r-base 4.4 and UCRT mingw toolchain"
primary_key: r_base
automerge: True
longterm: True
include_noarch: True
pr_limit: 40
override_cbc_keys:
- r-base
- r_base
- m2w64_c_compiler_stub
- m2w64_cxx_compiler_stub
- m2w64_fortran_compiler_stub
ordering:
m2w64_c_compiler:
- m2w64-toolchain
- gcc
m2w64_cxx_compiler:
- m2w64-toolchain
- gxx
m2w64_fortran_compiler:
- m2w64-toolchain
- gfortran
m2w64_c_stdlib:
- m2w64-toolchain
- m2w64-sysroot

r_base:
- 4.3
- 4.4
m2w64_c_compiler: # [win]
- gcc # [win]
m2w64_c_compiler_version: # [win]
- 13 # [win]
m2w64_cxx_compiler: # [win]
- gxx # [win]
m2w64_cxx_compiler_version: # [win]
- 13 # [win]
m2w64_fortran_compiler: # [win]
- gfortran # [win]
m2w64_fortran_compiler_version: # [win]
- 13 # [win]
m2w64_c_stdlib: # [win]
- m2w64-sysroot # [win]
m2w64_c_stdlib_version: # [win]
- 12 # [win]
1 change: 1 addition & 0 deletions .ci_support/osx_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- osx-64
zip_keys:
Expand Down
1 change: 1 addition & 0 deletions .ci_support/osx_arm64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- osx-arm64
zip_keys:
Expand Down
18 changes: 16 additions & 2 deletions .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,29 @@ cuda_compiler_version:
cxx_compiler:
- vs2019
m2w64_c_compiler:
- m2w64-toolchain
- gcc
m2w64_c_compiler_version:
- '13'
m2w64_c_stdlib:
- m2w64-sysroot
m2w64_c_stdlib_version:
- '12'
m2w64_cxx_compiler:
- m2w64-toolchain
- gxx
m2w64_cxx_compiler_version:
- '13'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
r-base:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- win-64
zip_keys:
Expand Down
18 changes: 16 additions & 2 deletions .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,29 @@ cuda_compiler_version:
cxx_compiler:
- vs2019
m2w64_c_compiler:
- m2w64-toolchain
- gcc
m2w64_c_compiler_version:
- '13'
m2w64_c_stdlib:
- m2w64-sysroot
m2w64_c_stdlib_version:
- '12'
m2w64_cxx_compiler:
- m2w64-toolchain
- gxx
m2w64_cxx_compiler_version:
- '13'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
r-base:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
r_base:
- '4.3'
- '4.4'
target_platform:
- win-64
zip_keys:
Expand Down
12 changes: 7 additions & 5 deletions 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.1.1" %}
{% set build_number = 0 %}
{% set build_number = 1 %}
{% set min_python = "3.8" %}

{% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if (cuda_compiler_version or "None") != "None" else "cpu" %}
Expand Down Expand Up @@ -35,6 +35,7 @@ requirements:
- {{ compiler('cxx') }}
- {{ compiler('m2w64_c') }} # [win]
- {{ compiler('m2w64_cxx') }} # [win]
- {{ stdlib('m2w64_c') }} # [win]
- {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"]
- {{ stdlib('c') }}
- cmake
Expand Down Expand Up @@ -196,7 +197,7 @@ outputs:
script: install-r-xgboost.sh # [not win]
script: install-r-xgboost.bat # [win]
build:
skip: true # [r_base in ("4.1", "4.2") or win]
skip: true # [r_base in ("4.1", "4.2")]
string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
rpaths:
- lib/R/lib
Expand All @@ -208,14 +209,15 @@ outputs:
build:
- {{ compiler('m2w64_c') }} # [win]
- {{ compiler('m2w64_cxx') }} # [win]
- {{ stdlib('m2w64_c') }} # [win]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ stdlib('c') }}
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
- llvm-openmp # [osx]
Copy link
Member

Choose a reason for hiding this comment

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

fails on missing openmp AFAICT

Suggested change
- llvm-openmp # [osx]
- llvm-openmp # [not linux]

Copy link
Member

Choose a reason for hiding this comment

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

So macOS and Linux seem to be doing ok. This already uses LLVM OpenMP on macOS and libgomp

Windows is having issues though. Am debating adding the Fortran compiler to see if that helps with detection

Copy link
Member

Choose a reason for hiding this comment

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

Ah right, nevermind, I see that libgomp gets pulled into that environment already.

Copy link
Member

Choose a reason for hiding this comment

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

All good :)

Appreciate the second set of eyes. Wouldn't be surprised if I'm missing something on the Windows side of things

- libgomp # [linux]
- m2-bash # [win]
- git
- make # [not win]
- posix # [win]
- cmake
- ninja
- cross-r-base {{ r_base }} # [build_platform != target_platform]
Expand Down Expand Up @@ -254,7 +256,7 @@ outputs:
- name: r-xgboost-cpu
build:
skip: true # [cuda_compiler != "None"]
skip: true # [r_base in ("4.1", "4.2") or win]
skip: true # [r_base in ("4.1", "4.2")]
requirements:
host:
- r-base
Expand All @@ -272,7 +274,7 @@ outputs:
- name: r-xgboost-gpu
build:
skip: true # [cuda_compiler == "None"]
skip: true # [r_base in ("4.1", "4.2") or win]
skip: true # [r_base in ("4.1", "4.2")]
requirements:
host:
- r-base
Expand Down
Loading