Skip to content

Commit e6a18e7

Browse files
eschnetteschnett
committed
Merge branch 'dev' into eschnett/julia-bindings
* dev: (70 commits) Docs: Recommend Static Build for Superbuilds (openPMD#1325) Python 3.11 (openPMD#1323) pybind11: v2.10.1+ (openPMD#1322) Add Attribute::getOptional<T>() and use to add some more dynamic datatype conversions at read time (openPMD#1278) Mapping between ADIOS steps and openPMD iterations (openPMD#949) Deprecate shareRaw (openPMD#1229) Fix append mode double attributes (openPMD#1302) Constant scalars: Don't flush double (openPMD#1315) Remove caching cmake vars (openPMD#1313) [pre-commit.ci] pre-commit autoupdate (openPMD#1311) storeChunk: Add an overload for shared_ptr<T[]> (openPMD#1296) Fix `operationAsString` Export (openPMD#1309) ADIOS2: more fine-grained control for file endings (openPMD#1218) [pre-commit.ci] pre-commit autoupdate (openPMD#1307) Fix file existence check in parallel tests (openPMD#1303) ADIOS2: Flush to disk within a step (openPMD#1207) [pre-commit.ci] pre-commit autoupdate (openPMD#1304) [pre-commit.ci] pre-commit autoupdate (openPMD#1295) Update catch2 to v2.13.9 (openPMD#1299) [pre-commit.ci] pre-commit autoupdate (openPMD#1292) ... # Conflicts: # .github/workflows/linux.yml
2 parents 84bce33 + 97890ee commit e6a18e7

213 files changed

Lines changed: 16159 additions & 7197 deletions

File tree

Some content is hidden

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

‎.clang-format‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
Language: Cpp
23

34
BasedOnStyle: LLVM
@@ -64,3 +65,8 @@ SpacesInParentheses: false
6465
SpacesInSquareBrackets: false
6566
Standard: Auto
6667
StatementMacros: ["OPENPMD_private", "OPENPMD_protected"]
68+
69+
---
70+
Language: Json
71+
BasedOnStyle: llvm
72+
...

‎.github/ci/sanitizer/clang/Leak.supp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ leak:adios_inq_var
1515
# ADIOS2
1616
leak:adios2::core::engine::SstReader::*
1717
leak:adios2::core::engine::SstWriter::*
18+
leak:ps_make_timer_name_

.github/ci/spack-envs/clang12_py38_nompi_h5_ad1_ad2/spack.yaml renamed to .github/ci/spack-envs/clang14_py311_nompi_h5_ad1_ad2/spack.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,43 @@ spack:
1919
variants: ~mpi ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
2020
cmake:
2121
externals:
22-
- spec: "cmake"
22+
- spec: cmake@3.22.1
2323
prefix: /usr
2424
buildable: False
2525
perl:
2626
externals:
27-
- spec: "perl"
27+
- spec: perl@5.34.0
2828
prefix: /usr
2929
buildable: False
3030
python:
3131
externals:
32-
- spec: "python"
32+
- spec: python@3.11.0
3333
prefix: /usr
3434
buildable: False
3535
all:
36-
target: ['x86_64']
36+
target: [x86_64]
3737
variants: ~fortran
3838
providers:
3939
mpi: [openmpi]
40-
compiler: [clang@12.0.0]
40+
compiler: [clang@14.0.0]
4141

4242
compilers:
4343
- compiler:
4444
environment: {}
4545
extra_rpaths: []
4646
flags: {}
4747
modules: []
48-
operating_system: ubuntu20.04
48+
operating_system: ubuntu22.04
4949
paths:
50-
cc: /usr/lib/llvm-12/bin/clang
51-
cxx: /usr/lib/llvm-12/bin/clang++
50+
cc: /usr/lib/llvm-14/bin/clang
51+
cxx: /usr/lib/llvm-14/bin/clang++
5252
f77: /usr/bin/gfortran
5353
fc: /usr/bin/gfortran
54-
spec: clang@12.0.0
54+
spec: clang@14.0.0
5555
target: x86_64
5656

5757
config:
5858
build_jobs: 2
59+
60+
mirrors:
61+
E4S: https://cache.e4s.io

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spack:
1010

1111
packages:
1212
all:
13-
target: ['x86_64']
13+
target: [x86_64]
1414
variants: ~mpi ~fortran
1515
compiler: [clang@6.0.0]
1616

@@ -33,3 +33,6 @@ spack:
3333

3434
config:
3535
build_jobs: 2
36+
37+
mirrors:
38+
E4S: https://cache.e4s.io

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ spack:
1818
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
1919
cmake:
2020
externals:
21-
- spec: "cmake"
21+
- spec: cmake@3.23.0
2222
prefix: /usr
2323
buildable: False
2424
openmpi:
2525
externals:
26-
- spec: "openmpi"
26+
- spec: openmpi@2.1.1
2727
prefix: /usr
2828
buildable: False
2929
perl:
3030
externals:
31-
- spec: "perl"
31+
- spec: perl@5.26.1
3232
prefix: /usr
3333
buildable: False
3434
python:
3535
externals:
36-
- spec: "python"
36+
- spec: python@3.8.0
3737
prefix: /usr
3838
buildable: False
3939
all:
40-
target: ['x86_64']
40+
target: [x86_64]
4141
variants: ~fortran
4242
providers:
4343
mpi: [openmpi]
@@ -62,3 +62,6 @@ spack:
6262

6363
config:
6464
build_jobs: 2
65+
66+
mirrors:
67+
E4S: https://cache.e4s.io

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ spack:
1818
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
1919
cmake:
2020
externals:
21-
- spec: "cmake"
21+
- spec: cmake@3.23.0
2222
prefix: /usr
2323
buildable: False
2424
openmpi:
2525
externals:
26-
- spec: "openmpi"
26+
- spec: openmpi@2.1.1
2727
prefix: /usr
2828
buildable: False
2929
perl:
3030
externals:
31-
- spec: "perl"
31+
- spec: perl@5.26.1
3232
prefix: /usr
3333
buildable: False
3434
python:
3535
externals:
36-
- spec: "python"
36+
- spec: python@3.8.0
3737
prefix: /usr
3838
buildable: False
3939
all:
40-
target: ['x86_64']
40+
target: [x86_64]
4141
variants: ~fortran
4242
providers:
4343
mpi: [openmpi]
@@ -60,3 +60,6 @@ spack:
6060

6161
config:
6262
build_jobs: 2
63+
64+
mirrors:
65+
E4S: https://cache.e4s.io

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
spack:
88
specs:
99
- adios
10-
- adios2
10+
- adios2@2.7.1
1111
- hdf5
1212
- mpich
1313

@@ -18,26 +18,26 @@ spack:
1818
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
1919
cmake:
2020
externals:
21-
- spec: "cmake"
21+
- spec: cmake@3.23.0
2222
prefix: /usr
2323
buildable: False
2424
mpich:
2525
externals:
26-
- spec: "mpich"
26+
- spec: mpich@3.3
2727
prefix: /usr
2828
buildable: False
2929
perl:
3030
externals:
31-
- spec: "perl"
31+
- spec: perl@5.26.1
3232
prefix: /usr
3333
buildable: False
3434
python:
3535
externals:
36-
- spec: "python"
36+
- spec: python@3.8.0
3737
prefix: /usr
3838
buildable: False
3939
all:
40-
target: ['x86_64']
40+
target: [x86_64]
4141
variants: ~fortran
4242
providers:
4343
mpi: [mpich]
@@ -60,3 +60,6 @@ spack:
6060

6161
config:
6262
build_jobs: 2
63+
64+
mirrors:
65+
E4S: https://cache.e4s.io

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ spack:
1818
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
1919
cmake:
2020
externals:
21-
- spec: "cmake"
21+
- spec: cmake@3.23.0
2222
prefix: /usr
2323
buildable: False
2424
openmpi:
2525
externals:
26-
- spec: "openmpi"
26+
- spec: openmpi@2.1.1
2727
prefix: /usr
2828
buildable: False
2929
perl:
3030
externals:
31-
- spec: "perl"
31+
- spec: perl@5.26.1
3232
prefix: /usr
3333
buildable: False
3434
python:
3535
externals:
36-
- spec: "python"
36+
- spec: python@3.8.0
3737
prefix: /usr
3838
buildable: False
3939
all:
40-
target: ['x86_64']
40+
target: [x86_64]
4141
variants: ~fortran
4242
providers:
4343
mpi: [openmpi]
@@ -60,3 +60,6 @@ spack:
6060

6161
config:
6262
build_jobs: 2
63+
64+
mirrors:
65+
E4S: https://cache.e4s.io

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ spack:
1818
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
1919
cmake:
2020
externals:
21-
- spec: "cmake"
21+
- spec: cmake@3.23.0
2222
prefix: /usr
2323
buildable: False
2424
openmpi:
2525
externals:
26-
- spec: "openmpi"
26+
- spec: openmpi@2.1.1
2727
prefix: /usr
2828
buildable: False
2929
perl:
3030
externals:
31-
- spec: "perl"
31+
- spec: perl@5.26.1
3232
prefix: /usr
3333
buildable: False
3434
python:
3535
externals:
36-
- spec: "python"
36+
- spec: python@3.6.3
3737
prefix: /usr
3838
buildable: False
3939
all:
40-
target: ['x86_64']
40+
target: [x86_64]
4141
variants: ~fortran
4242
compiler: [gcc@7.0.0]
4343

@@ -58,3 +58,6 @@ spack:
5858

5959
config:
6060
build_jobs: 2
61+
62+
mirrors:
63+
E4S: https://cache.e4s.io

0 commit comments

Comments
 (0)