Move action declarations to headers

computationalgeography · Feb 20, 2024 · c992ad0 · c992ad0
1 parent 347da60
commit c992ad0
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 11 deletions.
diff --git a/...work/partitioned_array/include/lue/framework/partitioned_array/server/array_partition.hpp b/...work/partitioned_array/include/lue/framework/partitioned_array/server/array_partition.hpp
@@ -122,7 +122,7 @@ namespace lue::server {
     }                                                                                                        \
                                                                                                              \
     HPX_REGISTER_COMPONENT(                                                                                  \
-        lue::detail::ArrayPartitionServerComponent_##unique, ArrayPartitionServer_##unique)                  \
+        lue::detail::ArrayPartitionServerComponent_##unique, lue_ArrayPartitionServer_##unique)              \
                                                                                                              \
     HPX_REGISTER_ACTION(                                                                                     \
         lue::detail::ArrayPartitionServer_##unique::DataAction, ArrayPartitionServerDataAction_##unique)     \
@@ -146,3 +146,25 @@ namespace lue::server {
     HPX_REGISTER_ACTION(                                                                                     \
         lue::detail::ArrayPartitionServer_##unique::NrElementsAction,                                        \
         ArrayPartitionServerNrElementsAction_##unique)
+
+
+#define LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(Element)                                       \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS(Element, 0, Element##_0)                                \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS(Element, 1, Element##_1)                                \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS(Element, 2, Element##_2)
+
+#define LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_ELEMENT()                                           \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(bool)                                              \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(uint8_t)                                           \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(int32_t)                                           \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(uint32_t)                                          \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(int64_t)                                           \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(uint64_t)                                          \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(float)                                             \
+    LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK(double)
+
+LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_ELEMENT()
+
+#undef LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS
+#undef LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_ELEMENT
+#undef LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS_RANK
diff --git a/source/framework/partitioned_array/src/server/array_partition.cpp b/source/framework/partitioned_array/src/server/array_partition.cpp
@@ -1,4 +1,5 @@
 #include "lue/framework/partitioned_array/server/array_partition_impl.hpp"
 
 
+// Boilerplate required once per component module
 HPX_REGISTER_COMPONENT_MODULE()
diff --git a/source/framework/partitioned_array/src/server/array_partition.cpp.in b/source/framework/partitioned_array/src/server/array_partition.cpp.in
@@ -1,10 +1,6 @@
 #include "lue/framework/partitioned_array/server/array_partition_impl.hpp"
 
 
-LUE_REGISTER_ARRAY_PARTITION_ACTION_DECLARATIONS(
-    {{ Element }},
-    {{ rank }},
-    {{ Element }}_{{ rank }})
 LUE_REGISTER_ARRAY_PARTITION_ACTIONS(
     {{ Element }},
     {{ rank }},

diff --git a/...rtitioned_route/include/lue/framework/partitioned_route/server/serial_route_partition.hpp b/...rtitioned_route/include/lue/framework/partitioned_route/server/serial_route_partition.hpp
@@ -143,7 +143,7 @@ namespace lue::server {
     }                                                                                                        \
                                                                                                              \
     HPX_REGISTER_COMPONENT(                                                                                  \
-        lue::detail::SerialRoutePartitionServerComponent_##unique, SerialRoutePartitionServer_##unique)      \
+        lue::detail::SerialRoutePartitionServerComponent_##unique, lue_SerialRoutePartitionServer_##unique)  \
                                                                                                              \
     HPX_REGISTER_ACTION(                                                                                     \
         lue::detail::SerialRoutePartitionServer_##unique::OffsetAction,                                      \
@@ -172,3 +172,21 @@ namespace lue::server {
     HPX_REGISTER_ACTION(                                                                                     \
         lue::detail::SerialRoutePartitionServer_##unique::RemoteRouteFragmentLocationsAction,                \
         SerialRoutePartitionServerRemoteRouteFragmentLocationsAction_##unique)
+
+
+#define LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK(Element)                                \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS(Element, 1, Element##_1)                         \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS(Element, 2, Element##_2)
+
+#define LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_ELEMENT()                                    \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK(uint8_t)                                    \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK(int32_t)                                    \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK(uint32_t)                                   \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK(int64_t)                                    \
+    LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK(uint64_t)
+
+LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_ELEMENT()
+
+#undef LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS
+#undef LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_ELEMENT
+#undef LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS_RANK
diff --git a/source/framework/partitioned_route/src/server/serial_route_partition.cpp b/source/framework/partitioned_route/src/server/serial_route_partition.cpp
@@ -1,5 +1,5 @@
 #include "lue/framework/partitioned_route/server/serial_route_partition_impl.hpp"
 
 
-// Once per module (shared lib)
+// Boilerplate required once per component module
 HPX_REGISTER_COMPONENT_MODULE()
diff --git a/source/framework/partitioned_route/src/server/serial_route_partition.cpp.in b/source/framework/partitioned_route/src/server/serial_route_partition.cpp.in
@@ -1,10 +1,6 @@
 #include "lue/framework/partitioned_route/server/serial_route_partition_impl.hpp"
 
 
-LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTION_DECLARATIONS(
-    {{ RouteID }},
-    {{ rank }},
-    {{ RouteID }}_{{ rank }})
 LUE_REGISTER_SERIAL_ROUTE_PARTITION_ACTIONS(
     {{ RouteID }},
     {{ rank }},