Skip to content

Commit e8debe1

Browse files
franzpoeschelax3l
franzpoeschel
and
ax3l
authored
Backport recent CI fixes (#1758): #1718 #1731 #1739 #1742
* RTD: Fix GA Integration (#1718) GA was dropped from RTD in early Oct, 2024. This adds it again. * CI: Move Ubuntu 20.04 workflows to 22.04 (#1731) * Reactivate MPICH runner (gcc13_py312_mpich_h5_ad2) (#1739) * Revert "CI: Disable MPICH for now" This reverts commit de9e7ad. * We shall try installin MPICH from Spack for now Ubuntu package broken https://bugs.launchpad.net/ubuntu/+source/mpich/+bug/2072338 * Take out version checks * Revert "Take out version checks" This reverts commit b22e4b3. * Revert "We shall try installin MPICH from Spack for now" This reverts commit 33b847f. * Alternative approach: self-compiled MPICH * Move MPICH installation to separate file * Fix broken CI: Support for old CMake versions (#1742) * Check for broken CI * Deactivate dependencies that are not yet compatible with CMake 4.0 * Fixes * Upgrade Spack * Fix warning * Fixes after upgrading spack --------- Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
1 parent 9bc3edc commit e8debe1

File tree

25 files changed

+221
-214
lines changed

25 files changed

+221
-214
lines changed

‎.clang-tidy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# FIXME: all performance-* reports
33
# FIXME: all cert-* reports
44
# FIXME: all bugprone-* reports
5-
Checks: -*,bugprone-*,-bugprone-unhandled-self-assignment,-bugprone-parent-virtual-call,-bugprone-narrowing-conversions,-bugprone-exception-escape,-bugprone-string-literal-with-embedded-nul,cppcoreguidelines-slicing,mpi-*,readability-non-const-parameter,performance-*,modernize-*,-modernize-use-trailing-return-type,-modernize-use-bool-literals,-modernize-avoid-c-arrays,-modernize-use-auto,-modernize-return-braced-init-list
5+
Checks: -*,bugprone-*,-bugprone-unhandled-self-assignment,-bugprone-parent-virtual-call,-bugprone-narrowing-conversions,-bugprone-exception-escape,-bugprone-string-literal-with-embedded-nul,cppcoreguidelines-slicing,mpi-*,readability-non-const-parameter,performance-*,modernize-*,-modernize-use-trailing-return-type,-modernize-use-bool-literals,-modernize-avoid-c-arrays,-modernize-use-auto,-modernize-return-braced-init-list,-bugprone-easily-swappable-parameters
66
HeaderFilterRegex: '((^(?!\/share\/openPMD\/).*)*include\/openPMD\/.+\.hpp|src\/^(?!binding).+\.cpp$)'

.github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/spack.yaml renamed to .github/ci/spack-envs/clang11_nopy_nompi_h5_libcpp/spack.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spack:
1212
all:
1313
target: [x86_64]
1414
variants: ~mpi ~fortran
15-
compiler: [clang@7.0.1]
15+
compiler: [clang@11.1.0]
1616

1717
compilers:
1818
- compiler:
@@ -22,13 +22,13 @@ spack:
2222
cxxflags: -stdlib=libc++
2323
ldflags: -stdlib=libc++
2424
modules: []
25-
operating_system: ubuntu20.04
25+
operating_system: ubuntu22.04
2626
paths:
27-
cc: /usr/bin/clang-7
28-
cxx: /usr/bin/clang++-7
27+
cc: /usr/bin/clang-11
28+
cxx: /usr/bin/clang++-11
2929
f77: null
3030
fc: null
31-
spec: clang@7.0.1
31+
spec: clang@11.1.0
3232
target: x86_64
3333

3434
config:

.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2/spack.yaml renamed to .github/ci/spack-envs/clang11_nopy_ompi_h5_ad2/spack.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,47 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
15+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~blosc2 ~mgard
1616
cmake:
1717
externals:
18-
- spec: cmake@3.23.0
18+
- spec: cmake@3.31.5
1919
prefix: /usr
2020
buildable: False
2121
openmpi:
2222
externals:
23-
- spec: openmpi@2.1.1
23+
- spec: openmpi@4.1.2
2424
prefix: /usr
2525
buildable: False
2626
perl:
2727
externals:
28-
- spec: perl@5.26.1
28+
- spec: perl@5.34.0
2929
prefix: /usr
3030
buildable: False
3131
python:
3232
externals:
33-
- spec: python@3.8.0
33+
- spec: python@3.10.12
3434
prefix: /usr
3535
buildable: False
3636
all:
3737
target: [x86_64]
3838
variants: ~fortran
3939
providers:
4040
mpi: [openmpi]
41-
compiler: [clang@7.0.0]
41+
compiler: [clang@11.1.0]
4242

4343
compilers:
4444
- compiler:
4545
environment: {}
4646
extra_rpaths: []
4747
flags: {}
4848
modules: []
49-
operating_system: ubuntu20.04
49+
operating_system: ubuntu22.04
5050
paths:
51-
cc: /usr/lib/llvm-7/bin/clang
52-
cxx: /usr/lib/llvm-7/bin/clang++
51+
cc: /usr/bin/clang-11
52+
cxx: /usr/bin/clang++-11
5353
f77: /usr/bin/gfortran
5454
fc: /usr/bin/gfortran
55-
spec: clang@7.0.0
55+
spec: clang@11.1.0
5656
target: x86_64
5757

5858
config:

.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2_libcpp/spack.yaml renamed to .github/ci/spack-envs/clang11_nopy_ompi_h5_ad2_libcpp/spack.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
15+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~mgard ~blosc2
1616
cmake:
1717
externals:
18-
- spec: cmake@3.23.0
18+
- spec: cmake@3.31.5
1919
prefix: /usr
2020
buildable: False
2121
openmpi:
2222
externals:
23-
- spec: openmpi@2.1.1
23+
- spec: openmpi@4.1.2
2424
prefix: /usr
2525
buildable: False
2626
perl:
2727
externals:
28-
- spec: perl@5.26.1
28+
- spec: perl@5.34.0
2929
prefix: /usr
3030
buildable: False
3131
python:
3232
externals:
33-
- spec: python@3.8.0
33+
- spec: python@3.10.12
3434
prefix: /usr
3535
buildable: False
3636
all:
3737
target: [x86_64]
3838
variants: ~fortran
3939
providers:
4040
mpi: [openmpi]
41-
compiler: [clang@7.0.1]
41+
compiler: [clang@11.1.0]
4242

4343
compilers:
4444
- compiler:
@@ -48,13 +48,13 @@ spack:
4848
cxxflags: -stdlib=libc++
4949
ldflags: -stdlib=libc++
5050
modules: []
51-
operating_system: ubuntu20.04
51+
operating_system: ubuntu22.04
5252
paths:
53-
cc: /usr/bin/clang-7
54-
cxx: /usr/bin/clang++-7
53+
cc: /usr/bin/clang-11
54+
cxx: /usr/bin/clang++-11
5555
f77: /usr/bin/gfortran
5656
fc: /usr/bin/gfortran
57-
spec: clang@7.0.1
57+
spec: clang@11.1.0
5858
target: x86_64
5959

6060
config:

.github/ci/spack-envs/clang14_py311_nompi_h5_ad2/spack.yaml renamed to .github/ci/spack-envs/clang15_py311_nompi_h5_ad2/spack.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spack:
1313
hdf5:
1414
variants: ~mpi
1515
adios2:
16-
variants: ~mpi ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
16+
variants: ~mpi ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~mgard
1717
cmake:
1818
externals:
1919
- spec: cmake@3.22.1
@@ -34,7 +34,7 @@ spack:
3434
variants: ~fortran
3535
providers:
3636
mpi: [openmpi]
37-
compiler: [clang@14.0.0]
37+
compiler: [clang@15.0.7]
3838

3939
compilers:
4040
- compiler:
@@ -44,11 +44,11 @@ spack:
4444
modules: []
4545
operating_system: ubuntu22.04
4646
paths:
47-
cc: /usr/lib/llvm-14/bin/clang
48-
cxx: /usr/lib/llvm-14/bin/clang++
47+
cc: /usr/bin/clang-15
48+
cxx: /usr/bin/clang++-15
4949
f77: /usr/bin/gfortran
5050
fc: /usr/bin/gfortran
51-
spec: clang@14.0.0
51+
spec: clang@15.0.7
5252
target: x86_64
5353

5454
config:

‎.github/ci/spack-envs/clangtidy_nopy_ompi_h5_ad2/spack.yaml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,51 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
15+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~mgard
16+
c-blosc2:
17+
# snappy broken on CMake 4.0
18+
# fixed snappy not yet deployed to a Spack release
19+
variants: ~snappy
1620
cmake:
1721
externals:
18-
- spec: cmake@3.23.0
22+
- spec: cmake@3.31.5
1923
prefix: /usr
2024
buildable: False
2125
openmpi:
2226
externals:
23-
- spec: openmpi@2.1.1
27+
- spec: openmpi@4.1.2
2428
prefix: /usr
2529
buildable: False
2630
perl:
2731
externals:
28-
- spec: perl@5.26.1
32+
- spec: perl@5.34.0
2933
prefix: /usr
3034
buildable: False
3135
python:
3236
externals:
33-
- spec: python@3.8.0
37+
- spec: python@3.10.12
3438
prefix: /usr
3539
buildable: False
3640
all:
3741
target: [x86_64]
3842
variants: ~fortran
3943
providers:
4044
mpi: [openmpi]
41-
compiler: [clang@10.0.0]
45+
compiler: [clang@14.0.0]
4246

4347
compilers:
4448
- compiler:
4549
environment: {}
4650
extra_rpaths: []
4751
flags: {}
4852
modules: []
49-
operating_system: ubuntu20.04
53+
operating_system: ubuntu22.04
5054
paths:
51-
cc: /usr/lib/llvm-10/bin/clang
52-
cxx: /usr/lib/llvm-10/bin/clang++
55+
cc: /usr/bin/clang-14
56+
cxx: /usr/bin/clang++-14
5357
f77: /usr/bin/gfortran
5458
fc: /usr/bin/gfortran
55-
spec: clang@10.0.0
59+
spec: clang@14.0.0
5660
target: x86_64
5761

5862
config:

.github/ci/spack-envs/gcc7_py36_ompi_h5_ad2/spack.yaml renamed to .github/ci/spack-envs/gcc12_py36_ompi_h5_ad2/spack.yaml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,52 @@ spack:
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
15+
# mgard not supported on CMake 4.0 due to unresolved compatibility
16+
# issue in dependency yaml-cpp
17+
# https://github.com/jbeder/yaml-cpp/issues/1352
18+
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~mgard
19+
c-blosc2:
20+
# snappy broken on CMake 4.0
21+
# fixed snappy not yet deployed to a Spack release
22+
variants: ~snappy
1623
cmake:
1724
externals:
18-
- spec: cmake@3.23.0
25+
- spec: cmake@3.31.5
1926
prefix: /usr
2027
buildable: False
2128
openmpi:
2229
externals:
23-
- spec: openmpi@2.1.1
30+
- spec: openmpi@4.1.2
2431
prefix: /usr
2532
buildable: False
2633
perl:
2734
externals:
28-
- spec: perl@5.26.1
35+
- spec: perl@5.34.0
2936
prefix: /usr
3037
buildable: False
3138
python:
3239
externals:
33-
- spec: python@3.6.3
40+
- spec: python@3.10.12
3441
prefix: /usr
3542
buildable: False
3643
all:
3744
target: [x86_64]
3845
variants: ~fortran
39-
compiler: [gcc@7.0.0]
46+
compiler: [gcc@12.3.0]
4047

4148
compilers:
4249
- compiler:
4350
environment: {}
4451
extra_rpaths: []
4552
flags: {}
4653
modules: []
47-
operating_system: ubuntu20.04
54+
operating_system: ubuntu22.04
4855
paths:
49-
cc: /usr/bin/gcc-7
50-
cxx: /usr/bin/g++-7
56+
cc: /usr/bin/gcc-12
57+
cxx: /usr/bin/g++-12
5158
f77: /usr/bin/gfortran
5259
fc: /usr/bin/gfortran
53-
spec: gcc@7.0.0
60+
spec: gcc@12.3.0
5461
target: x86_64
5562

5663
config:

.github/ci/spack-envs/clang8_py38_mpich_h5_ad2/spack.yaml renamed to .github/ci/spack-envs/gcc13_py312_mpich_h5_ad2/spack.yaml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,59 @@
66
#
77
spack:
88
specs:
9-
- adios2@2.7.1
10-
- hdf5
9+
- adios2@2.10 +mpi
10+
- hdf5 +mpi
1111
- mpich
1212

1313
packages:
1414
adios2:
15-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
15+
variants: +mpi ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2 ~blosc2 ~mgard
1616
cmake:
1717
externals:
18-
- spec: cmake@3.23.0
19-
prefix: /usr
18+
- spec: cmake@3.31.6
19+
prefix: /usr/local
2020
buildable: False
21+
hdf5:
22+
variants: +mpi
2123
mpich:
2224
externals:
23-
- spec: mpich@3.3
24-
prefix: /usr
25+
- spec: mpich@4.2.1
26+
prefix: /usr/local
2527
buildable: False
2628
perl:
2729
externals:
28-
- spec: perl@5.26.1
30+
- spec: perl@5.38.2
2931
prefix: /usr
3032
buildable: False
3133
python:
3234
externals:
33-
- spec: python@3.8.0
35+
- spec: python@3.12.3
3436
prefix: /usr
3537
buildable: False
3638
all:
3739
target: [x86_64]
3840
variants: ~fortran
3941
providers:
4042
mpi: [mpich]
41-
compiler: [clang@8.0.0]
43+
compiler: [gcc@13.3.0]
4244

4345
compilers:
4446
- compiler:
4547
environment: {}
4648
extra_rpaths: []
4749
flags: {}
4850
modules: []
49-
operating_system: ubuntu20.04
51+
operating_system: ubuntu24.04
5052
paths:
51-
cc: /usr/lib/llvm-8/bin/clang
52-
cxx: /usr/lib/llvm-8/bin/clang++
53+
cc: /usr/bin/gcc
54+
cxx: /usr/bin/g++
5355
f77: /usr/bin/gfortran
5456
fc: /usr/bin/gfortran
55-
spec: clang@8.0.0
57+
spec: gcc@13.3.0
5658
target: x86_64
5759

5860
config:
59-
build_jobs: 2
61+
build_jobs: 4
6062

6163
mirrors:
6264
E4S: https://cache.e4s.io

‎.github/workflows/dependencies/install_mpich‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
#
3+
4+
set -eu -o pipefail
5+
6+
mpich_ver="4.3.0"
7+
8+
cd /opt
9+
wget https://www.mpich.org/static/downloads/${mpich_ver}/mpich-${mpich_ver}.tar.gz
10+
tar -xzf mpich-${mpich_ver}.tar.gz
11+
cd mpich-${mpich_ver}
12+
./configure --prefix=/usr/local
13+
make -j 4
14+
make -j 4 install
15+
cd ..
16+
rm -rf mpich-${mpich_ver} mpich-${mpich_ver}.tar.gz

0 commit comments

Comments
 (0)