Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Acorn updates for 1.8.0 #1285

Merged
merged 7 commits into from
Sep 10, 2024
Merged

Acorn updates for 1.8.0 #1285

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
86878c2
update acorn packages_intel.yaml (limit cdo version for intel 2022)
AlexanderRichert-NOAA Sep 4, 2024
70bca6c
update acorn compiler.yaml
AlexanderRichert-NOAA Sep 4, 2024
462a493
more acorn package config updates for 1.8.0
AlexanderRichert-NOAA Sep 4, 2024
ac5e6e1
acorn: add static gcc, libstdc++ flags for intel 2022 also
AlexanderRichert-NOAA Sep 4, 2024
2c4344b
update acorn packages_intel.yaml some more for 1.8.0
AlexanderRichert-NOAA Sep 4, 2024
7e8c333
Update packages_intel.yaml
AlexanderRichert-NOAA Sep 4, 2024
68d6076
Merge branch 'release/1.8.0' into 1.8.0_acorn
climbfuji Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions configs/sites/tier1/acorn/compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ compilers:
cxx: CC
f77: ftn
fc: ftn
flags: {}
flags:
cflags: -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
cxxflags: -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread
fflags: -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread
operating_system: sles15
modules:
- PrgEnv-intel/8.3.3
- craype/2.7.13
- PrgEnv-intel/8.5.0
- craype/2.7.17
- intel/19.1.3.304
- libfabric
environment:
prepend_path:
PATH: /opt/cray/pe/gcc/10.2.0/bin
LD_LIBRARY_PATH: /opt/cray/pe/gcc/10.2.0/snos/lib64
CPATH: /opt/cray/pe/gcc/10.2.0/snos/include
set:
# OpenSUSE on WCOSS2 machines sets CONFIG_SITE so
# Automake-based builds are installed in lib64
Expand All @@ -31,11 +30,14 @@ compilers:
cxx: CC
f77: ftn
fc: ftn
flags: {}
flags:
cflags: -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread
cxxflags: -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread
fflags: -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -lm -lpthread
operating_system: sles15
modules:
- PrgEnv-intel/8.3.3
- craype/2.7.13
- PrgEnv-intel/8.5.0
- craype/2.7.17
- intel-classic/2022.2.0.262
- libfabric
environment:
Expand Down
6 changes: 1 addition & 5 deletions configs/sites/tier1/acorn/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
externals:
- spec: [email protected]
modules: [git-lfs/2.11.0]
perl:
buildable: false
externals:
- spec: [email protected]~cpanm+shared+threads
prefix: /usr
mysql:
buildable: false
externals:
Expand All @@ -38,6 +33,7 @@
gdal:
variants: ~curl
flex:
buildable: false
externals:
- spec: [email protected]+lex
prefix: /usr
10 changes: 9 additions & 1 deletion configs/sites/tier1/acorn/packages_intel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
- '@1.2.1 ~mkl'
py-numpy:
require::
- '@:1.23 ^openblas'
- '^[virtuals=lapack,blas] openblas'
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
- '@:1.25'
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
- any_of: ['@:1.24']
when: '%[email protected]'
# *DH
eckit:
require:
Expand All @@ -41,11 +44,16 @@
require:
- any_of: ["@2.27.0"]
when: "%[email protected]"
message: "2.25.0 is the last version to use C++11 (as opposed to C++17)"
climbfuji marked this conversation as resolved.
Show resolved Hide resolved
py-scipy:
require:
- any_of: ["@1.10.1"]
when: "%[email protected]"
cdo:
require:
- any_of: ["@2.3.0"]
when: "%[email protected]"
message: "2.3.0 is the last version to use C++17"
- any_of: ["@2.0.5"]
when: "%[email protected]"
message: "2.0.5 is the last version to use C++14"
Loading