Skip to content

Commit 6fa7cb6

Browse files
committed
stay on GCC 13 for aarch, use GCC 14 for x64
1 parent 60f4d23 commit 6fa7cb6

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

.ci_support/migrations/cuda129.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and
3333
- 12.9 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3434
- 12.8 # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
3535

36-
c_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
37-
- 13 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
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"]
3839

39-
cxx_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
40-
- 13 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
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"]
4143

42-
fortran_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
43-
- 13 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
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"]

recipe/conda_build_config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
c_stdlib_version: # [unix]
22
- 10.15 # [osx and x86_64]
33

4+
# problem with GCC 14 in vendored xnnpack
5+
c_compiler_version: # [aarch64]
6+
- 13 # [aarch64]
7+
- 13 # [aarch64]
8+
cxx_compiler_version: # [aarch64]
9+
- 13 # [aarch64]
10+
- 13 # [aarch64]
11+
412
MACOSX_SDK_VERSION: # [osx]
513
- 13.3 # [osx]
614

0 commit comments

Comments
 (0)