Skip to content

Commit 346e5b7

Browse files
jeanbezjeanbez
authored
Merge branch 'master' into develop
2 parents 1236964 + 675c86d commit 346e5b7

39 files changed

+976
-578
lines changed

‎.github/workflows/h5bench-hdf5-1.10.4.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- master
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
h5bench:
1418
runs-on: ubuntu-24.04

‎.github/workflows/h5bench-hdf5-1.10.7.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- master
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
h5bench:
1418
runs-on: ubuntu-24.04

‎.github/workflows/h5bench-hdf5-1.10.8.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- master
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
h5bench:
1418
runs-on: ubuntu-24.04

‎.github/workflows/h5bench-hdf5-1.12.0.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- master
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
h5bench:
1418
runs-on: ubuntu-24.04

‎.github/workflows/h5bench-hdf5-1.14.0.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- master
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
h5bench:
1418
runs-on: ubuntu-24.04

‎.github/workflows/h5bench-hdf5-1.14.1.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- master
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
h5bench:
1418
runs-on: ubuntu-24.04

‎.github/workflows/h5bench-hdf5-develop-test.yml‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ on:
55

66
workflow_dispatch:
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
h5bench:
10-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-24.04
1115
timeout-minutes: 60
1216
allow_failure: true
1317
env:
@@ -36,16 +40,26 @@ jobs:
3640
- name: Build HDF5 develop
3741
run: |
3842
export HDF5_DIR=/opt/hdf5
39-
export HDF5_LIBTOOL=/usr/bin/libtoolize
40-
43+
4144
mkdir $HDF5_DIR
45+
mkdir hdf5/build
4246
43-
cd hdf5
47+
cd hdf5/build
4448
4549
mkdir build
4650
cd build
4751
48-
CC=mpicc cmake -DCMAKE_INSTALL_PREFIX=$HDF5_DIR -DHDF5_ENABLE_PARALLEL=ON -DHDF5_ALLOW_UNSUPPORTED=ON -DHDF5_ENABLE_THREADSAFE=ON -DBUILD_STATIC_LIBS=OFF ..
52+
CC=mpicc cmake \
53+
-DCMAKE_INSTALL_PREFIX=$HDF5_DIR \
54+
-DHDF5_ENABLE_PARALLEL=ON \
55+
-DHDF5_ENABLE_THREADSAFE=ON \
56+
-DHDF5_ALLOW_UNSUPPORTED=ON \
57+
-DBUILD_TESTING=OFF \
58+
-DHDF5_BUILD_HL_LIB=OFF \
59+
-DHDF5_BUILD_EXAMPLES=OFF \
60+
-DHDF5_BUILD_TOOLS:BOOL=OFF \
61+
-DBUILD_STATIC_LIBS=OFF \
62+
-DCMAKE_C_COMPILER=mpicc ..
4963
5064
make -j 2
5165
make install
@@ -105,7 +119,7 @@ jobs:
105119
106120
cmake .. \
107121
-DH5BENCH_ALL=ON
108-
make -j 2
122+
make
109123
sudo make install
110124
sudo ldconfig
111125
@@ -124,7 +138,7 @@ jobs:
124138
-DWITH_ASYNC_VOL:BOOL=ON \
125139
-DCMAKE_C_FLAGS="-I$ASYNC_HOME/include -L$ASYNC_HOME/lib" \
126140
-DH5BENCH_ALL=ON
127-
make -j 2
141+
make
128142
sudo make install
129143
sudo ldconfig
130144
@@ -154,5 +168,7 @@ jobs:
154168
uses: actions/upload-artifact@v5
155169
with:
156170
name: test
157-
path: build*/storage/**/std*
171+
path: |
172+
build*/storage/**/std*
173+
build*/h5bench_e3sm-prefix/src/h5bench_e3sm-stamp/h5bench_e3sm-build-*.log
158174
retention-days: 5

‎.github/workflows/h5bench-hdf5-develop.yml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
h5bench:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04
1111
timeout-minutes: 60
1212
allow_failure: true
1313
env:
@@ -34,16 +34,26 @@ jobs:
3434
- name: Build HDF5 develop
3535
run: |
3636
export HDF5_DIR=/opt/hdf5
37-
export HDF5_LIBTOOL=/usr/bin/libtoolize
38-
37+
3938
mkdir $HDF5_DIR
39+
mkdir hdf5/build
4040
41-
cd hdf5
41+
cd hdf5/build
4242
4343
mkdir build
4444
cd build
4545
46-
CC=mpicc cmake -DCMAKE_INSTALL_PREFIX=$HDF5_DIR -DHDF5_ENABLE_PARALLEL=ON -DHDF5_ALLOW_UNSUPPORTED=ON -DHDF5_ENABLE_THREADSAFE=ON -DBUILD_STATIC_LIBS=OFF ..
46+
cmake \
47+
-DCMAKE_INSTALL_PREFIX=$HDF5_DIR \
48+
-DHDF5_ENABLE_PARALLEL=ON \
49+
-DHDF5_ENABLE_THREADSAFE=ON \
50+
-DHDF5_ALLOW_UNSUPPORTED=ON \
51+
-DBUILD_TESTING=OFF \
52+
-DHDF5_BUILD_HL_LIB=OFF \
53+
-DHDF5_BUILD_EXAMPLES=OFF \
54+
-DHDF5_BUILD_TOOLS:BOOL=OFF \
55+
-DBUILD_STATIC_LIBS=OFF \
56+
-DCMAKE_C_COMPILER=mpicc ..
4757
4858
make -j 2
4959
make install
@@ -103,7 +113,7 @@ jobs:
103113
104114
cmake .. \
105115
-DH5BENCH_ALL=ON
106-
make -j 2
116+
make
107117
sudo make install
108118
sudo ldconfig
109119
@@ -124,7 +134,7 @@ jobs:
124134
-DWITH_ASYNC_VOL:BOOL=ON \
125135
-DCMAKE_C_FLAGS="-I$ASYNC_HOME/include -L$ASYNC_HOME/lib" \
126136
-DH5BENCH_ALL=ON
127-
make -j 2
137+
make
128138
sudo make install
129139
sudo ldconfig
130140
@@ -151,10 +161,6 @@ jobs:
151161
152162
./h5bench --debug --abort-on-failure ../samples/async-write-read-contig-1d-small.json
153163
154-
- name: Setup tmate session
155-
if: ${{ failure() }}
156-
uses: mxschmitt/action-tmate@v3
157-
158164
- name: Test h5bench SYNC write 1D contiguous (memory) strided (file)
159165
run: |
160166
export HDF5_HOME=/opt/hdf5
@@ -647,5 +653,7 @@ jobs:
647653
uses: actions/upload-artifact@v5
648654
with:
649655
name: test
650-
path: build*/storage/**/std*
656+
path: |
657+
build*/storage/**/std*
658+
build*/h5bench_e3sm-prefix/src/h5bench_e3sm-stamp/h5bench_e3sm-build-*.log
651659
retention-days: 5

‎.github/workflows/nersc.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: NERSC
2+
3+
on:
4+
pull_request_target
5+
6+
env:
7+
PR_NUMBER: ${{ github.event.number }}
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
authorize:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- run: true
18+
19+
sync-with-nersc:
20+
needs: authorize
21+
runs-on: ubuntu-latest
22+
timeout-minutes: 2
23+
24+
steps:
25+
- uses: actions/checkout@v3
26+
with:
27+
fetch-depth: 0
28+
29+
- name: Setup git
30+
run: |
31+
git config --global user.name "h5bench BOT"
32+
git config --global user.email "[email protected]"
33+
34+
- name: Create PR branch
35+
run: |
36+
PR_SHA=$(git rev-parse --short "$GITHUB_SHA")
37+
git fetch origin pull/${PR_NUMBER}/head:PR-${PR_SHA}
38+
git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
39+
git checkout PR-${PR_SHA}
40+
git push -f -u gitlab PR-${PR_SHA}

0 commit comments

Comments
 (0)