Merge pull request #78 from DARMA-tasking/feature-issue-70

Addresses issue #70
DARMA-tasking-internal · Feb 13, 2018 · 6eb14ad · 6eb14ad
2 parents c8c3f91 + 851e6d5
commit 6eb14ad
Show file tree

Hide file tree

Showing 29 changed files with 738 additions and 603 deletions.
diff --git a/src/include/darma/impl/access_handle/access_handle_serialization.h b/src/include/darma/impl/access_handle/access_handle_serialization.h
@@ -252,7 +252,7 @@ AccessHandle<T, Traits>::unpack_from_archive(Archive& ar) {
 
   var_handle_base_ = detail::make_shared<detail::VariableHandle<T>>(k);
 
-  auto use_base = abstract::frontend::PolymorphicSerializableObject<detail::HandleUseBase>
+  auto use_base = serialization::PolymorphicSerializableObject<detail::HandleUseBase>
     ::unpack(*reinterpret_cast<char const**>(&ar.data_pointer_reference()));
   use_base->set_handle(var_handle_base_);
 

diff --git a/src/include/darma/impl/array/index_range.h b/src/include/darma/impl/array/index_range.h
@@ -45,8 +45,9 @@
 #ifndef DARMA_IMPL_ARRAY_INDEX_RANGE_H
 #define DARMA_IMPL_ARRAY_INDEX_RANGE_H
 
+#include <darma/serialization/polymorphic/polymorphic_serialization_adapter.h>
+
 #include <darma/interface/frontend/index_range.h>
-#include <darma/impl/polymorphic_serialization.h>
 
 namespace darma_runtime {
 
@@ -116,7 +117,7 @@ operator+ (IntegerConvertible&& other, ContiguousIndex<Integer> const& idx) {
 
 template <typename Integer>
 class ContiguousIndexRange
-  : public detail::PolymorphicSerializationAdapter<
+  : public serialization::PolymorphicSerializationAdapter<
       ContiguousIndexRange<Integer>,
       abstract::frontend::IndexRange
     >

diff --git a/src/include/darma/impl/collective/reduce_op.h b/src/include/darma/impl/collective/reduce_op.h
@@ -46,19 +46,19 @@
 #ifndef DARMA_IMPL_COLLECTIVE_REDUCE_OP_H
 #define DARMA_IMPL_COLLECTIVE_REDUCE_OP_H
 
-#include <cstdlib>
-#include <type_traits>
-#include <set>
-#include <unordered_set>
-
 #include <darma/interface/frontend/reduce_operation.h>
 
 #include <darma/impl/array/indexable.h>
 #include <darma/impl/array/concept.h>
 #include <darma/impl/meta/has_op.h>
-#include <darma/impl/polymorphic_serialization.h>
 
 #include <darma/serialization/serializers/standard_library/set.h>
+#include <darma/serialization/polymorphic/polymorphic_serialization_adapter.h>
+
+#include <cstdlib>
+#include <type_traits>
+#include <set>
+#include <unordered_set>
 
 namespace darma_runtime {
 
@@ -67,7 +67,7 @@ namespace detail {
 
 template <typename Op, typename value_type>
 class ReduceOperationWrapper
-  : public darma_runtime::detail::PolymorphicSerializationAdapter<
+  : public serialization::PolymorphicSerializationAdapter<
       ReduceOperationWrapper<Op, value_type>,
       abstract::frontend::ReduceOp
     >,

diff --git a/src/include/darma/impl/handle_use_base.h b/src/include/darma/impl/handle_use_base.h
@@ -68,7 +68,7 @@ class HandleUseBase
     public abstract::frontend::CollectionManagingUse,
     public abstract::frontend::UsePendingRegistration,
     public abstract::frontend::UsePendingRelease,
-    public abstract::frontend::PolymorphicSerializableObject<HandleUseBase>
+    public serialization::PolymorphicSerializableObject<HandleUseBase>
 {
   public:
 

diff --git a/src/include/darma/impl/index_range/dense_range.h b/src/include/darma/impl/index_range/dense_range.h
@@ -46,7 +46,7 @@
 #define DARMA_IMPL_INDEX_RANGE_DENSE_RANGE_H
 
 #include <darma/interface/frontend/index_range.h>
-#include <darma/impl/polymorphic_serialization.h>
+#include <darma/serialization/polymorphic/polymorphic_serialization_adapter.h>
 
 namespace darma_runtime {
 namespace indexing {
@@ -56,7 +56,7 @@ namespace detail {
 template <typename Integer>
 class basic_dense_index_range
   : public abstract::frontend::IndexRange,
-    public darma_runtime::detail::PolymorphicSerializationAdapter<
+    public serialization::PolymorphicSerializationAdapter<
       basic_dense_index_range<Integer>,
       abstract::frontend::IndexRange
     >

diff --git a/src/include/darma/impl/index_range/range_1d.h b/src/include/darma/impl/index_range/range_1d.h
@@ -52,7 +52,7 @@
 
 #include <darma/interface/frontend/index_range.h>
 
-#include <darma/impl/polymorphic_serialization.h>
+#include <darma/serialization/polymorphic/polymorphic_serialization_adapter.h>
 #include <darma/impl/meta/parse_properties.h>
 
 namespace darma_runtime {
@@ -129,7 +129,7 @@ template <
   typename... Properties
 >
 struct basic_integer_range_1d
-  : darma_runtime::detail::PolymorphicSerializationAdapter<
+  : serialization::PolymorphicSerializationAdapter<
       basic_integer_range_1d<Integer>,
       abstract::frontend::IndexRange
     >

diff --git a/src/include/darma/impl/index_range/range_2d.h b/src/include/darma/impl/index_range/range_2d.h
@@ -48,7 +48,8 @@
 #include <cassert>
 #include <type_traits>
 
-#include <darma/impl/polymorphic_serialization.h>
+#include <darma/serialization/polymorphic/polymorphic_serialization_adapter.h>
+#include <darma/interface/frontend/index_range.h>
 
 namespace darma_runtime {
 
@@ -77,7 +78,7 @@ struct Range2DDenseMapping;
 
 template <typename Integer>
 struct Range2D
-  : detail::PolymorphicSerializationAdapter<
+  : serialization::PolymorphicSerializationAdapter<
       Range2D<Integer>,
       abstract::frontend::IndexRange
     >