From f89059c10d0d61f4a435e3b8cd07c2b76e24b95a Mon Sep 17 00:00:00 2001
From: Karol Sierocinski <ksiero@man.poznan.pl>
Date: Fri, 1 Apr 2022 13:55:30 +0200
Subject: [PATCH 1/8] decl_hdf5 MPIO Collective or Independent, fix #419

---
 example/decl_hdf5.yml                         |   1 +
 plugins/decl_hdf5/AUTHORS                     |   3 +
 plugins/decl_hdf5/README.md                   |   3 +-
 plugins/decl_hdf5/dataset_op.cxx              |  16 +-
 plugins/decl_hdf5/dataset_op.h                |   9 +-
 plugins/decl_hdf5/file_op.cxx                 |  10 +-
 plugins/decl_hdf5/tests/CMakeLists.txt        |  13 +-
 .../decl_hdf5/tests/decl_hdf5_mpi_test_07.c   | 232 ++++++++++++++++++
 8 files changed, 273 insertions(+), 14 deletions(-)
 create mode 100644 plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c

diff --git a/example/decl_hdf5.yml b/example/decl_hdf5.yml
index 2d4e28b5f..0779f8ce8 100644
--- a/example/decl_hdf5.yml
+++ b/example/decl_hdf5.yml
@@ -28,6 +28,7 @@ pdi:
       write:
         main_field: # the name of the data to write
           dataset: data
+          mpio: COLLECTIVE # or INDEPENDENT
           when: '$iter<10'   # do only write the first 10 iterations (0...9)
           memory_selection:  # exclude ghosts from the data in memory
             size:  ['$dsize[0]-2', '$dsize[1]-2']
diff --git a/plugins/decl_hdf5/AUTHORS b/plugins/decl_hdf5/AUTHORS
index 7aeb5fb44..fc5562033 100644
--- a/plugins/decl_hdf5/AUTHORS
+++ b/plugins/decl_hdf5/AUTHORS
@@ -11,6 +11,9 @@ Julien Bigot - CEA (julien.bigot@cea.fr)
 * Run tests that depend on the filesystem in their own temporary directory
 * Buildsystem
 
+Yacine Ould Rouis - CNRS (yacine.ould-rouis@inria.fr)
+* contribution to feature design, validation
+
 Thomas Padioleau - CEA (thomas.padioleau@cea.fr)
 * Fixed a bug with parallel file deletion
 
diff --git a/plugins/decl_hdf5/README.md b/plugins/decl_hdf5/README.md
index acf02947e..885954c3e 100644
--- a/plugins/decl_hdf5/README.md
+++ b/plugins/decl_hdf5/README.md
@@ -145,6 +145,8 @@ The possible values for the keys are as follow:
   See
   https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFletcher32
   for more information.
+* `mpio` : a string expression to define the type of MPIIO parallel pointer 
+for the operation among two choices : `COLLECTIVE` (default) and `INDEPENDENT`.
 
 ### SELECTION_DESC
 
@@ -162,7 +164,6 @@ Memory selection default values:
 * If the `size` is not specified, it defaults to size of the whole data in each
   dimension.
 * If the `start` is not specified it defaults to 0 in all dimensions.
-
 Dataset selection default values:
 * If the `size` is not specified:
   * if the number of dimensions match that of the memory, the size defaults to
diff --git a/plugins/decl_hdf5/dataset_op.cxx b/plugins/decl_hdf5/dataset_op.cxx
index 7da392e9e..a0c9a0e8c 100644
--- a/plugins/decl_hdf5/dataset_op.cxx
+++ b/plugins/decl_hdf5/dataset_op.cxx
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (C) 2015-2024 Commissariat a l'energie atomique et aux energies alternatives (CEA)
- * Copyright (C) 2021 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * Copyright (C) 2022 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -164,6 +164,14 @@ Dataset_op::Dataset_op(Direction dir, string name, Expression default_when, PC_t
 				m_fletcher = value;
 			} else if (key == "attributes") {
 				// pass
+			} else if (key == "mpio") {
+				if (to_string(value) == "INDEPENDENT") {
+					m_mpio = H5FD_MPIO_INDEPENDENT;
+				} else if (to_string(value) == "COLLECTIVE") {
+					m_mpio = H5FD_MPIO_COLLECTIVE;
+				} else {
+					throw Config_error{key_tree, "Not valid MPIO value: `{}'", to_string(value)};
+				}
 			} else if (key == "collision_policy") {
 				m_collision_policy = to_collision_policy(to_string(value));
 			} else {
@@ -203,8 +211,12 @@ void Dataset_op::fletcher(Context& ctx, Expression value)
 	}
 }
 
-void Dataset_op::execute(Context& ctx, hid_t h5_file, hid_t xfer_lst, const unordered_map<string, Datatype_template_sptr>& dsets)
+void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, Datatype_template_ptr>& dsets)
 {
+	Raii_hid xfer_lst = make_raii_hid(H5Pcreate(H5P_DATASET_XFER), H5Pclose);
+	if (use_mpio) {
+		if (0 > H5Pset_dxpl_mpio(xfer_lst, m_mpio)) handle_hdf5_err();
+	}
 	if (m_direction == READ)
 		do_read(ctx, h5_file, xfer_lst);
 	else
diff --git a/plugins/decl_hdf5/dataset_op.h b/plugins/decl_hdf5/dataset_op.h
index b5d3be40e..30961c99d 100644
--- a/plugins/decl_hdf5/dataset_op.h
+++ b/plugins/decl_hdf5/dataset_op.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (C) 2015-2024 Commissariat a l'energie atomique et aux energies alternatives (CEA)
- * Copyright (C) 2021 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * Copyright (C) 2021-2022 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,8 @@ class Dataset_op
 	/// direction of the transfer (read or write)
 	Direction m_direction;
 
+	H5FD_mpio_xfer_t m_mpio = H5FD_MPIO_COLLECTIVE;
+
 	/// the name of the dataset where to transfer
 	PDI::Expression m_dataset;
 
@@ -182,11 +184,10 @@ class Dataset_op
 	 *
 	 * \param ctx the context in which to operate
 	 * \param h5_file the already opened HDF5 file id
-	 * \param xfer_lst the already created transfer property list including any
-	 *                 parallel HDF5 required property.
+	 * \param use_mpi whether the hdf5 read/write is parallel
 	 * \param dsets the type of the explicitly typed datasets
 	 */
-	void execute(PDI::Context& ctx, hid_t h5_file, hid_t xfer_lst, const std::unordered_map<std::string, PDI::Datatype_template_sptr>& dsets);
+	void execute(PDI::Context& ctx, hid_t h5_file, bool use_mpio, const std::unordered_map<std::string, PDI::Datatype_template_ptr>& dsets);
 
 private:
 	void do_read(PDI::Context& ctx, hid_t h5_file, hid_t read_lst);
diff --git a/plugins/decl_hdf5/file_op.cxx b/plugins/decl_hdf5/file_op.cxx
index 1f084b9cd..61f296823 100644
--- a/plugins/decl_hdf5/file_op.cxx
+++ b/plugins/decl_hdf5/file_op.cxx
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (C) 2015-2024 Commissariat a l'energie atomique et aux energies alternatives (CEA)
- * Copyright (C) 2021 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * Copyright (C) 2021-2022 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -280,7 +280,7 @@ void File_op::execute(Context& ctx)
 	std::string filename = m_file.to_string(ctx);
 
 	Raii_hid file_lst = make_raii_hid(H5Pcreate(H5P_FILE_ACCESS), H5Pclose);
-	Raii_hid xfer_lst = make_raii_hid(H5Pcreate(H5P_DATASET_XFER), H5Pclose);
+	bool use_mpio = false;
 #ifdef H5_HAVE_PARALLEL
 	MPI_Comm comm = MPI_COMM_SELF;
 	if (communicator()) {
@@ -288,7 +288,7 @@ void File_op::execute(Context& ctx)
 	}
 	if (comm != MPI_COMM_SELF) {
 		if (0 > H5Pset_fapl_mpio(file_lst, comm, MPI_INFO_NULL)) handle_hdf5_err();
-		if (0 > H5Pset_dxpl_mpio(xfer_lst, H5FD_MPIO_COLLECTIVE)) handle_hdf5_err();
+		use_mpio = true;
 		ctx.logger().debug("Opening `{}' file in parallel mode", filename);
 	}
 #endif
@@ -337,10 +337,10 @@ void File_op::execute(Context& ctx)
 	Raii_hid h5_file = make_raii_hid(h5_file_raw, H5Fclose, ("Cannot open `" + filename + "' file").c_str());
 
 	for (auto&& one_dset_op: dset_writes) {
-		one_dset_op.execute(ctx, h5_file, xfer_lst, m_datasets);
+		one_dset_op.execute(ctx, h5_file, use_mpio, m_datasets);
 	}
 	for (auto&& one_dset_op: dset_reads) {
-		one_dset_op.execute(ctx, h5_file, xfer_lst, m_datasets);
+		one_dset_op.execute(ctx, h5_file, use_mpio, m_datasets);
 	}
 	for (auto&& one_attr_op: attr_writes) {
 		one_attr_op.execute(ctx, h5_file);
diff --git a/plugins/decl_hdf5/tests/CMakeLists.txt b/plugins/decl_hdf5/tests/CMakeLists.txt
index ed58f39f1..d67503cb6 100644
--- a/plugins/decl_hdf5/tests/CMakeLists.txt
+++ b/plugins/decl_hdf5/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 #=============================================================================
 # Copyright (C) 2015-2024 Commissariat a l'energie atomique et aux energies alternatives (CEA)
 # Copyright (C) 2021 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
-#
+# Copyright (C) 2022 Centre National de Recherche Scientifique (CNRS)
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,7 @@ if("${BUILD_HDF5_PARALLEL}")
 	set_property(TEST decl_hdf5_mpi_04_C PROPERTY PROCESSORS 4)
 endif()
 
-# bcommunicator as a reference
+# communicator as a reference
 if("${BUILD_HDF5_PARALLEL}")
 	add_executable(decl_hdf5_mpi_05_C decl_hdf5_mpi_test_05.c)
 	target_link_libraries(decl_hdf5_mpi_05_C PDI::PDI_C MPI::MPI_C)
@@ -113,6 +113,15 @@ if("${BUILD_HDF5_PARALLEL}")
 	set_property(TEST decl_hdf5_mpi_06_C PROPERTY PROCESSORS 4)
 endif()
 
+# mpio dataset attribute
+if("${BUILD_HDF5_PARALLEL}")
+	add_executable(decl_hdf5_mpi_07_C decl_hdf5_mpi_test_07.c)
+	target_link_libraries(decl_hdf5_mpi_07_C PDI::PDI_C MPI::MPI_C)
+	add_test(NAME decl_hdf5_mpi_07_C COMMAND "${RUNTEST_DIR}" "${MPIEXEC}" "${MPIEXEC_NUMPROC_FLAG}" 4 ${MPIEXEC_PREFLAGS} "$<TARGET_FILE:decl_hdf5_mpi_07_C>" ${MPIEXEC_POSTFLAGS})
+	set_property(TEST decl_hdf5_mpi_07_C PROPERTY TIMEOUT 15)
+	set_property(TEST decl_hdf5_mpi_07_C PROPERTY PROCESSORS 4)
+endif()
+
 add_executable(decl_hdf5_IO_options_C decl_hdf5_test_IO_options.c)
 target_link_libraries(decl_hdf5_IO_options_C PDI::PDI_C  ${HDF5_DEPS})
 add_test(NAME decl_hdf5_IO_options_C COMMAND "${RUNTEST_DIR}" "$<TARGET_FILE:decl_hdf5_IO_options_C>")
diff --git a/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c b/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c
new file mode 100644
index 000000000..26d988bd1
--- /dev/null
+++ b/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c
@@ -0,0 +1,232 @@
+/*******************************************************************************
+ * Copyright (C) 2015-2019 Commissariat a l'energie atomique et aux energies alternatives (CEA)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   forcumentation and/or other materials provided with the distribution.
+ * * Neither the name of CEA nor the names of its contributors may be used to
+ *   enforrse or promote products derived from this software without specific
+ *   prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+#include <mpi.h>
+#include <unistd.h>
+#include <pdi.h>
+
+#define IMX 5
+#define JMX 4
+#define NI_GHOST 1
+#define NJ_GHOST 2
+#define DIM 2
+
+const char* CONFIG_YAML
+	= "logging: trace                                                   \n"
+	  "metadata:                                                        \n"
+	  "  input: int                                                     \n"
+	  "  ni: int                                                        \n"
+	  "  nj: int                                                        \n"
+	  "  nig: int                                                       \n"
+	  "  njg: int                                                       \n"
+	  "  nit: int                                                       \n"
+	  "  njt: int                                                       \n"
+	  "  istart: int                                                    \n"
+	  "  jstart: int                                                    \n"
+	  "data:                                                            \n"
+	  "  reals:                                                         \n"
+	  "    type: array                                                  \n"
+	  "    subtype: double                                              \n"
+	  "    size: [$nj + 2*$njg, $ni + 2*$nig]                           \n"
+	  "    subsize: [$nj, $ni]                                          \n"
+	  "    start: [$njg, $nig]                                          \n"
+	  "  values:                                                        \n"
+	  "    type: array                                                  \n"
+	  "    subtype: int                                                 \n"
+	  "    size: [$nj + 2*$njg, $ni + 2*$nig]                           \n"
+	  "    subsize: [$nj, $ni]                                          \n"
+	  "    start: [$njg, $nig]                                          \n"
+	  "plugins:                                                         \n"
+	  "  mpi:                                                           \n"
+	  "  decl_hdf5:                                                     \n"
+	  "    file: decl_hdf5_mpi_test_06_C.h5                             \n"
+	  "    communicator: $MPI_COMM_WORLD                                \n"
+	  "    datasets:                                                    \n"
+	  "      reals:  {type: array, subtype: double, size: [$njt, $nit]} \n"
+	  "      values: {type: array, subtype: int, size: [$njt, $nit]}    \n"
+	  "    write:                                                       \n"
+	  "      reals:                                                     \n"
+	  "        when: $input=0                                           \n"
+	  "        mpio: INDEPENDENT                                        \n"
+	  "        dataset_selection: {start: [$jstart, $istart]}           \n"
+	  "      values:                                                    \n"
+	  "        mpio: COLLECTIVE                                         \n"
+	  "        when: $input=0                                           \n"
+	  "        dataset_selection: {start: [$jstart, $istart]}           \n"
+	  "    read:                                                        \n"
+	  "      reals:                                                     \n"
+	  "        mpio: COLLECTIVE                                         \n"
+	  "        when: $input=1                                           \n"
+	  "        dataset_selection: {start: [$jstart, $istart]}           \n"
+	  "      values:                                                    \n"
+	  "        mpio: INDEPENDENT                                        \n"
+	  "        when: $input=1                                           \n"
+	  "        dataset_selection: {start: [$jstart, $istart]}           \n";
+
+int main(int argc, char* argv[])
+{
+	const int icst = -1; /// constants values in the ghost nodes
+	const double rcst = -1.01;
+
+	int nig = NI_GHOST, njg = NJ_GHOST;
+	int ni = IMX, nj = JMX;
+	int values[JMX + 2 * NJ_GHOST][IMX + NI_GHOST * 2] = {{0}}, cp_values[JMX + 2 * NJ_GHOST][IMX + NI_GHOST * 2] = {{0}};
+	double reals[JMX + 2 * NJ_GHOST][IMX + NI_GHOST * 2] = {{0}}, cp_reals[JMX + 2 * NJ_GHOST][IMX + NI_GHOST * 2] = {{0}};
+	int i, j, input;
+	int nit, njt;
+
+	/// MPI and parallel data or info
+	int dims[DIM], coord[DIM], periodic[DIM];
+	int istart, jstart;
+	MPI_Comm comm2D;
+	periodic[0] = 0;
+	periodic[1] = 0;
+	dims[0] = 2;
+	dims[1] = 2;
+
+
+	MPI_Init(&argc, &argv);
+	PC_tree_t conf = PC_parse_string(CONFIG_YAML);
+	MPI_Comm world = MPI_COMM_WORLD;
+	PDI_init(conf);
+	int rank;
+	MPI_Comm_rank(world, &rank);
+
+	if (0 == rank) {
+		remove("decl_hdf5_mpi_test_02_C.h5");
+	}
+
+	{
+		/// setting nb of procs.
+		int size;
+		MPI_Comm_size(world, &size);
+		if (size != 4) {
+			printf("Run on 4 procs only.");
+			MPI_Abort(MPI_COMM_WORLD, -1);
+		}
+		PDI_expose("nproc", &size, PDI_OUT);
+	}
+
+
+	MPI_Cart_create(world, DIM, dims, periodic, 0, &comm2D);
+	MPI_Cart_coords(comm2D, rank, DIM, coord);
+
+	istart = coord[1] * ni;
+	jstart = coord[0] * nj;
+
+	nit = 2 * ni;
+	njt = 2 * nj;
+
+	PDI_expose("nig", &nig, PDI_OUT); /// Ghost cells
+	PDI_expose("njg", &njg, PDI_OUT);
+
+	PDI_expose("ni", &ni, PDI_OUT); /// Size of the portion of the array for a given MPI task
+	PDI_expose("nj", &nj, PDI_OUT);
+
+	PDI_expose("nit", &nit, PDI_OUT); ///  size of the distributed array
+	PDI_expose("njt", &njt, PDI_OUT);
+
+	PDI_expose("istart", &istart, PDI_OUT); /// offset
+	PDI_expose("jstart", &jstart, PDI_OUT);
+
+	// Fill arrays
+	for (j = 0; j < nj + 2 * njg; ++j) {
+		for (i = 0; i < ni + 2 * nig; ++i) {
+			cp_values[j][i] = icst;
+			cp_reals[j][i] = rcst; /// array initialized with const values
+		}
+	}
+	/// Values and reals == 0 in the ghost.
+	double cst = -rcst;
+	for (j = njg; j < nj + njg; ++j) {
+		for (i = nig; i < ni + nig; ++i) {
+			values[j][i] = (i + coord[1] * ni - nig) + (j + coord[0] * nj - njg) * 10;
+			reals[j][i] = (i + coord[1] * ni - nig) * cst + (j + coord[0] * nj - njg) * 10 * cst;
+		}
+	}
+
+	input = 0;
+	PDI_expose("rank", &rank, PDI_OUT);
+	PDI_expose("input", &input, PDI_OUT);
+
+	///  Test that export/exchange works
+	PDI_expose("input", &input, PDI_OUT);
+	PDI_expose("reals", &reals, PDI_OUT); // output real
+	PDI_expose("values", &values, PDI_INOUT); // output integers
+
+	input = 1;
+	///  Import should also work
+	PDI_expose("input", &input, PDI_OUT); // update metadata => HDF5 now import only
+	PDI_expose("reals", &cp_reals, PDI_IN); // input real
+	PDI_expose("values", &cp_values, PDI_INOUT); // input integers
+
+	/// So the data should be the same
+	fprintf(stderr, "Data exported | Data imported\n");
+
+	for (int j = njg; j < nj + njg; ++j) { // Should be the same inside
+		for (int i = nig; i < ni + nig; i++) {
+			if ((values[j][i] != cp_values[j][i]) || (reals[j][i] != cp_reals[j][i])) {
+				fprintf(stderr, "Ghost: integer (export) / integer(imported) :: %3d  %3d\n", values[j][i], cp_values[j][i]);
+				fprintf(stderr, "Ghost: reals   (export) / reals (imported) :: %6f  %6f\n", reals[j][i], cp_reals[j][i]);
+				MPI_Abort(MPI_COMM_WORLD, -1);
+			}
+		}
+	}
+	for (int j = 0; j < njg; j++) { // and should be icst/rcst outside
+		for (int i = 0; i < nig; i++) {
+			if ((icst != cp_values[j][i]) || (rcst != cp_reals[j][i])) {
+				fprintf(stderr, "Ghost: integer (export) / integer(imported) :: %3d  %3d\n", icst, cp_values[j][i]);
+				fprintf(stderr, "Ghost: reals   (export) / reals (imported) :: %6f  %6f\n", rcst, cp_reals[j][i]);
+				MPI_Abort(MPI_COMM_WORLD, -1);
+			}
+		}
+		for (int i = ni + nig; i < ni + 2 * nig; ++i) {
+			if ((icst != cp_values[j][i]) || (rcst != cp_reals[j][i])) {
+				fprintf(stderr, "Ghost: integer (export) / integer(imported) :: %3d  %3d\n", icst, cp_values[j][i]);
+				fprintf(stderr, "Ghost: reals   (export) / reals (imported) :: %6f  %6f\n", rcst, cp_reals[j][i]);
+				MPI_Abort(MPI_COMM_WORLD, -1);
+			}
+		}
+	}
+	for (int j = nj + njg; j < nj + 2 * njg; ++j) {
+		for (int i = 0; i < nig; i++) {
+			if ((icst != cp_values[j][i]) || (rcst != cp_reals[j][i])) {
+				fprintf(stderr, "Ghost: integer (export) / integer(imported) :: %3d  %3d\n", icst, cp_values[j][i]);
+				fprintf(stderr, "Ghost: reals   (export) / reals (imported) :: %6f  %6f\n", rcst, cp_reals[j][i]);
+				MPI_Abort(MPI_COMM_WORLD, -1);
+			}
+		}
+		for (int i = ni + nig; i < ni + 2 * nig; ++i) {
+			if ((icst != cp_values[j][i]) || (rcst != cp_reals[j][i])) {
+				fprintf(stderr, "Ghost: integer (export) / integer(imported) :: %3d  %3d\n", icst, cp_values[j][i]);
+				fprintf(stderr, "Ghost: reals   (export) / reals (imported) :: %6f  %6f\n", rcst, cp_reals[j][i]);
+				MPI_Abort(MPI_COMM_WORLD, -1);
+			}
+		}
+	}
+
+	PDI_finalize();
+	PC_tree_destroy(&conf);
+	MPI_Finalize();
+}

From 73b856666e96038aa01fa2e999ff9de49c884c61 Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Thu, 24 Oct 2024 16:07:00 +0200
Subject: [PATCH 2/8] fix compilation error + add compatibilty test with
 independent I/O

---
 plugins/decl_hdf5/dataset_op.cxx              |   2 +-
 .../tests/compatibility_tests/CMakeLists.txt  |   6 +-
 .../HDF5_C/mpi_independent_read_test.c        | 144 ++++++++++++++++++
 .../HDF5_C/mpi_independent_write_test.c       | 135 ++++++++++++++++
 .../PDI_C/mpi_independent_read_test.c         |  91 +++++++++++
 .../PDI_C/mpi_independent_write_test.c        |  83 ++++++++++
 .../decl_hdf5/tests/decl_hdf5_mpi_test_07.c   |   4 +-
 7 files changed, 459 insertions(+), 6 deletions(-)
 create mode 100644 plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
 create mode 100644 plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
 create mode 100644 plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
 create mode 100644 plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c

diff --git a/plugins/decl_hdf5/dataset_op.cxx b/plugins/decl_hdf5/dataset_op.cxx
index a0c9a0e8c..04cb42044 100644
--- a/plugins/decl_hdf5/dataset_op.cxx
+++ b/plugins/decl_hdf5/dataset_op.cxx
@@ -211,7 +211,7 @@ void Dataset_op::fletcher(Context& ctx, Expression value)
 	}
 }
 
-void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, Datatype_template_ptr>& dsets)
+void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, Datatype_template_sptr>& dsets)
 {
 	Raii_hid xfer_lst = make_raii_hid(H5Pcreate(H5P_DATASET_XFER), H5Pclose);
 	if (use_mpio) {
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/CMakeLists.txt b/plugins/decl_hdf5/tests/compatibility_tests/CMakeLists.txt
index 582c4361d..a390af759 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/CMakeLists.txt
+++ b/plugins/decl_hdf5/tests/compatibility_tests/CMakeLists.txt
@@ -29,7 +29,7 @@ set(RUNTEST_DIR "${CMAKE_CURRENT_LIST_DIR}/../../cmake/runtest-dir")
 
 set(ALL_TEST_NAMES array dataset group struct variables)
 if("${BUILD_HDF5_PARALLEL}")
-    list(APPEND ALL_TEST_NAMES mpi)
+    list(APPEND ALL_TEST_NAMES mpi mpi_independent)
 endif()
 
 foreach(test_name ${ALL_TEST_NAMES})
@@ -39,7 +39,7 @@ foreach(test_name ${ALL_TEST_NAMES})
 
         add_executable("PDI_C_${test_name}_${io_operation}_test" "PDI_C/${test_name}_${io_operation}_test.c")
         target_link_libraries("PDI_C_${test_name}_${io_operation}_test" PDI::PDI_C)
-        if ("${test_name}" STREQUAL "mpi")
+        if ( ("${test_name}" STREQUAL "mpi") OR ("${test_name}" STREQUAL "mpi_independent") )
             target_link_libraries("HDF5_C_${test_name}_${io_operation}_test" MPI::MPI_C)
             target_link_libraries("PDI_C_${test_name}_${io_operation}_test"  MPI::MPI_C)
         endif()
@@ -49,7 +49,7 @@ foreach(test_name ${ALL_TEST_NAMES})
         foreach(read_prefix HDF5_C_ PDI_C_)
             set(write_test_name "${write_prefix}${test_name}_write_test")
             set(read_test_name "${read_prefix}${test_name}_read_test")
-            if ("${test_name}" STREQUAL "mpi")
+            if ( ("${test_name}" STREQUAL "mpi") OR ("${test_name}" STREQUAL "mpi_independent") )
                 set(MPI_CASE_CMD "${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS}")
                 set(MPI_POST_CMD " ${MPIEXEC_POSTFLAGS}")
             else()
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
new file mode 100644
index 000000000..e132926f2
--- /dev/null
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (C) 2020 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of CEA nor the names of its contributors may be used to
+ *   endorse or promote products derived from this software without specific
+ *   prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+#include <mpi.h>
+#include <assert.h>
+#include <hdf5.h>
+#include <unistd.h>
+
+#define FILE "mpi_independent_test.h5"
+
+/*
+Test : Read a file using hdf5 parallel version with the option independent parallel pointer.
+*/
+
+int main()
+{
+	printf("HDF5 mpi_independent_read_test started\n");
+	MPI_Init(NULL, NULL);
+	int mpi_rank;
+	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+	herr_t status = H5open();
+	if (status < 0) {
+		return 1;
+	}
+
+	hid_t fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+	H5Pset_fapl_mpio(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL);
+	hid_t file_id = H5Fopen(FILE, H5F_ACC_RDONLY, fapl_id);
+	if (file_id < 0) {
+		return 1;
+	}
+
+	int dset_data[5][5];
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 5; j++) {
+			dset_data[i][j] = 0;
+		}
+	}
+
+	hsize_t coords[2] = {5, 10};
+	hid_t dataspace_id = H5Screate_simple(2, coords, NULL);
+	if (dataspace_id < 0) {
+		return 1;
+	}
+
+	hid_t dataset_id = H5Dopen2(file_id, "array_data", H5P_DEFAULT);
+	if (dataset_id < 0) {
+		return 1;
+	}
+
+	hsize_t count[2] = {5, 5};
+	hsize_t stride[2] = {1, 1};
+	hsize_t dataset_offset[2] = {0, 5 * mpi_rank};
+	hsize_t memory_offset[2] = {0, 0};
+	hsize_t block[2] = {1, 1};
+
+	status = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, dataset_offset, stride, count, block);
+	if (status < 0) {
+		return 1;
+	}
+	hid_t memory_dataspace_id = H5Screate_simple(2, count, NULL);
+	if (memory_dataspace_id < 0) {
+		return 1;
+	}
+	status = H5Sselect_hyperslab(memory_dataspace_id, H5S_SELECT_SET, memory_offset, stride, count, block);
+	if (status < 0) {
+		return 1;
+	}
+
+	hid_t dxpl_id = H5Pcreate(H5P_DATASET_XFER);
+	H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_INDEPENDENT);
+
+	status = H5Dread(dataset_id, H5T_NATIVE_INT, memory_dataspace_id, dataspace_id, dxpl_id, dset_data);
+	if (status < 0) {
+		return 1;
+	}
+
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 5; j++) {
+			if (dset_data[i][j] != i * 10 + j + (5 * mpi_rank)) {
+				fprintf(stderr, "[%d][%d] %d != %d\n ", i, j, dset_data[i][j], i * 10 + j + (5 * mpi_rank));
+				return 1;
+			}
+		}
+	}
+
+	status = H5Dclose(dataset_id);
+	if (status < 0) {
+		return 1;
+	}
+	status = H5Pclose(dxpl_id);
+	if (status != 0) {
+		return status;
+	}
+	status = H5Sclose(memory_dataspace_id);
+	if (status < 0) {
+		return 1;
+	}
+	status = H5Sclose(dataspace_id);
+	if (status < 0) {
+		return 1;
+	}
+	status = H5Fclose(file_id);
+	if (file_id < 0) {
+		return 1;
+	}
+	if (status != 0) {
+		return status;
+	}
+	status = H5Pclose(fapl_id);
+	if (status != 0) {
+		return status;
+	}
+
+	H5close();
+	if (status < 0) {
+		return 1;
+	}
+	MPI_Finalize();
+
+	printf("[Rank: %d] HDF5 mpi_read_test finalized\n", mpi_rank);
+	return 0;
+}
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
new file mode 100644
index 000000000..c0746f1e2
--- /dev/null
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (C) 2020 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of CEA nor the names of its contributors may be used to
+ *   endorse or promote products derived from this software without specific
+ *   prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+#include <mpi.h>
+#include <assert.h>
+#include <hdf5.h>
+#include <unistd.h>
+
+#define FILE "mpi_independent_test.h5"
+
+/*
+Test : Write a file using hdf5 parallel version with the option independent parallel pointer.
+*/
+
+int main()
+{
+	printf("HDF5 mpi_independent_write_test started\n");
+	MPI_Init(NULL, NULL);
+	int mpi_rank;
+	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+	herr_t status = H5open();
+	if (status < 0) {
+		return 1;
+	}
+
+	hid_t fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+	H5Pset_fapl_mpio(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL);
+	hid_t file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
+	if (file_id < 0) {
+		return 1;
+	}
+
+	hsize_t coords[2] = {5, 10};
+	hid_t dataspace_id = H5Screate_simple(2, coords, NULL);
+	if (dataspace_id < 0) {
+		return 1;
+	}
+
+	int dset_data[5][5];
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 5; j++) {
+			dset_data[i][j] = i * 10 + j + (5 * mpi_rank);
+		}
+	}
+
+	hid_t dataset_id = H5Dcreate2(file_id, "/array_data", H5T_STD_I32BE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+	if (dataset_id < 0) {
+		return 1;
+	}
+
+	hsize_t count[2] = {5, 5};
+	hsize_t stride[2] = {1, 1};
+	hsize_t dataset_offset[2] = {0, 5 * mpi_rank};
+	hsize_t memory_offset[2] = {0, 0};
+	hsize_t block[2] = {1, 1};
+
+	status = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, dataset_offset, stride, count, block);
+	if (status < 0) {
+		return 1;
+	}
+	hid_t memory_dataspace_id = H5Screate_simple(2, count, NULL);
+	if (memory_dataspace_id < 0) {
+		return 1;
+	}
+	status = H5Sselect_hyperslab(memory_dataspace_id, H5S_SELECT_SET, memory_offset, stride, count, block);
+	if (status < 0) {
+		return 1;
+	}
+
+	hid_t dxpl_id = H5Pcreate(H5P_DATASET_XFER);
+	H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_INDEPENDENT);
+
+
+	status = H5Dwrite(dataset_id, H5T_NATIVE_INT, memory_dataspace_id, dataspace_id, dxpl_id, dset_data);
+	if (status < 0) {
+		return 1;
+	}
+
+	status = H5Sclose(memory_dataspace_id);
+	if (status < 0) {
+		return 1;
+	}
+	status = H5Sclose(dataspace_id);
+	if (status < 0) {
+		return 1;
+	}
+	status = H5Dclose(dataset_id);
+	if (status < 0) {
+		return 1;
+	}
+	status = H5Pclose(dxpl_id);
+	if (status != 0) {
+		return status;
+	}
+	status = H5Fclose(file_id);
+	if (file_id < 0) {
+		return 1;
+	}
+	if (status != 0) {
+		return status;
+	}
+	status = H5Pclose(fapl_id);
+	if (status != 0) {
+		return status;
+	}
+
+	H5close();
+	if (status < 0) {
+		return 1;
+	}
+	MPI_Finalize();
+	printf("[Rank: %d] HDF5 mpi_write_test finalized\n", mpi_rank);
+	return 0;
+}
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
new file mode 100644
index 000000000..1bac48fa0
--- /dev/null
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (C) 2020 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * Copyright (C) 2020 Commissariat a l'energie atomique et aux energies alternatives (CEA)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of CEA nor the names of its contributors may be used to
+ *   endorse or promote products derived from this software without specific
+ *   prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+#include <mpi.h>
+#include <assert.h>
+#include <unistd.h>
+#include <pdi.h>
+
+#define FILE "mpi_independent_test.h5"
+
+int main()
+{
+	printf("PDI mpi_read_test started\n");
+	MPI_Init(NULL, NULL);
+	int mpi_rank;
+	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+
+	const char* CONFIG_YAML
+		= "logging: trace                                               \n"
+		  "metadata:                                                    \n"
+		  "  mpi_rank: int                                              \n"
+		  "data:                                                        \n"
+		  "  array_data: { size: [5, 5], type: array, subtype: int }    \n"
+		  "plugins:                                                     \n"
+		  "  mpi: ~                                                     \n"
+		  "  decl_hdf5:                                                 \n"
+		  "    communicator: $MPI_COMM_WORLD                            \n"
+		  "    file: mpi_independent_test.h5                            \n"
+		  "    datasets:                                                \n"
+		  "      array_data: {type: array, subtype: int, size: [5, 10]} \n"
+		  "    read:                                                    \n"
+		  "      mpio: INDEPENDENT                                      \n"
+		  "      array_data:                                            \n"
+		  "        - memory_selection:                                  \n"
+		  "            size: [5, 5]                                     \n"
+		  "          dataset_selection:                                 \n"
+		  "            size: [5, 5]                                     \n"
+		  "            start: [0, $mpi_rank * 5]                        \n";
+
+	PC_tree_t conf = PC_parse_string(CONFIG_YAML);
+	PDI_init(conf);
+
+	PDI_expose("mpi_rank", &mpi_rank, PDI_OUT);
+
+	int test_array[5][5];
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 5; j++) {
+			test_array[i][j] = 0;
+		}
+	}
+	PDI_expose("array_data", test_array, PDI_IN);
+
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 5; j++) {
+			if (test_array[i][j] != i * 10 + j + 5 * mpi_rank) {
+				fprintf(stderr, "[%d][%d] %d != %d\n ", i, j, test_array[i][j], i * 10 + j + 5 * mpi_rank);
+				return 1;
+			}
+		}
+	}
+
+	PDI_finalize();
+	PC_tree_destroy(&conf);
+
+	MPI_Finalize();
+
+	printf("[Rank: %d] PDI mpi_read_test finalized\n", mpi_rank);
+	return 0;
+}
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
new file mode 100644
index 000000000..2101c02ec
--- /dev/null
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (C) 2020 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of CEA nor the names of its contributors may be used to
+ *   endorse or promote products derived from this software without specific
+ *   prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+#include <mpi.h>
+#include <assert.h>
+#include <unistd.h>
+#include <pdi.h>
+
+#define FILE "mpi_independent_test.h5"
+
+int main()
+{
+	printf("PDI mpi_write_test started\n");
+	MPI_Init(NULL, NULL);
+	int mpi_rank;
+	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+
+	const char* CONFIG_YAML
+		= "logging: trace                                               \n"
+		  "metadata:                                                    \n"
+		  "  mpi_rank: int                                              \n"
+		  "data:                                                        \n"
+		  "  array_data: { size: [5, 5], type: array, subtype: int }    \n"
+		  "plugins:                                                     \n"
+		  "  mpi: ~                                                     \n"
+		  "  decl_hdf5:                                                 \n"
+		  "    communicator: $MPI_COMM_WORLD                            \n"
+		  "    file: mpi_independent_test.h5                            \n"
+		  "    datasets:                                                \n"
+		  "      array_data: {type: array, subtype: int, size: [5, 10]} \n"
+		  "    write:                                                   \n"
+		  "      mpio: INDEPENDENT                                      \n"
+		  "      array_data:                                            \n"
+		  "        - memory_selection:                                  \n"
+		  "            size: [5, 5]                                     \n"
+		  "          dataset_selection:                                 \n"
+		  "            size: [5, 5]                                     \n"
+		  "            start: [0, $mpi_rank * 5]                        \n";
+
+	PC_tree_t conf = PC_parse_string(CONFIG_YAML);
+	PDI_init(conf);
+
+	PDI_expose("mpi_rank", &mpi_rank, PDI_OUT);
+
+	int test_array[5][5];
+
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 5; j++) {
+			test_array[i][j] = i * 10 + j + 5 * mpi_rank;
+		}
+	}
+
+	PDI_expose("array_data", test_array, PDI_OUT);
+
+	PDI_finalize();
+	PC_tree_destroy(&conf);
+
+	MPI_Finalize();
+
+	printf("[Rank: %d] HDF5 mpi_write_test finalized\n", mpi_rank);
+	return 0;
+}
diff --git a/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c b/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c
index 26d988bd1..df20f5252 100644
--- a/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c
+++ b/plugins/decl_hdf5/tests/decl_hdf5_mpi_test_07.c
@@ -60,7 +60,7 @@ const char* CONFIG_YAML
 	  "plugins:                                                         \n"
 	  "  mpi:                                                           \n"
 	  "  decl_hdf5:                                                     \n"
-	  "    file: decl_hdf5_mpi_test_06_C.h5                             \n"
+	  "    file: decl_hdf5_mpi_test_07_C.h5                             \n"
 	  "    communicator: $MPI_COMM_WORLD                                \n"
 	  "    datasets:                                                    \n"
 	  "      reals:  {type: array, subtype: double, size: [$njt, $nit]} \n"
@@ -114,7 +114,7 @@ int main(int argc, char* argv[])
 	MPI_Comm_rank(world, &rank);
 
 	if (0 == rank) {
-		remove("decl_hdf5_mpi_test_02_C.h5");
+		remove("decl_hdf5_mpi_test_07_C.h5");
 	}
 
 	{

From 5a47545145b3092eea1864493c43e8b10293c362 Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Mon, 4 Nov 2024 14:58:40 +0100
Subject: [PATCH 3/8] fix419:resolve Datatype_template_sptr error + Add change
 in local CHANGELOG.md

---
 plugins/decl_hdf5/CHANGELOG.md   | 2 ++
 plugins/decl_hdf5/dataset_op.cxx | 2 +-
 plugins/decl_hdf5/dataset_op.h   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/decl_hdf5/CHANGELOG.md b/plugins/decl_hdf5/CHANGELOG.md
index 3026bb30c..dc3bcbbaa 100644
--- a/plugins/decl_hdf5/CHANGELOG.md
+++ b/plugins/decl_hdf5/CHANGELOG.md
@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### Added
+* decl'hdf5 feature : possibility to choose parallel MPIIO pointer (COLLECTIVE/INDEPENDENT)
+  [#419](https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/issues/419)
 
 ### Changed
 * Replaced the astyle based indentation by a clang-format one, fixes
diff --git a/plugins/decl_hdf5/dataset_op.cxx b/plugins/decl_hdf5/dataset_op.cxx
index 04cb42044..192bd98c3 100644
--- a/plugins/decl_hdf5/dataset_op.cxx
+++ b/plugins/decl_hdf5/dataset_op.cxx
@@ -211,7 +211,7 @@ void Dataset_op::fletcher(Context& ctx, Expression value)
 	}
 }
 
-void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, Datatype_template_sptr>& dsets)
+void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, PDI::Datatype_template_sptr>& dsets)
 {
 	Raii_hid xfer_lst = make_raii_hid(H5Pcreate(H5P_DATASET_XFER), H5Pclose);
 	if (use_mpio) {
diff --git a/plugins/decl_hdf5/dataset_op.h b/plugins/decl_hdf5/dataset_op.h
index 30961c99d..45ac8eddc 100644
--- a/plugins/decl_hdf5/dataset_op.h
+++ b/plugins/decl_hdf5/dataset_op.h
@@ -187,7 +187,7 @@ class Dataset_op
 	 * \param use_mpi whether the hdf5 read/write is parallel
 	 * \param dsets the type of the explicitly typed datasets
 	 */
-	void execute(PDI::Context& ctx, hid_t h5_file, bool use_mpio, const std::unordered_map<std::string, PDI::Datatype_template_ptr>& dsets);
+	void execute(PDI::Context& ctx, hid_t h5_file, bool use_mpio, const std::unordered_map<std::string, PDI::Datatype_template_sptr>& dsets);
 
 private:
 	void do_read(PDI::Context& ctx, hid_t h5_file, hid_t read_lst);

From 8853f661b0d94da78eb96592e88c064888f1ea37 Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Wed, 6 Nov 2024 10:29:37 +0100
Subject: [PATCH 4/8] fix419: add mpio in full configuration example of the doc

---
 plugins/decl_hdf5/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/decl_hdf5/README.md b/plugins/decl_hdf5/README.md
index 885954c3e..84f95c578 100644
--- a/plugins/decl_hdf5/README.md
+++ b/plugins/decl_hdf5/README.md
@@ -220,6 +220,7 @@ plugins:
         - dataset: data/array      # a dataset name (default: the data name)
           when: "$iter>0&$iter<11" # an additional condition when to actually trigger the actions (default: always true)
           communicator: $MPI_COMM_SELF   # the MPI communicator used for HDF5 parallel synchronized write (default: that of the file)
+          mpio: INDEPENDENT              # the type of MPIIO parallel pointer (default: COLLECTIVE)
           memory_selection:
             size:  [$width-2, $height-2] # number of elements to transfer in each dimension (default: size of the full data)
             start: [1, 1]                # coordinate of the start point in memory relative to the shared data (default: 0 in each dimensions)

From 425b085c21e146d0462af086aa9bc17d26e2695d Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Wed, 6 Nov 2024 10:37:34 +0100
Subject: [PATCH 5/8] fix419: fix name of parameter

---
 plugins/decl_hdf5/dataset_op.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/decl_hdf5/dataset_op.h b/plugins/decl_hdf5/dataset_op.h
index 45ac8eddc..cd928d47a 100644
--- a/plugins/decl_hdf5/dataset_op.h
+++ b/plugins/decl_hdf5/dataset_op.h
@@ -184,7 +184,7 @@ class Dataset_op
 	 *
 	 * \param ctx the context in which to operate
 	 * \param h5_file the already opened HDF5 file id
-	 * \param use_mpi whether the hdf5 read/write is parallel
+	 * \param use_mpio whether the hdf5 read/write is parallel
 	 * \param dsets the type of the explicitly typed datasets
 	 */
 	void execute(PDI::Context& ctx, hid_t h5_file, bool use_mpio, const std::unordered_map<std::string, PDI::Datatype_template_sptr>& dsets);

From d76154a708380c644cb8857094c61682b2adb1c2 Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Thu, 14 Nov 2024 11:36:05 +0100
Subject: [PATCH 6/8] fixing review

---
 plugins/decl_hdf5/AUTHORS                                   | 3 +++
 plugins/decl_hdf5/CHANGELOG.md                              | 2 +-
 plugins/decl_hdf5/README.md                                 | 1 +
 plugins/decl_hdf5/dataset_op.cxx                            | 6 +++---
 plugins/decl_hdf5/dataset_op.h                              | 1 +
 .../compatibility_tests/HDF5_C/mpi_independent_read_test.c  | 4 ++--
 .../compatibility_tests/HDF5_C/mpi_independent_write_test.c | 4 ++--
 .../tests/compatibility_tests/HDF5_C/mpi_read_test.c        | 4 ++--
 .../tests/compatibility_tests/HDF5_C/mpi_write_test.c       | 4 ++--
 9 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/plugins/decl_hdf5/AUTHORS b/plugins/decl_hdf5/AUTHORS
index fc5562033..b979cd634 100644
--- a/plugins/decl_hdf5/AUTHORS
+++ b/plugins/decl_hdf5/AUTHORS
@@ -14,6 +14,9 @@ Julien Bigot - CEA (julien.bigot@cea.fr)
 Yacine Ould Rouis - CNRS (yacine.ould-rouis@inria.fr)
 * contribution to feature design, validation
 
+Jacques Morice - CEA (jacques.morice@cea.fr)
+* contribution to feature improvement, validation
+
 Thomas Padioleau - CEA (thomas.padioleau@cea.fr)
 * Fixed a bug with parallel file deletion
 
diff --git a/plugins/decl_hdf5/CHANGELOG.md b/plugins/decl_hdf5/CHANGELOG.md
index dc3bcbbaa..d8327b152 100644
--- a/plugins/decl_hdf5/CHANGELOG.md
+++ b/plugins/decl_hdf5/CHANGELOG.md
@@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### Added
-* decl'hdf5 feature : possibility to choose parallel MPIIO pointer (COLLECTIVE/INDEPENDENT)
+* Possibility to choose parallel MPIIO mode: either COLLECTIVE or INDEPENDENT
   [#419](https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/issues/419)
 
 ### Changed
diff --git a/plugins/decl_hdf5/README.md b/plugins/decl_hdf5/README.md
index 84f95c578..fbd6486b1 100644
--- a/plugins/decl_hdf5/README.md
+++ b/plugins/decl_hdf5/README.md
@@ -164,6 +164,7 @@ Memory selection default values:
 * If the `size` is not specified, it defaults to size of the whole data in each
   dimension.
 * If the `start` is not specified it defaults to 0 in all dimensions.
+
 Dataset selection default values:
 * If the `size` is not specified:
   * if the number of dimensions match that of the memory, the size defaults to
diff --git a/plugins/decl_hdf5/dataset_op.cxx b/plugins/decl_hdf5/dataset_op.cxx
index 192bd98c3..3ee39669a 100644
--- a/plugins/decl_hdf5/dataset_op.cxx
+++ b/plugins/decl_hdf5/dataset_op.cxx
@@ -170,7 +170,7 @@ Dataset_op::Dataset_op(Direction dir, string name, Expression default_when, PC_t
 				} else if (to_string(value) == "COLLECTIVE") {
 					m_mpio = H5FD_MPIO_COLLECTIVE;
 				} else {
-					throw Config_error{key_tree, "Not valid MPIO value: `{}'", to_string(value)};
+					throw Config_error{key_tree, "Not valid MPIO value: `{}'. Expecting INDEPENDENT or COLLECTIVE.", to_string(value)};
 				}
 			} else if (key == "collision_policy") {
 				m_collision_policy = to_collision_policy(to_string(value));
@@ -211,7 +211,7 @@ void Dataset_op::fletcher(Context& ctx, Expression value)
 	}
 }
 
-void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, PDI::Datatype_template_sptr>& dsets)
+void Dataset_op::execute(Context& ctx, hid_t h5_file, bool use_mpio, const unordered_map<string, Datatype_template_sptr>& dsets)
 {
 	Raii_hid xfer_lst = make_raii_hid(H5Pcreate(H5P_DATASET_XFER), H5Pclose);
 	if (use_mpio) {
@@ -340,7 +340,7 @@ hid_t Dataset_op::dataset_creation_plist(Context& ctx, const Datatype* dataset_t
 	return dset_plist;
 }
 
-void Dataset_op::do_write(Context& ctx, hid_t h5_file, hid_t write_lst, const unordered_map<string, PDI::Datatype_template_sptr>& dsets)
+void Dataset_op::do_write(Context& ctx, hid_t h5_file, hid_t write_lst, const unordered_map<string, Datatype_template_sptr>& dsets)
 {
 	string dataset_name = m_dataset.to_string(ctx);
 	ctx.logger().trace("Preparing for writing `{}' dataset", dataset_name);
diff --git a/plugins/decl_hdf5/dataset_op.h b/plugins/decl_hdf5/dataset_op.h
index cd928d47a..ac3859755 100644
--- a/plugins/decl_hdf5/dataset_op.h
+++ b/plugins/decl_hdf5/dataset_op.h
@@ -67,6 +67,7 @@ class Dataset_op
 	/// direction of the transfer (read or write)
 	Direction m_direction;
 
+	/// the type of MPIIO parallel pointer (default = COLLECTIVE)
 	H5FD_mpio_xfer_t m_mpio = H5FD_MPIO_COLLECTIVE;
 
 	/// the name of the dataset where to transfer
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
index e132926f2..70ec84530 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
@@ -33,10 +33,10 @@
 Test : Read a file using hdf5 parallel version with the option independent parallel pointer.
 */
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("HDF5 mpi_independent_read_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 	herr_t status = H5open();
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
index c0746f1e2..fbeb807ac 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
@@ -33,10 +33,10 @@
 Test : Write a file using hdf5 parallel version with the option independent parallel pointer.
 */
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("HDF5 mpi_independent_write_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 	herr_t status = H5open();
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c
index b8cf6c592..85bd809e6 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c
@@ -29,10 +29,10 @@
 
 #define FILE "mpi_test.h5"
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("HDF5 mpi_read_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 	herr_t status = H5open();
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c
index 0c5da2633..e50a987a3 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c
@@ -29,10 +29,10 @@
 
 #define FILE "mpi_test.h5"
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("HDF5 mpi_write_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 	herr_t status = H5open();

From 9d1e827aca6e524906b0ffa74df25b26d193c72c Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Tue, 19 Nov 2024 13:08:53 +0100
Subject: [PATCH 7/8] replace MPIIO by MPI-I/O + add argument to main + fix
 some typo

---
 plugins/decl_hdf5/CHANGELOG.md                                | 2 +-
 plugins/decl_hdf5/README.md                                   | 4 ++--
 plugins/decl_hdf5/dataset_op.cxx                              | 4 ++--
 plugins/decl_hdf5/dataset_op.h                                | 2 +-
 .../compatibility_tests/PDI_C/mpi_independent_read_test.c     | 4 ++--
 .../compatibility_tests/PDI_C/mpi_independent_write_test.c    | 4 ++--
 .../decl_hdf5/tests/compatibility_tests/PDI_C/mpi_read_test.c | 4 ++--
 .../tests/compatibility_tests/PDI_C/mpi_write_test.c          | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/decl_hdf5/CHANGELOG.md b/plugins/decl_hdf5/CHANGELOG.md
index d8327b152..9aeb7acbd 100644
--- a/plugins/decl_hdf5/CHANGELOG.md
+++ b/plugins/decl_hdf5/CHANGELOG.md
@@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### Added
-* Possibility to choose parallel MPIIO mode: either COLLECTIVE or INDEPENDENT
+* Possibility to choose parallel MPI-I/O mode: either COLLECTIVE or INDEPENDENT
   [#419](https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/issues/419)
 
 ### Changed
diff --git a/plugins/decl_hdf5/README.md b/plugins/decl_hdf5/README.md
index fbd6486b1..a46db8676 100644
--- a/plugins/decl_hdf5/README.md
+++ b/plugins/decl_hdf5/README.md
@@ -145,7 +145,7 @@ The possible values for the keys are as follow:
   See
   https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFletcher32
   for more information.
-* `mpio` : a string expression to define the type of MPIIO parallel pointer 
+* `mpio` : a string expression to define the type of MPI-I/O parallel pointer 
 for the operation among two choices : `COLLECTIVE` (default) and `INDEPENDENT`.
 
 ### SELECTION_DESC
@@ -221,7 +221,7 @@ plugins:
         - dataset: data/array      # a dataset name (default: the data name)
           when: "$iter>0&$iter<11" # an additional condition when to actually trigger the actions (default: always true)
           communicator: $MPI_COMM_SELF   # the MPI communicator used for HDF5 parallel synchronized write (default: that of the file)
-          mpio: INDEPENDENT              # the type of MPIIO parallel pointer (default: COLLECTIVE)
+          mpio: INDEPENDENT              # the type of MPI-I/O parallel pointer (default: COLLECTIVE)
           memory_selection:
             size:  [$width-2, $height-2] # number of elements to transfer in each dimension (default: size of the full data)
             start: [1, 1]                # coordinate of the start point in memory relative to the shared data (default: 0 in each dimensions)
diff --git a/plugins/decl_hdf5/dataset_op.cxx b/plugins/decl_hdf5/dataset_op.cxx
index 3ee39669a..3e627067a 100644
--- a/plugins/decl_hdf5/dataset_op.cxx
+++ b/plugins/decl_hdf5/dataset_op.cxx
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (C) 2015-2024 Commissariat a l'energie atomique et aux energies alternatives (CEA)
- * Copyright (C) 2022 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
+ * Copyright (C) 2021-2022 Institute of Bioorganic Chemistry Polish Academy of Science (PSNC)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -170,7 +170,7 @@ Dataset_op::Dataset_op(Direction dir, string name, Expression default_when, PC_t
 				} else if (to_string(value) == "COLLECTIVE") {
 					m_mpio = H5FD_MPIO_COLLECTIVE;
 				} else {
-					throw Config_error{key_tree, "Not valid MPIO value: `{}'. Expecting INDEPENDENT or COLLECTIVE.", to_string(value)};
+					throw Config_error{key_tree, "Not valid mpio value: `{}'. Expecting INDEPENDENT or COLLECTIVE.", to_string(value)};
 				}
 			} else if (key == "collision_policy") {
 				m_collision_policy = to_collision_policy(to_string(value));
diff --git a/plugins/decl_hdf5/dataset_op.h b/plugins/decl_hdf5/dataset_op.h
index ac3859755..aaa63bec8 100644
--- a/plugins/decl_hdf5/dataset_op.h
+++ b/plugins/decl_hdf5/dataset_op.h
@@ -67,7 +67,7 @@ class Dataset_op
 	/// direction of the transfer (read or write)
 	Direction m_direction;
 
-	/// the type of MPIIO parallel pointer (default = COLLECTIVE)
+	/// the type of MPI-I/O parallel pointer (default = COLLECTIVE)
 	H5FD_mpio_xfer_t m_mpio = H5FD_MPIO_COLLECTIVE;
 
 	/// the name of the dataset where to transfer
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
index 1bac48fa0..724f423a1 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
@@ -30,10 +30,10 @@
 
 #define FILE "mpi_independent_test.h5"
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("PDI mpi_read_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
index 2101c02ec..9536bfe9d 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
@@ -29,10 +29,10 @@
 
 #define FILE "mpi_independent_test.h5"
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("PDI mpi_write_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_read_test.c
index 9b440f998..0871cc50c 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_read_test.c
@@ -30,10 +30,10 @@
 
 #define FILE "mpi_test.h5"
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("PDI mpi_read_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c
index f126451ce..9efec438e 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c
@@ -29,10 +29,10 @@
 
 #define FILE "mpi_test.h5"
 
-int main()
+int main(int argc, char* argv[])
 {
 	printf("PDI mpi_write_test started\n");
-	MPI_Init(NULL, NULL);
+	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 

From 53d0076e1c0312dc82e6e9d1251fceab826d5f1c Mon Sep 17 00:00:00 2001
From: "jacques.morice" <jacques.morice@cea.Fr>
Date: Wed, 4 Dec 2024 14:42:40 +0100
Subject: [PATCH 8/8] fix review

---
 plugins/decl_hdf5/AUTHORS                                   | 6 +++---
 .../compatibility_tests/HDF5_C/mpi_independent_read_test.c  | 4 ++--
 .../compatibility_tests/HDF5_C/mpi_independent_write_test.c | 4 ++--
 .../tests/compatibility_tests/HDF5_C/mpi_read_test.c        | 4 ++++
 .../tests/compatibility_tests/HDF5_C/mpi_write_test.c       | 4 ++++
 .../compatibility_tests/PDI_C/mpi_independent_read_test.c   | 6 +++++-
 .../compatibility_tests/PDI_C/mpi_independent_write_test.c  | 6 +++++-
 .../tests/compatibility_tests/PDI_C/mpi_write_test.c        | 4 ++++
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/plugins/decl_hdf5/AUTHORS b/plugins/decl_hdf5/AUTHORS
index b979cd634..c82136f02 100644
--- a/plugins/decl_hdf5/AUTHORS
+++ b/plugins/decl_hdf5/AUTHORS
@@ -11,12 +11,12 @@ Julien Bigot - CEA (julien.bigot@cea.fr)
 * Run tests that depend on the filesystem in their own temporary directory
 * Buildsystem
 
-Yacine Ould Rouis - CNRS (yacine.ould-rouis@inria.fr)
-* contribution to feature design, validation
-
 Jacques Morice - CEA (jacques.morice@cea.fr)
 * contribution to feature improvement, validation
 
+Yacine Ould Rouis - CNRS (yacine.ould-rouis@inria.fr)
+* contribution to feature design, validation
+
 Thomas Padioleau - CEA (thomas.padioleau@cea.fr)
 * Fixed a bug with parallel file deletion
 
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
index 70ec84530..f7b9da615 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_read_test.c
@@ -29,8 +29,8 @@
 
 #define FILE "mpi_independent_test.h5"
 
-/*
-Test : Read a file using hdf5 parallel version with the option independent parallel pointer.
+/**
+* Test : Read a file using hdf5 parallel version with the option independent parallel pointer.
 */
 
 int main(int argc, char* argv[])
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
index fbeb807ac..af6469a6c 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_independent_write_test.c
@@ -29,8 +29,8 @@
 
 #define FILE "mpi_independent_test.h5"
 
-/*
-Test : Write a file using hdf5 parallel version with the option independent parallel pointer.
+/**
+* Test : Write a file using hdf5 parallel version with the option independent parallel pointer.
 */
 
 int main(int argc, char* argv[])
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c
index 85bd809e6..730e29589 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_read_test.c
@@ -29,6 +29,10 @@
 
 #define FILE "mpi_test.h5"
 
+/**
+* Test : Read a file using hdf5 parallel version with the option collective parallel pointer.
+*/
+
 int main(int argc, char* argv[])
 {
 	printf("HDF5 mpi_read_test started\n");
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c
index e50a987a3..cc3cc6ed9 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/HDF5_C/mpi_write_test.c
@@ -29,6 +29,10 @@
 
 #define FILE "mpi_test.h5"
 
+/**
+* Test : Write a file using hdf5 parallel version with the option collective parallel pointer.
+*/
+
 int main(int argc, char* argv[])
 {
 	printf("HDF5 mpi_write_test started\n");
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
index 724f423a1..284f0c88e 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_read_test.c
@@ -30,9 +30,13 @@
 
 #define FILE "mpi_independent_test.h5"
 
+/**
+* Test : Read a file using PDI with the plugin decl_hdf5 in parallel with the option mpio: INDEPENDENT.
+*/
+
 int main(int argc, char* argv[])
 {
-	printf("PDI mpi_read_test started\n");
+	printf("PDI mpi_independent_read_test started\n");
 	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
index 9536bfe9d..7e34810e5 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_independent_write_test.c
@@ -29,9 +29,13 @@
 
 #define FILE "mpi_independent_test.h5"
 
+/**
+* Test : Write a file using PDI with the plugin decl_hdf5 in parallel with the option mpio: INDEPENDENT.
+*/
+
 int main(int argc, char* argv[])
 {
-	printf("PDI mpi_write_test started\n");
+	printf("PDI mpi_independent_write_test started\n");
 	MPI_Init(&argc, &argv);
 	int mpi_rank;
 	MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
diff --git a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c
index 9efec438e..054fb11f9 100644
--- a/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c
+++ b/plugins/decl_hdf5/tests/compatibility_tests/PDI_C/mpi_write_test.c
@@ -29,6 +29,10 @@
 
 #define FILE "mpi_test.h5"
 
+/**
+* Test : Write a file using PDI with the plugin decl_hdf5 in parallel with the option mpio: COLLECTIVE(DEFAULT).
+*/
+
 int main(int argc, char* argv[])
 {
 	printf("PDI mpi_write_test started\n");