Skip to content

Commit 321cd3e

Browse files
2.4.x backports (#322)
automerged PR by conda-forge/automerge-action
2 parents 44041ee + 838109b commit 321cd3e

File tree

45 files changed

+231
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+231
-254
lines changed

.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cxx_compiler:
2525
cxx_compiler_version:
2626
- '11'
2727
docker_image:
28-
- quay.io/condaforge/linux-anvil-cuda:11.8
28+
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
2929
github_actions_labels:
3030
- cirun-openstack-gpu-2xlarge
3131
libabseil:
@@ -36,6 +36,8 @@ liblapack:
3636
- 3.9 *netlib
3737
libprotobuf:
3838
- 5.28.2
39+
libtorch:
40+
- '2.4'
3941
megabuild:
4042
- 'true'
4143
mkl:
@@ -48,8 +50,6 @@ numpy:
4850
- '2.0'
4951
- '2'
5052
- '2.0'
51-
orc:
52-
- 2.0.2
5353
pin_run_as_build:
5454
python:
5555
min_pin: x.x
@@ -67,8 +67,6 @@ target_platform:
6767
zip_keys:
6868
- - c_compiler_version
6969
- cxx_compiler_version
70-
- c_stdlib_version
71-
- cdt_name
7270
- cuda_compiler
7371
- cuda_compiler_version
7472
- docker_image

.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cxx_compiler:
2525
cxx_compiler_version:
2626
- '12'
2727
docker_image:
28-
- quay.io/condaforge/linux-anvil-cos7-x86_64
28+
- quay.io/condaforge/linux-anvil-x86_64:alma9
2929
github_actions_labels:
3030
- cirun-openstack-gpu-2xlarge
3131
libabseil:
@@ -36,6 +36,8 @@ liblapack:
3636
- 3.9 *netlib
3737
libprotobuf:
3838
- 5.28.2
39+
libtorch:
40+
- '2.4'
3941
megabuild:
4042
- 'true'
4143
mkl:
@@ -48,8 +50,6 @@ numpy:
4850
- '2.0'
4951
- '2'
5052
- '2.0'
51-
orc:
52-
- 2.0.2
5353
pin_run_as_build:
5454
python:
5555
min_pin: x.x
@@ -67,8 +67,6 @@ target_platform:
6767
zip_keys:
6868
- - c_compiler_version
6969
- cxx_compiler_version
70-
- c_stdlib_version
71-
- cdt_name
7270
- cuda_compiler
7371
- cuda_compiler_version
7472
- docker_image

.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cxx_compiler:
2525
cxx_compiler_version:
2626
- '13'
2727
docker_image:
28-
- quay.io/condaforge/linux-anvil-cos7-x86_64
28+
- quay.io/condaforge/linux-anvil-x86_64:alma9
2929
github_actions_labels:
3030
- cirun-openstack-gpu-2xlarge
3131
libabseil:
@@ -36,6 +36,8 @@ liblapack:
3636
- 3.9 *netlib
3737
libprotobuf:
3838
- 5.28.2
39+
libtorch:
40+
- '2.4'
3941
megabuild:
4042
- 'true'
4143
mkl:
@@ -48,8 +50,6 @@ numpy:
4850
- '2.0'
4951
- '2'
5052
- '2.0'
51-
orc:
52-
- 2.0.2
5353
pin_run_as_build:
5454
python:
5555
min_pin: x.x
@@ -67,8 +67,6 @@ target_platform:
6767
zip_keys:
6868
- - c_compiler_version
6969
- cxx_compiler_version
70-
- c_stdlib_version
71-
- cdt_name
7270
- cuda_compiler
7371
- cuda_compiler_version
7472
- docker_image

.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cxx_compiler:
2525
cxx_compiler_version:
2626
- '11'
2727
docker_image:
28-
- quay.io/condaforge/linux-anvil-cuda:11.8
28+
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
2929
github_actions_labels:
3030
- cirun-openstack-gpu-2xlarge
3131
libabseil:
@@ -36,6 +36,8 @@ liblapack:
3636
- 3.9 *netlib
3737
libprotobuf:
3838
- 5.28.2
39+
libtorch:
40+
- '2.4'
3941
megabuild:
4042
- 'true'
4143
mkl:
@@ -48,8 +50,6 @@ numpy:
4850
- '2.0'
4951
- '2'
5052
- '2.0'
51-
orc:
52-
- 2.0.2
5353
pin_run_as_build:
5454
python:
5555
min_pin: x.x
@@ -67,8 +67,6 @@ target_platform:
6767
zip_keys:
6868
- - c_compiler_version
6969
- cxx_compiler_version
70-
- c_stdlib_version
71-
- cdt_name
7270
- cuda_compiler
7371
- cuda_compiler_version
7472
- docker_image

.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cxx_compiler:
2525
cxx_compiler_version:
2626
- '12'
2727
docker_image:
28-
- quay.io/condaforge/linux-anvil-cos7-x86_64
28+
- quay.io/condaforge/linux-anvil-x86_64:alma9
2929
github_actions_labels:
3030
- cirun-openstack-gpu-2xlarge
3131
libabseil:
@@ -36,6 +36,8 @@ liblapack:
3636
- 3.9 *netlib
3737
libprotobuf:
3838
- 5.28.2
39+
libtorch:
40+
- '2.4'
3941
megabuild:
4042
- 'true'
4143
mkl:
@@ -48,8 +50,6 @@ numpy:
4850
- '2.0'
4951
- '2'
5052
- '2.0'
51-
orc:
52-
- 2.0.2
5353
pin_run_as_build:
5454
python:
5555
min_pin: x.x
@@ -67,8 +67,6 @@ target_platform:
6767
zip_keys:
6868
- - c_compiler_version
6969
- cxx_compiler_version
70-
- c_stdlib_version
71-
- cdt_name
7270
- cuda_compiler
7371
- cuda_compiler_version
7472
- docker_image

.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cxx_compiler:
2525
cxx_compiler_version:
2626
- '13'
2727
docker_image:
28-
- quay.io/condaforge/linux-anvil-cos7-x86_64
28+
- quay.io/condaforge/linux-anvil-x86_64:alma9
2929
github_actions_labels:
3030
- cirun-openstack-gpu-2xlarge
3131
libabseil:
@@ -36,6 +36,8 @@ liblapack:
3636
- 3.9 *netlib
3737
libprotobuf:
3838
- 5.28.2
39+
libtorch:
40+
- '2.4'
3941
megabuild:
4042
- 'true'
4143
mkl:
@@ -48,8 +50,6 @@ numpy:
4850
- '2.0'
4951
- '2'
5052
- '2.0'
51-
orc:
52-
- 2.0.2
5353
pin_run_as_build:
5454
python:
5555
min_pin: x.x
@@ -67,8 +67,6 @@ target_platform:
6767
zip_keys:
6868
- - c_compiler_version
6969
- cxx_compiler_version
70-
- c_stdlib_version
71-
- cdt_name
7270
- cuda_compiler
7371
- cuda_compiler_version
7472
- docker_image
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
BUILD:
2-
- aarch64-conda_cos7-linux-gnu
31
blas_impl:
42
- generic
53
c_compiler:
@@ -9,9 +7,7 @@ c_compiler_version:
97
c_stdlib:
108
- sysroot
119
c_stdlib_version:
12-
- '2.28'
13-
cdt_arch:
14-
- aarch64
10+
- '2.17'
1511
cdt_name:
1612
- cos7
1713
channel_sources:
@@ -29,7 +25,7 @@ cxx_compiler:
2925
cxx_compiler_version:
3026
- '12'
3127
docker_image:
32-
- quay.io/condaforge/linux-anvil-alma-x86_64:8
28+
- quay.io/condaforge/linux-anvil-x86_64:alma9
3329
github_actions_labels:
3430
- cirun-openstack-gpu-2xlarge
3531
libabseil:
@@ -40,6 +36,8 @@ liblapack:
4036
- 3.9 *netlib
4137
libprotobuf:
4238
- 5.28.2
39+
libtorch:
40+
- '2.4'
4341
megabuild:
4442
- 'true'
4543
mkl:
@@ -52,8 +50,6 @@ numpy:
5250
- '2.0'
5351
- '2'
5452
- '2.0'
55-
orc:
56-
- 2.0.2
5753
pin_run_as_build:
5854
python:
5955
min_pin: x.x
@@ -71,8 +67,6 @@ target_platform:
7167
zip_keys:
7268
- - c_compiler_version
7369
- cxx_compiler_version
74-
- c_stdlib_version
75-
- cdt_name
7670
- cuda_compiler
7771
- cuda_compiler_version
7872
- docker_image
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
BUILD:
2-
- aarch64-conda_cos7-linux-gnu
31
blas_impl:
42
- generic
53
c_compiler:
@@ -10,8 +8,6 @@ c_stdlib:
108
- sysroot
119
c_stdlib_version:
1210
- '2.17'
13-
cdt_arch:
14-
- aarch64
1511
cdt_name:
1612
- cos7
1713
channel_sources:
@@ -29,7 +25,7 @@ cxx_compiler:
2925
cxx_compiler_version:
3026
- '13'
3127
docker_image:
32-
- quay.io/condaforge/linux-anvil-cos7-x86_64
28+
- quay.io/condaforge/linux-anvil-x86_64:alma9
3329
github_actions_labels:
3430
- cirun-openstack-gpu-2xlarge
3531
libabseil:
@@ -40,6 +36,8 @@ liblapack:
4036
- 3.9 *netlib
4137
libprotobuf:
4238
- 5.28.2
39+
libtorch:
40+
- '2.4'
4341
megabuild:
4442
- 'true'
4543
mkl:
@@ -52,8 +50,6 @@ numpy:
5250
- '2.0'
5351
- '2'
5452
- '2.0'
55-
orc:
56-
- 2.0.2
5753
pin_run_as_build:
5854
python:
5955
min_pin: x.x
@@ -71,8 +67,6 @@ target_platform:
7167
zip_keys:
7268
- - c_compiler_version
7369
- cxx_compiler_version
74-
- c_stdlib_version
75-
- cdt_name
7670
- cuda_compiler
7771
- cuda_compiler_version
7872
- docker_image

.ci_support/migrations/libgrpc167_libprotobuf5282.yaml

-10
This file was deleted.

.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ liblapack:
3232
- 3.9 *netlib
3333
libprotobuf:
3434
- 5.28.2
35+
libtorch:
36+
- '2.4'
3537
llvm_openmp:
3638
- '17'
3739
macos_machine:
@@ -42,8 +44,6 @@ mkl:
4244
- '2023'
4345
numpy:
4446
- '2.0'
45-
orc:
46-
- 2.0.2
4747
pin_run_as_build:
4848
python:
4949
min_pin: x.x

.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ liblapack:
3232
- 3.9 *netlib
3333
libprotobuf:
3434
- 5.28.2
35+
libtorch:
36+
- '2.4'
3537
llvm_openmp:
3638
- '17'
3739
macos_machine:
@@ -42,8 +44,6 @@ mkl:
4244
- '2023'
4345
numpy:
4446
- '2.0'
45-
orc:
46-
- 2.0.2
4747
pin_run_as_build:
4848
python:
4949
min_pin: x.x

.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ liblapack:
3232
- 3.9 *netlib
3333
libprotobuf:
3434
- 5.28.2
35+
libtorch:
36+
- '2.4'
3537
llvm_openmp:
3638
- '17'
3739
macos_machine:
@@ -42,8 +44,6 @@ mkl:
4244
- '2023'
4345
numpy:
4446
- '2.0'
45-
orc:
46-
- 2.0.2
4747
pin_run_as_build:
4848
python:
4949
min_pin: x.x

0 commit comments

Comments
 (0)