decoupling build deps

fschlimb · fschlimb · commit cab2f8ba6781 · 2022-03-11T05:04:51.000-06:00
diff --git a/src/Creator.cpp b/src/Creator.cpp
@@ -1,4 +1,5 @@
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/Creator.hpp"
+#include "ddptensor/TypeDispatch.hpp"
 #include "ddptensor/x.hpp"
 
 namespace x {
diff --git a/src/EWBinOp.cpp b/src/EWBinOp.cpp
@@ -1,4 +1,5 @@
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/EWBinOp.hpp"
+#include "ddptensor/TypeDispatch.hpp"
 #include "ddptensor/x.hpp"
 
 namespace x {
diff --git a/src/EWUnyOp.cpp b/src/EWUnyOp.cpp
@@ -1,4 +1,5 @@
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/EWUnyOp.hpp"
+#include "ddptensor/TypeDispatch.hpp"
 #include "ddptensor/x.hpp"
 
 namespace x {
diff --git a/src/IEWBinOp.cpp b/src/IEWBinOp.cpp
@@ -1,4 +1,5 @@
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/IEWBinOp.hpp"
+#include "ddptensor/TypeDispatch.hpp"
 #include "ddptensor/x.hpp"
 
 namespace x {
diff --git a/src/Random.cpp b/src/Random.cpp
@@ -1,7 +1,6 @@
 #include <xtensor/xrandom.hpp>
 #include "ddptensor/Random.hpp"
 #include "ddptensor/x.hpp"
-#include "ddptensor/Operations.hpp"
 
 using ptr_type = tensor_i::ptr_type;
 
diff --git a/src/ReduceOp.cpp b/src/ReduceOp.cpp
@@ -1,4 +1,5 @@
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/ReduceOp.hpp"
+#include "ddptensor/TypeDispatch.hpp"
 #include "ddptensor/x.hpp"
 
 namespace x {
diff --git a/src/SetGetItem.cpp b/src/SetGetItem.cpp
@@ -1,4 +1,5 @@
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/SetGetItem.hpp"
+#include "ddptensor/TypeDispatch.hpp"
 #include "ddptensor/x.hpp"
 
 namespace x {
diff --git a/src/ddptensor.cpp b/src/ddptensor.cpp
@@ -21,7 +21,13 @@ using namespace pybind11::literals; // to bring _a
 
 #include "ddptensor/MPITransceiver.hpp"
 #include "ddptensor/MPIMediator.hpp"
-#include "ddptensor/Operations.hpp"
+#include "ddptensor/Creator.hpp"
+#include "ddptensor/IEWBinOp.hpp"
+#include "ddptensor/EWBinOp.hpp"
+#include "ddptensor/EWUnyOp.hpp"
+#include "ddptensor/ReduceOp.hpp"
+#include "ddptensor/ManipOp.hpp"
+#include "ddptensor/SetGetItem.hpp"
 #include "ddptensor/Random.hpp"
 
 // #########################################################################
diff --git a/src/include/ddptensor/Creator.hpp b/src/include/ddptensor/Creator.hpp
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct Creator
+{
+    static tensor_i::ptr_type create_from_shape(CreatorId op, const shape_type & shape, DTypeId dtype=FLOAT64);
+    static tensor_i::ptr_type full(const shape_type & shape, const py::object & val, DTypeId dtype=FLOAT64);
+    static tensor_i::ptr_type arange(uint64_t start, uint64_t end, uint64_t step, DTypeId dtype=INT64);
+};
diff --git a/src/include/ddptensor/EWBinOp.hpp b/src/include/ddptensor/EWBinOp.hpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct EWBinOp
+{
+    static tensor_i::ptr_type op(EWBinOpId op, tensor_i::ptr_type a, py::object & b);
+};
diff --git a/src/include/ddptensor/EWUnyOp.hpp b/src/include/ddptensor/EWUnyOp.hpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct EWUnyOp
+{
+    static tensor_i::ptr_type op(EWUnyOpId op, tensor_i::ptr_type a);
+};
diff --git a/src/include/ddptensor/IEWBinOp.hpp b/src/include/ddptensor/IEWBinOp.hpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct IEWBinOp
+{
+    static void op(IEWBinOpId op, tensor_i::ptr_type a, py::object & b);
+};
diff --git a/src/include/ddptensor/ManipOp.hpp b/src/include/ddptensor/ManipOp.hpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct ManipOp
+{
+    static tensor_i::ptr_type reshape(tensor_i::ptr_type a, const shape_type & shape);
+};
diff --git a/src/include/ddptensor/ReduceOp.hpp b/src/include/ddptensor/ReduceOp.hpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct ReduceOp
+{
+    static tensor_i::ptr_type op(ReduceOpId op, tensor_i::ptr_type a, const dim_vec_type & dim);
+};
diff --git a/src/include/ddptensor/SetGetItem.hpp b/src/include/ddptensor/SetGetItem.hpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+#pragma once
+
+#include "UtilsAndTypes.hpp"
+#include "tensor_i.hpp"
+#include "p2c_ids.hpp"
+
+struct GetItem
+{
+    static tensor_i::ptr_type __getitem__(tensor_i::ptr_type a, const std::vector<py::slice> & v);
+    static py::object get_slice(tensor_i::ptr_type a, const std::vector<py::slice> & v);
+};
+
+struct SetItem
+{
+    static void __setitem__(tensor_i::ptr_type a, const std::vector<py::slice> & v, tensor_i::ptr_type b);
+};
diff --git a/src/include/ddptensor/TypeDispatch.hpp b/src/include/ddptensor/TypeDispatch.hpp
@@ -7,50 +7,6 @@
 #include "x.hpp"
 #include "p2c_ids.hpp"
 
-struct Creator
-{
-    static tensor_i::ptr_type create_from_shape(CreatorId op, const shape_type & shape, DTypeId dtype=FLOAT64);
-    static tensor_i::ptr_type full(const shape_type & shape, const py::object & val, DTypeId dtype=FLOAT64);
-    static tensor_i::ptr_type arange(uint64_t start, uint64_t end, uint64_t step, DTypeId dtype=INT64);
-};
-
-struct IEWBinOp
-{
-    static void op(IEWBinOpId op, x::DPTensorBaseX::ptr_type a, py::object & b);
-};
-
-struct EWBinOp
-{
-    static tensor_i::ptr_type op(EWBinOpId op, x::DPTensorBaseX::ptr_type a, py::object & b);
-};
-
-struct EWUnyOp
-{
-    static tensor_i::ptr_type op(EWUnyOpId op, x::DPTensorBaseX::ptr_type a);
-};
-
-struct ReduceOp
-{
-    static tensor_i::ptr_type op(ReduceOpId op, x::DPTensorBaseX::ptr_type a, const dim_vec_type & dim);
-};
-
-struct GetItem
-{
-    static tensor_i::ptr_type __getitem__(x::DPTensorBaseX::ptr_type a, const std::vector<py::slice> & v);
-    static py::object get_slice(x::DPTensorBaseX::ptr_type a, const std::vector<py::slice> & v);
-};
-
-struct SetItem
-{
-    static void __setitem__(x::DPTensorBaseX::ptr_type a, const std::vector<py::slice> & v, x::DPTensorBaseX::ptr_type b);
-};
-
-struct ManipOp
-{
-    static tensor_i::ptr_type reshape(x::DPTensorBaseX::ptr_type a, const shape_type & shape);
-};
-
-
 // Dependent on dt, dispatch arguments to a operation class.
 // The operation must
 //    * be a template class accepting the element type as argument
@@ -92,7 +48,7 @@ auto TypeDispatch(DTypeId dt, Ts&&... args)
 }
 
 template<typename A>
-typename x::DPTensorX<A>::typed_ptr_type _downcast(const x::DPTensorBaseX::ptr_type & a_ptr)
+typename x::DPTensorX<A>::typed_ptr_type _downcast(const tensor_i::ptr_type & a_ptr)
 {
     auto _a = std::dynamic_pointer_cast<x::DPTensorX<A>>(a_ptr);
     if(!_a )
@@ -102,13 +58,13 @@ typename x::DPTensorX<A>::typed_ptr_type _downcast(const x::DPTensorBaseX::ptr_t
 
 // Dependent on dt, dispatch arguments to a operation class.
 // The operation must implement one or more "op" methods matching the given arguments (args)
-// Recursiovely called to downcast x::DPTensorBaseX::ptr_type to typed shared_pointers.
+// Recursiovely called to downcast tensor_i::ptr_type to typed shared_pointers.
 // Downcasted tensor arg is removed from front of arg list and appended to its end.
 // All other arguments are opaquely passed to the operation.
 template<typename OpDispatch, typename... Ts>
-auto TypeDispatch(x::DPTensorBaseX::ptr_type & a_ptr, Ts&&... args)
+auto TypeDispatch(tensor_i::ptr_type & a_ptr, Ts&&... args)
 {
-    using ptr_type = x::DPTensorBaseX::ptr_type;
+    using ptr_type = tensor_i::ptr_type;
     switch(a_ptr->dtype()) {
     case FLOAT64:
         return TypeDispatch<OpDispatch>(std::forward<Ts>(args)..., _downcast<double>(a_ptr));
