Skip to content

Commit 13db9c2

Browse files
jameslambjameslamb
authored
Merge pull request #102 from hcho3/bump_3.0.5
Merge conda-forge/main into rapidsai/main
2 parents 9856ebf + 8f7e1cc commit 13db9c2

14 files changed

+243
-12
lines changed

‎.ci_support/linux_64_c_compiler_version14cuda_compiler_version12.9cxx_compiler_version14.yaml‎ renamed to ‎.ci_support/linux_64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version12.9cxx_compiler_version14.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pin_run_as_build:
3131
min_pin: x.x
3232
max_pin: x.x
3333
python_min:
34-
- '3.9'
34+
- '3.10'
3535
r_base:
3636
- '4.3'
3737
- '4.4'
@@ -40,4 +40,5 @@ target_platform:
4040
zip_keys:
4141
- - c_compiler_version
4242
- cxx_compiler_version
43+
- c_stdlib_version
4344
- cuda_compiler_version

‎.ci_support/linux_64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
c_compiler:
2+
- gcc
3+
c_compiler_version:
4+
- '14'
5+
c_stdlib:
6+
- sysroot
7+
c_stdlib_version:
8+
- '2.28'
9+
cdt_name:
10+
- conda
11+
channel_sources:
12+
- rapidsai,rapidsai-nightly,conda-forge
13+
channel_targets:
14+
- rapidsai-nightly main
15+
cuda_compiler:
16+
- cuda-nvcc
17+
cuda_compiler_version:
18+
- '13.0'
19+
cxx_compiler:
20+
- gxx
21+
cxx_compiler_version:
22+
- '14'
23+
docker_image:
24+
- quay.io/condaforge/linux-anvil-x86_64:alma9
25+
librmm:
26+
- '25.10'
27+
nccl:
28+
- '2'
29+
pin_run_as_build:
30+
r-base:
31+
min_pin: x.x
32+
max_pin: x.x
33+
python_min:
34+
- '3.10'
35+
r_base:
36+
- '4.3'
37+
- '4.4'
38+
target_platform:
39+
- linux-64
40+
zip_keys:
41+
- - c_compiler_version
42+
- cxx_compiler_version
43+
- c_stdlib_version
44+
- cuda_compiler_version

‎.ci_support/linux_aarch64_c_compiler_version14cuda_compiler_version12.9cxx_compiler_version14.yaml‎ renamed to ‎.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version12.9cxx_compiler_version14.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pin_run_as_build:
3131
min_pin: x.x
3232
max_pin: x.x
3333
python_min:
34-
- '3.9'
34+
- '3.10'
3535
r_base:
3636
- '4.3'
3737
- '4.4'
@@ -40,4 +40,5 @@ target_platform:
4040
zip_keys:
4141
- - c_compiler_version
4242
- cxx_compiler_version
43+
- c_stdlib_version
4344
- cuda_compiler_version

‎.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
c_compiler:
2+
- gcc
3+
c_compiler_version:
4+
- '14'
5+
c_stdlib:
6+
- sysroot
7+
c_stdlib_version:
8+
- '2.28'
9+
cdt_name:
10+
- conda
11+
channel_sources:
12+
- rapidsai,rapidsai-nightly,conda-forge
13+
channel_targets:
14+
- rapidsai-nightly main
15+
cuda_compiler:
16+
- cuda-nvcc
17+
cuda_compiler_version:
18+
- '13.0'
19+
cxx_compiler:
20+
- gxx
21+
cxx_compiler_version:
22+
- '14'
23+
docker_image:
24+
- quay.io/condaforge/linux-anvil-x86_64:alma9
25+
librmm:
26+
- '25.10'
27+
nccl:
28+
- '2'
29+
pin_run_as_build:
30+
r-base:
31+
min_pin: x.x
32+
max_pin: x.x
33+
python_min:
34+
- '3.10'
35+
r_base:
36+
- '4.3'
37+
- '4.4'
38+
target_platform:
39+
- linux-aarch64
40+
zip_keys:
41+
- - c_compiler_version
42+
- cxx_compiler_version
43+
- c_stdlib_version
44+
- cuda_compiler_version

‎.ci_support/migrations/cuda12x.yaml‎ renamed to ‎.ci_support/migrations/cuda129.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ __migrator:
2626
cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
2727
- 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
2828

29+
c_stdlib_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
30+
- 2.28 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
31+
2932
c_compiler_version: # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3033
- 14 # [linux and (x86_64 or aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3134

‎.ci_support/migrations/cuda130.yaml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
migrator_ts: 1755016036
2+
__migrator:
3+
operation: key_add
4+
migration_number:
5+
1
6+
build_number:
7+
1
8+
paused: true
9+
override_cbc_keys:
10+
- cuda_compiler_stub
11+
check_solvable: false
12+
primary_key: cuda_compiler_version
13+
ordering:
14+
cuda_compiler_version:
15+
- 12.4
16+
- 12.6
17+
- 12.8
18+
- None
19+
- 12.9
20+
- 13.0
21+
# to allow manual opt-in for CUDA 11.8, see
22+
# https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/7472
23+
# must be last due to how cuda_compiler ordering in that migrator works
24+
- 11.8
25+
wait_for_migrators:
26+
- cuda129
27+
commit_message: |
28+
Upgrade to CUDA 13.0
29+
30+
CUDA 13.0 requires architecture `sm_75` or higher, and renamed `sm_101` to
31+
`sm_110`. To build for these, maintainers will need to modify their existing list of
32+
specified architectures (e.g. `CMAKE_CUDA_ARCHITECTURES`, `TORCH_CUDA_ARCH_LIST`, etc.)
33+
for their package.
34+
35+
Since CUDA 12.8, the conda-forge nvcc package now sets `CUDAARCHS` and
36+
`TORCH_CUDA_ARCH_LIST` in its activation script to a string containing all
37+
of the supported real architectures plus the virtual architecture of the
38+
latest. Recipes for packages who use these variables to control their build
39+
but do not want to build for all supported architectures will need to override
40+
these variables in their build script.
41+
42+
ref: https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#new-features
43+
44+
> [[!IMPORTANT]]
45+
> Remember to update any CUDA 11/12 specific selector syntax in the recipe to include
46+
> CUDA 13. For example `# [(cuda_compiler_version or "None").startswith("12")]`
47+
> might be replaced with `# [cuda_compiler_version != "None"]`.
48+
49+
cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
50+
- 13.0 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
51+
52+
c_stdlib_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
53+
- 2.28 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
54+
55+
c_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
56+
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
57+
58+
cxx_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
59+
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
60+
61+
fortran_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
62+
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

‎.ci_support/osx_64_.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pin_run_as_build:
3131
min_pin: x.x
3232
max_pin: x.x
3333
python_min:
34-
- '3.9'
34+
- '3.10'
3535
r_base:
3636
- '4.3'
3737
- '4.4'

‎.ci_support/osx_arm64_.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pin_run_as_build:
3131
min_pin: x.x
3232
max_pin: x.x
3333
python_min:
34-
- '3.9'
34+
- '3.10'
3535
r_base:
3636
- '4.3'
3737
- '4.4'

‎.ci_support/win_64_cuda_compiler_version12.9.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pin_run_as_build:
2929
min_pin: x.x
3030
max_pin: x.x
3131
python_min:
32-
- '3.9'
32+
- '3.10'
3333
r_base:
3434
- '4.3'
3535
- '4.4'

‎.ci_support/win_64_cuda_compiler_version13.0.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
c_compiler:
2+
- vs2022
3+
c_stdlib:
4+
- vs
5+
channel_sources:
6+
- rapidsai,rapidsai-nightly,conda-forge
7+
channel_targets:
8+
- rapidsai-nightly main
9+
cuda_compiler:
10+
- cuda-nvcc
11+
cuda_compiler_version:
12+
- '13.0'
13+
cxx_compiler:
14+
- vs2022
15+
m2w64_c_compiler:
16+
- gcc
17+
m2w64_c_compiler_version:
18+
- '14'
19+
m2w64_c_stdlib:
20+
- m2w64-sysroot
21+
m2w64_c_stdlib_version:
22+
- '12'
23+
m2w64_cxx_compiler:
24+
- gxx
25+
m2w64_cxx_compiler_version:
26+
- '14'
27+
pin_run_as_build:
28+
r-base:
29+
min_pin: x.x
30+
max_pin: x.x
31+
python_min:
32+
- '3.10'
33+
r_base:
34+
- '4.3'
35+
- '4.4'
36+
target_platform:
37+
- win-64

0 commit comments

Comments
 (0)