Skip to content

Commit 6499cf2

Browse files
committed
Merge conda-forge/main into rapidsai/main
2 parents dc8729c + c190bee commit 6499cf2

15 files changed

+97
-122
lines changed
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '13'
4+
- '14'
55
c_stdlib:
66
- sysroot
77
c_stdlib_version:
@@ -15,11 +15,11 @@ channel_targets:
1515
cuda_compiler:
1616
- cuda-nvcc
1717
cuda_compiler_version:
18-
- '12.8'
18+
- '12.9'
1919
cxx_compiler:
2020
- gxx
2121
cxx_compiler_version:
22-
- '13'
22+
- '14'
2323
docker_image:
2424
- quay.io/condaforge/linux-anvil-x86_64:alma9
2525
librmm:
@@ -40,6 +40,4 @@ target_platform:
4040
zip_keys:
4141
- - c_compiler_version
4242
- cxx_compiler_version
43-
- cuda_compiler
4443
- cuda_compiler_version
45-
- docker_image
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '13'
4+
- '14'
55
c_stdlib:
66
- sysroot
77
c_stdlib_version:
@@ -15,11 +15,11 @@ channel_targets:
1515
cuda_compiler:
1616
- cuda-nvcc
1717
cuda_compiler_version:
18-
- '12.8'
18+
- '12.9'
1919
cxx_compiler:
2020
- gxx
2121
cxx_compiler_version:
22-
- '13'
22+
- '14'
2323
docker_image:
2424
- quay.io/condaforge/linux-anvil-x86_64:alma9
2525
librmm:
@@ -40,6 +40,4 @@ target_platform:
4040
zip_keys:
4141
- - c_compiler_version
4242
- cxx_compiler_version
43-
- cuda_compiler
4443
- cuda_compiler_version
45-
- docker_image

.ci_support/migrations/cuda128.yaml

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
migrator_ts: 1738229377
2+
__migrator:
3+
kind:
4+
version
5+
# Use migrator to add CUDA 12 latest.
6+
use_local: true
7+
migration_number:
8+
1
9+
build_number:
10+
1
11+
paused: false
12+
override_cbc_keys:
13+
- cuda_compiler_stub
14+
operation: key_add
15+
check_solvable: false
16+
primary_key: cuda_compiler_version
17+
ordering:
18+
cuda_compiler_version:
19+
- None
20+
- 12.4
21+
- 12.6
22+
- 12.8
23+
- 12.9
24+
25+
26+
cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
27+
- 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
28+
29+
c_compiler_version: # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
30+
- 14 # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
31+
32+
cxx_compiler_version: # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
33+
- 14 # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
34+
35+
fortran_compiler_version: # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
36+
- 14 # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

.ci_support/osx_64_.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '18'
8+
- '19'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
@@ -15,15 +15,15 @@ channel_sources:
1515
channel_targets:
1616
- rapidsai-nightly main
1717
cuda_compiler:
18-
- None
18+
- cuda-nvcc
1919
cuda_compiler_version:
2020
- None
2121
cxx_compiler:
2222
- clangxx
2323
cxx_compiler_version:
24-
- '18'
24+
- '19'
2525
llvm_openmp:
26-
- '18'
26+
- '19'
2727
macos_machine:
2828
- x86_64-apple-darwin13.4.0
2929
pin_run_as_build:

.ci_support/osx_arm64_.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '18'
8+
- '19'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
@@ -15,15 +15,15 @@ channel_sources:
1515
channel_targets:
1616
- rapidsai-nightly main
1717
cuda_compiler:
18-
- None
18+
- cuda-nvcc
1919
cuda_compiler_version:
2020
- None
2121
cxx_compiler:
2222
- clangxx
2323
cxx_compiler_version:
24-
- '18'
24+
- '19'
2525
llvm_openmp:
26-
- '18'
26+
- '19'
2727
macos_machine:
2828
- arm64-apple-darwin20.0.0
2929
pin_run_as_build:
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
c_compiler:
2-
- vs2019
2+
- vs2022
33
c_stdlib:
44
- vs
55
channel_sources:
@@ -9,21 +9,21 @@ channel_targets:
99
cuda_compiler:
1010
- cuda-nvcc
1111
cuda_compiler_version:
12-
- '12.8'
12+
- '12.9'
1313
cxx_compiler:
14-
- vs2019
14+
- vs2022
1515
m2w64_c_compiler:
1616
- gcc
1717
m2w64_c_compiler_version:
18-
- '13'
18+
- '14'
1919
m2w64_c_stdlib:
2020
- m2w64-sysroot
2121
m2w64_c_stdlib_version:
2222
- '12'
2323
m2w64_cxx_compiler:
2424
- gxx
2525
m2w64_cxx_compiler_version:
26-
- '13'
26+
- '14'
2727
pin_run_as_build:
2828
r-base:
2929
min_pin: x.x
@@ -35,6 +35,3 @@ r_base:
3535
- '4.4'
3636
target_platform:
3737
- win-64
38-
zip_keys:
39-
- - cuda_compiler
40-
- cuda_compiler_version

.gitattributes

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/conda-build.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
- CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.8cxx_compiler_version13
26+
- CONFIG: linux_64_c_compiler_version14cuda_compiler_version12.9cxx_compiler_version14
2727
UPLOAD_PACKAGES: True
2828
os: ubuntu
2929
runs_on: ['ubuntu-latest']
3030
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
31-
- CONFIG: linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.8cxx_compiler_version13
31+
- CONFIG: linux_aarch64_c_compiler_version14cuda_compiler_version12.9cxx_compiler_version14
3232
UPLOAD_PACKAGES: True
3333
os: ubuntu
3434
runs_on: ['ubuntu-latest']
@@ -41,7 +41,7 @@ jobs:
4141
UPLOAD_PACKAGES: True
4242
os: macos
4343
runs_on: ['macos-13']
44-
- CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.8
44+
- CONFIG: win_64_cuda_compiler_version12.9
4545
UPLOAD_PACKAGES: True
4646
os: windows
4747
runs_on: ['windows-latest']
@@ -74,6 +74,7 @@ jobs:
7474
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
7575

7676
- name: Build on Linux
77+
id: build-linux
7778
if: matrix.os == 'ubuntu'
7879
env:
7980
CONFIG: ${{ matrix.CONFIG }}
@@ -85,8 +86,10 @@ jobs:
8586
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
8687
shell: bash
8788
run: |
88-
echo "::group::Configure binfmt_misc"
89-
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
89+
if [[ "$(uname -m)" == "x86_64" ]]; then
90+
echo "::group::Configure binfmt_misc"
91+
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
92+
fi
9093
export flow_run_id="github_$GITHUB_RUN_ID"
9194
export remote_url="https://github.com/$GITHUB_REPOSITORY"
9295
export sha="$GITHUB_SHA"
@@ -101,6 +104,7 @@ jobs:
101104
./.scripts/run_docker_build.sh
102105
103106
- name: Build on macOS
107+
id: build-macos
104108
if: matrix.os == 'macos'
105109
env:
106110
CONFIG: ${{ matrix.CONFIG }}
@@ -123,18 +127,22 @@ jobs:
123127
./.scripts/run_osx_build.sh
124128
125129
- name: Build on windows
130+
id: build-windows
131+
if: matrix.os == 'windows'
126132
shell: cmd
127133
run: |
128134
set "flow_run_id=github_%GITHUB_RUN_ID%"
129135
set "remote_url=https://github.com/%GITHUB_REPOSITORY%"
130136
set "sha=%GITHUB_SHA%"
131137
call ".scripts\run_win_build.bat"
132138
env:
139+
# default value; make it explicit, as it needs to match with artefact
140+
# generation below. Not configurable for now, can be revisited later
141+
CONDA_BLD_DIR: C:\bld
133142
MINIFORGE_HOME: D:\Miniforge
134143
PYTHONUNBUFFERED: 1
135144
CONFIG: ${{ matrix.CONFIG }}
136145
CI: github_actions
137146
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
138147
UPLOAD_ON_BRANCH: main
139-
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
140-
if: matrix.os == 'windows'
148+
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}

.scripts/build_steps.sh

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)