Skip to content

Commit 617c36e

Browse files
authored
Update macsio.rst (#122)
* Update macsio.rst * Update CMakeLists.txt * Update .gitlab-ci.yml * Update h5bench-hdf5-develop.yml * Update h5bench-hdf5-develop-test.yml
1 parent 06a7d4d commit 617c36e

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

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

Lines changed: 3 additions & 3 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-22.04
1111
timeout-minutes: 60
1212
env:
1313
OMPI_ALLOW_RUN_AS_ROOT: 1
@@ -102,7 +102,7 @@ jobs:
102102
103103
cmake .. \
104104
-DH5BENCH_ALL=ON
105-
make -j 2
105+
make
106106
sudo make install
107107
sudo ldconfig
108108
@@ -121,7 +121,7 @@ jobs:
121121
-DWITH_ASYNC_VOL:BOOL=ON \
122122
-DCMAKE_C_FLAGS="-I$ASYNC_HOME/include -L$ASYNC_HOME/lib" \
123123
-DH5BENCH_ALL=ON
124-
make -j 2
124+
make
125125
sudo make install
126126
sudo ldconfig
127127

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

Lines changed: 3 additions & 3 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-22.04
1111
timeout-minutes: 60
1212
env:
1313
OMPI_ALLOW_RUN_AS_ROOT: 1
@@ -100,7 +100,7 @@ jobs:
100100
101101
cmake .. \
102102
-DH5BENCH_ALL=ON
103-
make -j 2
103+
make
104104
sudo make install
105105
sudo ldconfig
106106
@@ -121,7 +121,7 @@ jobs:
121121
-DWITH_ASYNC_VOL:BOOL=ON \
122122
-DCMAKE_C_FLAGS="-I$ASYNC_HOME/include -L$ASYNC_HOME/lib" \
123123
-DH5BENCH_ALL=ON
124-
make -j 2
124+
make
125125
sudo make install
126126
sudo ldconfig
127127

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ metrics-perlmutter:
130130
- export NERSC_HOST=`cat /etc/clustername`
131131
- module load python
132132
- module load darshan
133-
- export LD_PRELOAD="$DARSHAN_BASE_DIR/lib/libdarshan.so"
134133
- echo "h5bench SYNC"
135134
- cd ${H5BENCH_BUILD_PATH}/perlmutter-metrics
136135
- export LD_LIBRARY_PATH=$HDF5_DIR/lib:$LD_LIBRARY_PATH

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ if(H5BENCH_E3SM)
233233
ExternalProject_Add(h5bench_e3sm
234234
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/e3sm
235235
CONFIGURE_COMMAND autoreconf -i COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/e3sm/configure --prefix=${CMAKE_BINARY_DIR} --with-hdf5=${HDF5_HOME}
236-
BUILD_COMMAND make
236+
BUILD_COMMAND make -j 1
237237
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy src/e3sm_io ${CMAKE_BINARY_DIR}/h5bench_e3sm
238238
BUILD_IN_SOURCE 1
239239
LOG_CONFIGURE 1

docs/source/macsio.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACSio (Multi-purpose, Application-Centric, Scalable I/O Proxy Application) is b
55

66
MACSio in h5bench only supports the HDF5 interface. You need to have the `json-cwx <https://github.com/LLNL/json-cwx>`_ dependency library installed prior to compiling it in h5bench.
77

8-
You can find more information in MACSio `GitHub repository <https://github.com/Parallel-NetCDF/E3SM-IO>`_.
8+
You can find more information in MACSio `GitHub repository <https://github.com/LLNL/MACSio>`_.
99

1010
Configuration
1111
-------------
@@ -38,4 +38,4 @@ To run an instance of MACSio HDF5 benchmark you need to include the following in
3838
"parallel_file_mode": "MIF 8",
3939
"part_size": "1M"
4040
}
41-
}
41+
}

0 commit comments

Comments
 (0)