Merge branch 'master' into fix-normal-dist-test-name

hpc-io · Jun 25, 2024 · 4bc3de6 · 4bc3de6
2 parents 6968899 + 617c36e
commit 4bc3de6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git 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
@@ -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
@@ -11,6 +11,9 @@ build-perlmutter:
     stage: build
     when: manual
     allow_failure: false
+    id_tokens:
+        SITE_ID_TOKEN:
+            aud: https://software.nersc.gov/
     rules:
         - if: '$METRICS == null'
     tags:
@@ -36,6 +39,9 @@ build-perlmutter:
 
 test-perlmutter:
     stage: test
+    id_tokens:
+        SITE_ID_TOKEN:
+            aud: https://software.nersc.gov/
     rules:
         - if: '$METRICS == null'
     needs: ["build-perlmutter"]
@@ -77,6 +83,9 @@ test-perlmutter:
 
 build-perlmutter-metrics:
     stage: build
+    id_tokens:
+        SITE_ID_TOKEN:
+            aud: https://software.nersc.gov/
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $METRICS == "true"'
     tags:
@@ -102,6 +111,9 @@ build-perlmutter-metrics:
 
 metrics-perlmutter:
     stage: metrics
+    id_tokens:
+        SITE_ID_TOKEN:
+            aud: https://software.nersc.gov/
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $METRICS == "true"'
     needs: ["build-perlmutter-metrics"]
@@ -118,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
@@ -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
@@ -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 <https://github.com/LLNL/json-cwx>`_ dependency library installed prior to compiling it in h5bench.
 
-You can find more information in MACSio `GitHub repository <https://github.com/Parallel-NetCDF/E3SM-IO>`_.
+You can find more information in MACSio `GitHub repository <https://github.com/LLNL/MACSio>`_.
 
 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"
         }
-    }
+    }
diff --git a/samples/metrics-perlmutter.json b/samples/metrics-perlmutter.json
@@ -1,7 +1,7 @@
 {
     "mpi": {
         "command": "srun",
-        "configuration": "-A m2621 --qos=debug --constraint=cpu --tasks-per-node=64 -N 8 -n 512 -t 00:30:00"
+        "configuration": "--tasks-per-node=64 -N 8 -n 512 -t 00:30:00"
     },
     "vol": {
 
@@ -53,4 +53,4 @@
             }
         }
     ]
-}
+}