Skip to content

Commit 034ea64

Browse files
authored
Merge pull request #409 from mgorny/v2.8.0
V2.8.0
2 parents d21fc6d + 1982c79 commit 034ea64

File tree

34 files changed

+152
-392
lines changed

34 files changed

+152
-392
lines changed

.azure-pipelines/azure-pipelines-osx.yml

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

.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cuda_compiler:
1818
- cuda-nvcc
1919
cuda_compiler_version:
2020
- '12.9'
21-
cudnn:
22-
- '9'
2321
cxx_compiler:
2422
- gxx
2523
cxx_compiler_version:
@@ -55,24 +53,26 @@ nccl:
5553
numpy:
5654
- '2'
5755
orc:
58-
- 2.1.3
56+
- 2.2.0
5957
pin_run_as_build:
6058
python:
6159
min_pin: x.x
6260
max_pin: x.x
61+
pybind11_abi:
62+
- '4'
6363
python:
6464
- 3.10.* *_cpython
6565
- 3.11.* *_cpython
6666
- 3.12.* *_cpython
6767
- 3.13.* *_cp313
68-
- 3.9.* *_cpython
6968
pytorch:
7069
- '2.6'
7170
target_platform:
7271
- linux-64
7372
zip_keys:
7473
- - c_compiler_version
7574
- cxx_compiler_version
75+
- c_stdlib_version
7676
- cuda_compiler_version
7777
- - channel_targets
7878
- is_rc

.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cuda_compiler:
1818
- cuda-nvcc
1919
cuda_compiler_version:
2020
- None
21-
cudnn:
22-
- '9'
2321
cxx_compiler:
2422
- gxx
2523
cxx_compiler_version:
@@ -55,24 +53,26 @@ nccl:
5553
numpy:
5654
- '2'
5755
orc:
58-
- 2.1.3
56+
- 2.2.0
5957
pin_run_as_build:
6058
python:
6159
min_pin: x.x
6260
max_pin: x.x
61+
pybind11_abi:
62+
- '4'
6363
python:
6464
- 3.10.* *_cpython
6565
- 3.11.* *_cpython
6666
- 3.12.* *_cpython
6767
- 3.13.* *_cp313
68-
- 3.9.* *_cpython
6968
pytorch:
7069
- '2.6'
7170
target_platform:
7271
- linux-64
7372
zip_keys:
7473
- - c_compiler_version
7574
- cxx_compiler_version
75+
- c_stdlib_version
7676
- cuda_compiler_version
7777
- - channel_targets
7878
- is_rc

.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cuda_compiler:
1818
- cuda-nvcc
1919
cuda_compiler_version:
2020
- '12.9'
21-
cudnn:
22-
- '9'
2321
cxx_compiler:
2422
- gxx
2523
cxx_compiler_version:
@@ -55,24 +53,26 @@ nccl:
5553
numpy:
5654
- '2'
5755
orc:
58-
- 2.1.3
56+
- 2.2.0
5957
pin_run_as_build:
6058
python:
6159
min_pin: x.x
6260
max_pin: x.x
61+
pybind11_abi:
62+
- '4'
6363
python:
6464
- 3.10.* *_cpython
6565
- 3.11.* *_cpython
6666
- 3.12.* *_cpython
6767
- 3.13.* *_cp313
68-
- 3.9.* *_cpython
6968
pytorch:
7069
- '2.6'
7170
target_platform:
7271
- linux-64
7372
zip_keys:
7473
- - c_compiler_version
7574
- cxx_compiler_version
75+
- c_stdlib_version
7676
- cuda_compiler_version
7777
- - channel_targets
7878
- is_rc

.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cuda_compiler:
1818
- cuda-nvcc
1919
cuda_compiler_version:
2020
- None
21-
cudnn:
22-
- '9'
2321
cxx_compiler:
2422
- gxx
2523
cxx_compiler_version:
@@ -55,24 +53,26 @@ nccl:
5553
numpy:
5654
- '2'
5755
orc:
58-
- 2.1.3
56+
- 2.2.0
5957
pin_run_as_build:
6058
python:
6159
min_pin: x.x
6260
max_pin: x.x
61+
pybind11_abi:
62+
- '4'
6363
python:
6464
- 3.10.* *_cpython
6565
- 3.11.* *_cpython
6666
- 3.12.* *_cpython
6767
- 3.13.* *_cp313
68-
- 3.9.* *_cpython
6968
pytorch:
7069
- '2.6'
7170
target_platform:
7271
- linux-64
7372
zip_keys:
7473
- - c_compiler_version
7574
- cxx_compiler_version
75+
- c_stdlib_version
7676
- cuda_compiler_version
7777
- - channel_targets
7878
- is_rc

.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cuda_compiler:
1818
- cuda-nvcc
1919
cuda_compiler_version:
2020
- '12.9'
21-
cudnn:
22-
- '9'
2321
cxx_compiler:
2422
- gxx
2523
cxx_compiler_version:
@@ -55,24 +53,26 @@ nccl:
5553
numpy:
5654
- '2'
5755
orc:
58-
- 2.1.3
56+
- 2.2.0
5957
pin_run_as_build:
6058
python:
6159
min_pin: x.x
6260
max_pin: x.x
61+
pybind11_abi:
62+
- '4'
6363
python:
6464
- 3.10.* *_cpython
6565
- 3.11.* *_cpython
6666
- 3.12.* *_cpython
6767
- 3.13.* *_cp313
68-
- 3.9.* *_cpython
6968
pytorch:
7069
- '2.6'
7170
target_platform:
7271
- linux-aarch64
7372
zip_keys:
7473
- - c_compiler_version
7574
- cxx_compiler_version
75+
- c_stdlib_version
7676
- cuda_compiler_version
7777
- - channel_targets
7878
- is_rc

.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cuda_compiler:
1818
- cuda-nvcc
1919
cuda_compiler_version:
2020
- None
21-
cudnn:
22-
- '9'
2321
cxx_compiler:
2422
- gxx
2523
cxx_compiler_version:
@@ -55,24 +53,26 @@ nccl:
5553
numpy:
5654
- '2'
5755
orc:
58-
- 2.1.3
56+
- 2.2.0
5957
pin_run_as_build:
6058
python:
6159
min_pin: x.x
6260
max_pin: x.x
61+
pybind11_abi:
62+
- '4'
6363
python:
6464
- 3.10.* *_cpython
6565
- 3.11.* *_cpython
6666
- 3.12.* *_cpython
6767
- 3.13.* *_cp313
68-
- 3.9.* *_cpython
6968
pytorch:
7069
- '2.6'
7170
target_platform:
7271
- linux-aarch64
7372
zip_keys:
7473
- - c_compiler_version
7574
- cxx_compiler_version
75+
- c_stdlib_version
7676
- cuda_compiler_version
7777
- - channel_targets
7878
- is_rc

.ci_support/migrations/cuda129.yaml

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,53 @@ __migrator:
1414
primary_key: cuda_compiler_version
1515
ordering:
1616
cuda_compiler_version:
17-
- 11.8
1817
- 12.4
1918
- 12.6
2019
- 12.8
2120
- None
2221
- 12.9
22+
- 13.0
23+
# to allow manual opt-in for CUDA 11.8, see
24+
# https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/7472
25+
# must be last due to how cuda_compiler ordering in that migrator works
26+
- 11.8
2327
commit_message: |
2428
Upgrade to CUDA 12.9
25-
26-
With CUDA 12.9, the following new architectures are added `sm_100`, `sm_101` and `sm_120`.
27-
To build for these architectures, maintainers will need to add these to list of architectures
28-
that their package builds for.
29-
29+
30+
CUDA 12.8 added support for architectures `sm_100`, `sm_101` and `sm_120`,
31+
while CUDA 12.9 further added `sm_103` and `sm_121`. To build for these,
32+
maintainers will need to modify their existing list of specified architectures
33+
(e.g. `CMAKE_CUDA_ARCHITECTURES`, `TORCH_CUDA_ARCH_LIST`, etc.)
34+
for their package. A good balance between broad support and storage
35+
footprint (resp. compilation time) is to add `sm_100` and `sm_120`.
36+
37+
Since CUDA 12.8, the conda-forge nvcc package now sets `CUDAARCHS` and
38+
`TORCH_CUDA_ARCH_LIST` in its activation script to a string containing all
39+
of the supported real architectures plus the virtual architecture of the
40+
latest. Recipes for packages who use these variables to control their build
41+
but do not want to build for all supported architectures will need to override
42+
these variables in their build script.
43+
3044
ref: https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#new-features
3145
3246
cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3347
- 12.9 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3448
- 12.8 # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3549

36-
c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
37-
- 14 # [(linux and x86_64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
38-
- 13 # [(linux and aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
50+
cuda_compiler_version_min: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
51+
- 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
52+
53+
c_stdlib_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
54+
- 2.17 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
55+
56+
# Compiler pinnings deviate from global migrator in order to honor pinnings in local conda_build_config for aarch64
57+
c_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
58+
- 14 # [(linux and (x86_64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
59+
- 13 # [(linux and (aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3960

40-
cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
41-
- 14 # [(linux and x86_64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
42-
- 13 # [(linux and aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
61+
cxx_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
62+
- 14 # [(linux and (x86_64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
63+
- 13 # [(linux and (aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
4364

44-
fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
45-
- 14 # [(linux and x86_64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
46-
- 13 # [(linux and aarch64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
65+
fortran_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
66+
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ mkl:
5151
numpy:
5252
- '2'
5353
orc:
54-
- 2.1.3
54+
- 2.2.0
5555
pin_run_as_build:
5656
python:
5757
min_pin: x.x
5858
max_pin: x.x
59+
pybind11_abi:
60+
- '4'
5961
python:
6062
- 3.10.* *_cpython
6163
pytorch:

.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ mkl:
5151
numpy:
5252
- '2'
5353
orc:
54-
- 2.1.3
54+
- 2.2.0
5555
pin_run_as_build:
5656
python:
5757
min_pin: x.x
5858
max_pin: x.x
59+
pybind11_abi:
60+
- '4'
5961
python:
6062
- 3.11.* *_cpython
6163
pytorch:

0 commit comments

Comments
 (0)