Merge branch 'numpex' of github.com:pdidev/tutorial into numpex

Author: benoitmartin88

begin/CMakeLists.txt

@@ -0,0 +1,36 @@
+#=============================================================================
+# Copyright (C) 2015-2023 Commissariat a l'energie atomique et aux energies alternatives (CEA)
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# 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.
+#=============================================================================
+
+cmake_minimum_required(VERSION 3.16)
+project(pdi_init LANGUAGES C)
+
+find_package(spdlog)
+find_package(MPI REQUIRED COMPONENTS C)
+find_package(paraconf 1.0.0 REQUIRED COMPONENTS C)
+find_package(PDI 1.9.0 REQUIRED COMPONENTS C)
+
+set(CMAKE_C_STANDARD 99)
+
+add_executable(main main.c)
+target_link_libraries(main m MPI::MPI_C paraconf::paraconf)
+
+

ex1.yml renamed to begin/config.yml

@@ -3,4 +3,4 @@ alpha: 0.125
 # global data-size (excluding the number of ghost layers for boundary conditions)
 global_size: { height: 60, width: 12 }
 # degree of parallelism (number of blocks in each dimension)
-parallelism: { height: 1, width: 1 }
+parallelism: { height: 2, width: 2 }

ex1.c renamed to begin/main.c

@@ -30,8 +30,7 @@
 #include <time.h>
 
 #include <paraconf.h>
-// load the PDI header
-#include <pdi.h>
+
 
 // size of the local data as [HEIGHT, WIDTH] including the number of ghost
 // layers for communications or boundary conditions
@@ -152,7 +151,7 @@ int main(int argc, char *argv[]) {
   MPI_Init(&argc, &argv);
 
   // load the configuration tree
-  PC_tree_t conf = PC_parse_path("ex1.yml");
+  PC_tree_t conf = PC_parse_path("config.yml");
 
   // NEVER USE MPI_COMM_WORLD IN THE CODE, use our own communicator main_comm
   // instead

begin/solution/CMakeLists.txt

@@ -0,0 +1,36 @@
+#=============================================================================
+# Copyright (C) 2015-2023 Commissariat a l'energie atomique et aux energies alternatives (CEA)
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# 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.
+#=============================================================================
+
+cmake_minimum_required(VERSION 3.16)
+project(pdi_init LANGUAGES C)
+
+find_package(spdlog)
+find_package(MPI REQUIRED COMPONENTS C)
+find_package(paraconf 1.0.0 REQUIRED COMPONENTS C)
+find_package(PDI 1.9.0 REQUIRED COMPONENTS C)
+
+set(CMAKE_C_STANDARD 99)
+
+add_executable(main main.c)
+target_link_libraries(main m MPI::MPI_C paraconf::paraconf PDI::pdi)
+
+

solutions/ex2.yml renamed to begin/solution/config.yml

@@ -3,10 +3,6 @@ alpha: 0.125
 # global data-size (excluding the number of ghost layers for boundary conditions)
 global_size: { height: 60, width: 12 }
 # degree of parallelism (number of blocks in each dimension)
-parallelism: { height: 1, width: 1 }
+parallelism: { height: 2, width: 2 }
 
-#*** PDI configuration
-pdi:
-  plugins:
-    trace:
-      logging: { pattern: '[PDI][%n-plugin] *** %l: %v' }
+pdi:

ex2.c renamed to begin/solution/main.c

@@ -152,15 +152,13 @@ int main(int argc, char *argv[]) {
   MPI_Init(&argc, &argv);
 
   // load the configuration tree
-  PC_tree_t conf = PC_parse_path("ex2.yml");
-
+  PC_tree_t conf = PC_parse_path("config.yml");
+  PDI_init(PC_get(conf, ".pdi"));
+  
   // NEVER USE MPI_COMM_WORLD IN THE CODE, use our own communicator main_comm
   // instead
   MPI_Comm main_comm = MPI_COMM_WORLD;
 
-  // initialize PDI, it can replace our main communicator by its own
-  PDI_init(PC_get(conf, ".pdi"));
-
   // load the MPI rank & size
   int psize_1d;
   MPI_Comm_size(main_comm, &psize_1d);
@@ -172,8 +170,9 @@ int main(int argc, char *argv[]) {
   // load the alpha parameter
   PC_double(PC_get(conf, ".alpha"), &alpha);
 
-  // load the global data-size
   int global_size[2];
+  // load the global data-size
+  // you can use paraconf to read some parameters from the yml config file
   PC_int(PC_get(conf, ".global_size.height"), &longval);
   global_size[0] = longval;
   PC_int(PC_get(conf, ".global_size.width"), &longval);
@@ -211,14 +210,8 @@ int main(int argc, char *argv[]) {
   // our loop counter so as to be able to use it outside the loop
   int ii = 0;
 
-  //*** share useful configuration bits with PDI
-  //*** pcoord, psize, dsize
-  //...
-
   // the main loop
-  for (; ii < 4; ++ii) {
-    //*** share the loop counter & main field at each iteration
-    //...
+  for (; ii < 10; ++ii) {
 
     // compute the values for the next iteration
     iter(cur, next);
@@ -231,18 +224,14 @@ int main(int argc, char *argv[]) {
     cur = next;
     next = tmp;
   }
-  //*** finally share the loop counter and main field after the main loop body
-  //...
-
-  // finalize PDI
-  PDI_finalize();
 
   // destroy the paraconf configuration tree
   PC_tree_destroy(&conf);
 
   // free the allocated memory
   free(cur);
   free(next);
+  PDI_finalize();
 
   // finalize MPI
   MPI_Finalize();

ex2.log

@@ -0,0 +1,36 @@
+#=============================================================================
+# Copyright (C) 2015-2023 Commissariat a l'energie atomique et aux energies alternatives (CEA)
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# 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.
+#=============================================================================
+
+cmake_minimum_required(VERSION 3.16)
+project(pdi_init LANGUAGES C)
+
+find_package(spdlog)
+find_package(MPI REQUIRED COMPONENTS C)
+find_package(paraconf 1.0.0 REQUIRED COMPONENTS C)
+find_package(PDI 1.9.0 REQUIRED COMPONENTS C)
+
+set(CMAKE_C_STANDARD 99)
+
+add_executable(main main.c)
+target_link_libraries(main m MPI::MPI_C paraconf::paraconf PDI::pdi)
+
+

expose/CMakeLists.txt

@@ -3,8 +3,6 @@ alpha: 0.125
 # global data-size (excluding the number of ghost layers for boundary conditions)
 global_size: { height: 60, width: 12 }
 # degree of parallelism (number of blocks in each dimension)
-parallelism: { height: 1, width: 1 }
+parallelism: { height: 2, width: 2 }
 
 pdi:
-#*** PDI configuration: use the trace plugin to print all the PDI activities
-#...