test against OpenPMD 0.15.2

HDFGroup · Sep 26, 2023 · 2e3b2e3 · 2e3b2e3
1 parent e3cb362
commit 2e3b2e3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/mac_mpich.yml b/.github/workflows/mac_mpich.yml
@@ -83,6 +83,7 @@ jobs:
             autoreconf -i
             ./configure --with-hdf5=${GITHUB_WORKSPACE}/HDF5 \
                         --enable-test-netcdf4=${GITHUB_WORKSPACE}/NetCDF \
+                        --enable-test-openpmd \
                         CFLAGS="-O0 -g" CXXFLAGS="-O0 -g -std=c++14" LIBS=-lstdc++
             # Do NOT test QMCPACK, as it requires FFTW which fails to build
         - name: Print config.log if error

diff --git a/.github/workflows/ubuntu_mpich.yml b/.github/workflows/ubuntu_mpich.yml
@@ -106,6 +106,7 @@ jobs:
             ./configure --with-hdf5=${GITHUB_WORKSPACE}/HDF5 \
                         --enable-test-netcdf4=${GITHUB_WORKSPACE}/NetCDF \
                         --enable-test-hdf5-iotest \
+                        --enable-test-openpmd \
                         --with-mpi=${GITHUB_WORKSPACE}/MPICH
             # Do NOT test QMCPACK, as it requires FFTW which fails to build
         - name: Print config.log if error

diff --git a/.github/workflows/ubuntu_openmpi.yml b/.github/workflows/ubuntu_openmpi.yml
@@ -101,6 +101,7 @@ jobs:
             ./configure --with-hdf5=${GITHUB_WORKSPACE}/HDF5 \
                         --enable-test-netcdf4=${GITHUB_WORKSPACE}/NetCDF \
                         --enable-test-hdf5-iotest \
+                        --enable-test-openpmd \
                         TESTMPIRUN="mpiexec --oversubscribe -n NP"
             # Do NOT test QMCPACK, as it requires FFTW which fails to build
         - name: Print config.log if error

diff --git a/configure.ac b/configure.ac
@@ -675,7 +675,7 @@ if test "x${have_openpmd}" = xyes; then
    mkdir -p tests/external/openpmd
    cd tests/external/openpmd
    rm -rf ./openPMD-api
-   openpmd_version=0.14.5
+   openpmd_version=0.15.2
    rm -f openPMD-api.tar.gz
    ${download_cmd} https://github.com/openPMD/openPMD-api/archive/refs/tags/${openpmd_version}.tar.gz -O openPMD-api.tar.gz
    AC_MSG_RESULT([${openpmd_version}.tar.gz])
@@ -804,10 +804,29 @@ fi
 echo "\
 
    External test programs:
-              hdf5-iotest    - ${have_hdf5io}
-              NetCDF-4       - ${have_netcdf4}
-              QMCPACK        - ${have_qmcpack}
-              OpenPMD        - ${have_openpmd}
+              hdf5-iotest    - ${have_hdf5io}"
+if test "x${have_netcdf4}" = xyes ; then
+   echo "\
+              NetCDF-4       - ${have_netcdf4} (${netcdf_version})"
+else
+   echo "\
+              NetCDF-4       - ${have_netcdf4}"
+fi
+if test "x${have_qmcpack}" = xyes ; then
+   echo "\
+              QMCPACK        - ${have_qmcpack} (${qmcpack_version})"
+else
+   echo "\
+              QMCPACK        - ${have_qmcpack}"
+fi
+if test "x${have_openpmd}" = xyes ; then
+   echo "\
+              OpenPMD        - ${have_openpmd} (${openpmd_version})"
+else
+   echo "\
+              OpenPMD        - ${have_openpmd}"
+fi
+   echo "\
 
    Now run 'make' to build the executable.
 

diff --git a/tests/external/openpmd/test.sh b/tests/external/openpmd/test.sh
@@ -25,7 +25,7 @@ ${RUN} ./8a_benchmark_write_parallel > 8a_benchmark_write_parallel.log
 # echo "${RUN} ./8b_benchmark_read_parallel ../samples/8a_parallel_3Db_0000001.h5 sy > 8b_benchmark_read_parallel.log"
 # ${RUN} ./8b_benchmark_read_parallel ../samples/8a_parallel_3Db_0000001.h5 sy > 8b_benchmark_read_parallel.log
 
-outfile=../samples/8a_parallel_3Db_0000001.h5
+outfile=../samples/8a_parallel_3Db.h5
 err=0
 unset HDF5_VOL_CONNECTOR
 unset HDF5_PLUGIN_PATH