Skip to content

Commit edbb705

Browse files
committed
Yet another attempt: overwrite [email protected] from configs/common/packages.yaml with 0.3.28 from configs/common/packages_clang.yaml
1 parent bbaaab0 commit edbb705

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

configs/common/packages.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@ packages:
177177
# ninja - when adding information here, also check Discover site config
178178
odc:
179179
require: '@1.5.2 ~fortran'
180-
# 2024/12/10: prefer openblas 0.3.28 so that it builds with flang-new from LLVM 19.1.4
181-
# but need to allow openblas 0.3.24 if other packages require it (e.g. in unified env)
180+
# Todo: update to 0.3.28 so that it builds with 'clang'. Check
181+
# packages_clang.yaml where we are overwriting openblas for now.
182182
openblas:
183-
prefer:
184-
- '@0.3.28'
183+
require:
184+
- '@0.3.24'
185185
openmpi:
186186
require: '~internal-hwloc +two_level_namespace'
187187
openssl:

configs/common/packages_clang.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ packages:
1313
py-numpy:
1414
require:
1515
- '^openblas'
16+
# clang@19 requires [email protected] - with this, we can'this
17+
# build all the Python dependencies as of 2024/12/11 due to
18+
# version conflicts.
19+
openblas:
20+
require::
21+
- '@0.3.28'
1622
# ip@5 doesn't build with clang@19 compilers (flang-new)
1723
# https://github.com/NOAA-EMC/NCEPLIBS-ip/issues/263
1824
# but requiring %gcc doesn't work when using openblas

0 commit comments

Comments
 (0)