Add a simple pdi example and remove pdi from other examples

CExA-project · Dec 27, 2024 · 11e99ef · 11e99ef
1 parent 2d751a7
commit 11e99ef
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 72 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -17,12 +17,8 @@ add_executable(non_uniform_heat_equation non_uniform_heat_equation.cpp)
 target_link_libraries(non_uniform_heat_equation PUBLIC DDC::core)
 
 if("${DDC_BUILD_PDI_WRAPPER}")
-    target_compile_definitions(heat_equation PUBLIC "DDC_EXAMPLE_WITH_PDI")
-    target_compile_definitions(uniform_heat_equation PUBLIC "DDC_EXAMPLE_WITH_PDI")
-    target_compile_definitions(non_uniform_heat_equation PUBLIC "DDC_EXAMPLE_WITH_PDI")
-    target_link_libraries(heat_equation PUBLIC DDC::pdi)
-    target_link_libraries(uniform_heat_equation PUBLIC DDC::pdi)
-    target_link_libraries(non_uniform_heat_equation PUBLIC DDC::pdi)
+    add_executable(pdi_event pdi_event.cpp)
+    target_link_libraries(pdi_event PUBLIC DDC::core DDC::pdi)
 endif()
 
 if("${DDC_BUILD_KERNELS_FFT}")

diff --git a/examples/heat_equation.cpp b/examples/heat_equation.cpp
@@ -13,12 +13,6 @@
 #include <ddc/ddc.hpp>
 
 #include <Kokkos_Core.hpp>
-#if defined(DDC_EXAMPLE_WITH_PDI)
-#include <ddc/pdi.hpp>
-
-#include <paraconf.h>
-#include <pdi.h>
-#endif
 //! [includes]
 
 
@@ -87,24 +81,13 @@ void display(double time, ChunkType temp)
                 std::cout << std::setw(6) << temp_slice(ix);
             });
     std::cout << " }\n" << std::flush;
-
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    ddc::PdiEvent("display")
-            .with("temp", temp)
-            .and_with("mean_temp", mean_temp)
-            .and_with("temp_slice", temp_slice);
-#endif
 }
 //! [display]
 
 
 //! [main-start]
 int main(int argc, char** argv)
 {
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    auto pdi_conf = PC_parse_string("");
-    PDI_init(pdi_conf);
-#endif
     Kokkos::ScopeGuard const kokkos_scope(argc, argv);
     ddc::ScopeGuard const ddc_scope(argc, argv);
 
@@ -380,9 +363,4 @@ int main(int argc, char** argv)
                 ghosted_temp[x_domain][y_domain]);
     }
     //! [final output]
-
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    PDI_finalize();
-    PC_tree_destroy(&pdi_conf);
-#endif
 }
diff --git a/examples/non_uniform_heat_equation.cpp b/examples/non_uniform_heat_equation.cpp
@@ -19,12 +19,6 @@
 #include <ddc/ddc.hpp>
 
 #include <Kokkos_Core.hpp>
-#if defined(DDC_EXAMPLE_WITH_PDI)
-#include <ddc/pdi.hpp>
-
-#include <paraconf.h>
-#include <pdi.h>
-#endif
 //! [includes]
 
 //! [vector_generator]
@@ -116,22 +110,11 @@ void display(double time, ChunkType temp)
                 std::cout << std::setw(6) << temp_slice(ix);
             });
     std::cout << " }\n" << std::flush;
-
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    ddc::PdiEvent("display")
-            .with("temp", temp)
-            .and_with("mean_temp", mean_temp)
-            .and_with("temp_slice", temp_slice);
-#endif
 }
 //! [display]
 
 int main(int argc, char** argv)
 {
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    PC_tree_t pdi_conf = PC_parse_string("");
-    PDI_init(pdi_conf);
-#endif
     Kokkos::ScopeGuard const kokkos_scope(argc, argv);
     ddc::ScopeGuard const ddc_scope(argc, argv);
 
@@ -401,9 +384,4 @@ int main(int argc, char** argv)
                         DDimY>(x_domain, y_domain)]);
     }
     //! [final output]
-
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    PDI_finalize();
-    PC_tree_destroy(&pdi_conf);
-#endif
 }
diff --git a/examples/pdi_event.cpp b/examples/pdi_event.cpp
@@ -0,0 +1,73 @@
+// Copyright (C) The DDC development team, see COPYRIGHT.md file
+//
+// SPDX-License-Identifier: MIT
+
+#include <string>
+
+#include <ddc/ddc.hpp>
+#include <ddc/pdi.hpp>
+
+#include <Kokkos_Core.hpp>
+#include <paraconf.h>
+#include <pdi.h>
+
+struct DDimX
+{
+};
+
+struct DDimY
+{
+};
+
+int main(int argc, char** argv)
+{
+    Kokkos::ScopeGuard const kokkos_scope(argc, argv);
+    ddc::ScopeGuard const ddc_scope(argc, argv);
+
+    std::string const pdi_cfg = R"PDI_CFG(
+metadata:
+  pdi_chunk_label_rank: size_t
+  pdi_chunk_label_extents:
+    type: array
+    subtype: size_t
+    size: $pdi_chunk_label_rank
+
+data:
+  pdi_chunk_label:
+    type: array
+    subtype: int
+    size: [ '$pdi_chunk_label_extents[0]', '$pdi_chunk_label_extents[1]' ]
+
+plugins:
+  decl_hdf5:
+  - file: 'output.h5'
+    on_event: some_event
+    collision_policy: replace_and_warn
+    write:
+    - pdi_chunk_label_rank
+    - pdi_chunk_label_extents
+    - pdi_chunk_label
+)PDI_CFG";
+
+    PC_tree_t pdi_conf = PC_parse_string(pdi_cfg.c_str());
+    PDI_init(pdi_conf);
+
+    {
+        ddc::DiscreteDomain<DDimX, DDimY> const
+                ddom_xy(ddc::DiscreteElement<DDimX, DDimY>(7, 11),
+                        ddc::DiscreteVector<DDimX, DDimY>(3, 5));
+
+        ddc::Chunk
+                chunk("ddc_chunk_label",
+                      ddom_xy,
+                      ddc::HostAllocator<int>());
+
+        ddc::parallel_fill(chunk, 3);
+
+        ddc::PdiEvent("some_event")
+                .with("pdi_chunk_label", chunk.span_cview());
+    }
+
+    PDI_finalize();
+    PC_tree_destroy(&pdi_conf);
+}
diff --git a/examples/uniform_heat_equation.cpp b/examples/uniform_heat_equation.cpp
@@ -13,12 +13,6 @@
 #include <ddc/ddc.hpp>
 
 #include <Kokkos_Core.hpp>
-#if defined(DDC_EXAMPLE_WITH_PDI)
-#include <ddc/pdi.hpp>
-
-#include <paraconf.h>
-#include <pdi.h>
-#endif
 //! [includes]
 
 //! [X-dimension]
@@ -75,22 +69,11 @@ void display(double time, ChunkType temp)
                 std::cout << std::setw(6) << temp_slice(ix);
             });
     std::cout << " }\n" << std::flush;
-
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    ddc::PdiEvent("display")
-            .with("temp", temp)
-            .and_with("mean_temp", mean_temp)
-            .and_with("temp_slice", temp_slice);
-#endif
 }
 //! [display]
 
 int main(int argc, char** argv)
 {
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    PC_tree_t pdi_conf = PC_parse_string("");
-    PDI_init(pdi_conf);
-#endif
     Kokkos::ScopeGuard const kokkos_scope(argc, argv);
     ddc::ScopeGuard const ddc_scope(argc, argv);
 
@@ -320,9 +303,4 @@ int main(int argc, char** argv)
                         DDimY>(x_domain, y_domain)]);
     }
     //! [final output]
-
-#if defined(DDC_EXAMPLE_WITH_PDI)
-    PDI_finalize();
-    PC_tree_destroy(&pdi_conf);
-#endif
 }