diff --git a/.github/workflows/h5bench-hdf5-develop-test.yml b/.github/workflows/h5bench-hdf5-develop-test.yml index 251b25c2..e995e9e1 100644 --- a/.github/workflows/h5bench-hdf5-develop-test.yml +++ b/.github/workflows/h5bench-hdf5-develop-test.yml @@ -7,7 +7,7 @@ on: jobs: h5bench: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 60 env: OMPI_ALLOW_RUN_AS_ROOT: 1 @@ -102,7 +102,7 @@ jobs: cmake .. \ -DH5BENCH_ALL=ON - make -j 2 + make sudo make install sudo ldconfig @@ -121,7 +121,7 @@ jobs: -DWITH_ASYNC_VOL:BOOL=ON \ -DCMAKE_C_FLAGS="-I$ASYNC_HOME/include -L$ASYNC_HOME/lib" \ -DH5BENCH_ALL=ON - make -j 2 + make sudo make install sudo ldconfig diff --git a/.github/workflows/h5bench-hdf5-develop.yml b/.github/workflows/h5bench-hdf5-develop.yml index 8f981e4c..b68c92e2 100644 --- a/.github/workflows/h5bench-hdf5-develop.yml +++ b/.github/workflows/h5bench-hdf5-develop.yml @@ -7,7 +7,7 @@ on: jobs: h5bench: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 60 env: OMPI_ALLOW_RUN_AS_ROOT: 1 @@ -100,7 +100,7 @@ jobs: cmake .. \ -DH5BENCH_ALL=ON - make -j 2 + make sudo make install sudo ldconfig @@ -121,7 +121,7 @@ jobs: -DWITH_ASYNC_VOL:BOOL=ON \ -DCMAKE_C_FLAGS="-I$ASYNC_HOME/include -L$ASYNC_HOME/lib" \ -DH5BENCH_ALL=ON - make -j 2 + make sudo make install sudo ldconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcbf5f9a..2360447c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,7 +130,6 @@ metrics-perlmutter: - export NERSC_HOST=`cat /etc/clustername` - module load python - module load darshan - - export LD_PRELOAD="$DARSHAN_BASE_DIR/lib/libdarshan.so" - echo "h5bench SYNC" - cd ${H5BENCH_BUILD_PATH}/perlmutter-metrics - export LD_LIBRARY_PATH=$HDF5_DIR/lib:$LD_LIBRARY_PATH diff --git a/CMakeLists.txt b/CMakeLists.txt index ecf3f0f5..71959922 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,7 +233,7 @@ if(H5BENCH_E3SM) ExternalProject_Add(h5bench_e3sm SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/e3sm CONFIGURE_COMMAND autoreconf -i COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/e3sm/configure --prefix=${CMAKE_BINARY_DIR} --with-hdf5=${HDF5_HOME} - BUILD_COMMAND make + BUILD_COMMAND make -j 1 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy src/e3sm_io ${CMAKE_BINARY_DIR}/h5bench_e3sm BUILD_IN_SOURCE 1 LOG_CONFIGURE 1 diff --git a/docs/source/macsio.rst b/docs/source/macsio.rst index f7989b44..84d75be6 100644 --- a/docs/source/macsio.rst +++ b/docs/source/macsio.rst @@ -5,7 +5,7 @@ MACSio (Multi-purpose, Application-Centric, Scalable I/O Proxy Application) is b MACSio in h5bench only supports the HDF5 interface. You need to have the `json-cwx `_ dependency library installed prior to compiling it in h5bench. -You can find more information in MACSio `GitHub repository `_. +You can find more information in MACSio `GitHub repository `_. Configuration ------------- @@ -38,4 +38,4 @@ To run an instance of MACSio HDF5 benchmark you need to include the following in "parallel_file_mode": "MIF 8", "part_size": "1M" } - } \ No newline at end of file + }