Introduce a new 'Module::Stateful' class.

aff3ct · Jul 26, 2024 · be8df53 · be8df53
1 parent 58a56ac
commit be8df53
Show file tree

Hide file tree

Showing 94 changed files with 268 additions and 195 deletions.
diff --git a/include/Module/Module.hpp b/include/Module/Module.hpp
@@ -21,6 +21,8 @@ namespace spu
 {
 namespace module
 {
+class Stateful;
+class Stateless;
 /*!
  * \class Module
  *
@@ -30,6 +32,9 @@ class Module
   : public tools::Interface_clone
   , public tools::Interface_get_set_n_frames
 {
+    friend Stateful;
+    friend Stateless;
+
   protected:
     size_t n_frames; /*!< Number of frames to process in this Module */
     size_t n_frames_per_wave;
@@ -44,11 +49,13 @@ class Module
   public:
     std::vector<std::shared_ptr<runtime::Task>> tasks;
 
+  protected:
     /*!
      * \brief Constructor.
      */
     explicit Module();
 
+  public:
     /*!
      * \brief Destructor.
      */
@@ -96,7 +103,7 @@ class Module
     bool is_stateful() const;
     bool is_clonable() const;
 
-  protected:
+  private:
     void deep_copy(const Module& m);
 
     void set_name(const std::string& name);
@@ -261,7 +268,6 @@ class Module
 
     void set_single_wave(const bool enable_single_wave);
 
-  private:
     void _set_n_frames_per_wave(const size_t n_frames_per_wave);
     void _set_n_frames(const size_t n_frames);
 };

diff --git a/include/Module/Adaptor/Adaptor.hpp → include/Module/Stateful/Adaptor/Adaptor.hpp b/include/Module/Adaptor/Adaptor.hpp → include/Module/Stateful/Adaptor/Adaptor.hpp
@@ -12,7 +12,7 @@
 #include <typeindex>
 #include <vector>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 #include "Runtime/Sequence/Sequence.hpp"
 #include "Runtime/Socket/Socket.hpp"
 #include "Runtime/Task/Task.hpp"
@@ -71,7 +71,7 @@ enum class pull_1 : size_t
 }
 
 class Adaptor
-  : public Module
+  : public Stateful
   , public tools::Interface_waiting
 {
     friend runtime::Sequence; // Sequence is friend to enable the no copy mode (0 copy)
@@ -111,7 +111,7 @@ class Adaptor
     inline Adaptor(const std::vector<size_t>& n_elmts,
                    const std::vector<std::type_index>& datatype,
                    const size_t buffer_size);
-    using Module::deep_copy;
+    using Stateful::deep_copy;
     virtual void deep_copy(const Adaptor& m);
     inline bool is_full(const size_t id);
     inline bool is_empty(const size_t id);
@@ -134,7 +134,7 @@ class Adaptor
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Adaptor/Adaptor.hxx"
+#include "Module/Stateful/Adaptor/Adaptor.hxx"
 #endif
 
 #endif /* ADAPTOR_HPP_ */
diff --git a/include/Module/Adaptor/Adaptor.hxx → include/Module/Stateful/Adaptor/Adaptor.hxx b/include/Module/Adaptor/Adaptor.hxx → include/Module/Stateful/Adaptor/Adaptor.hxx
@@ -2,7 +2,7 @@
 #include <sstream>
 #include <string>
 
-#include "Module/Adaptor/Adaptor.hpp"
+#include "Module/Stateful/Adaptor/Adaptor.hpp"
 #include "Tools/Exception/exception.hpp"
 #include "Tools/compute_bytes.h"
 
@@ -12,7 +12,7 @@ namespace module
 {
 
 Adaptor::Adaptor(const size_t n_elmts, const std::type_index datatype, const size_t buffer_size)
-  : Module()
+  : Stateful()
   , n_elmts(1, n_elmts)
   , n_bytes(1, tools::compute_bytes(n_elmts, datatype))
   , datatype(1, datatype)
@@ -65,7 +65,7 @@ Adaptor::Adaptor(const size_t n_elmts, const std::type_index datatype, const siz
 Adaptor::Adaptor(const std::vector<size_t>& n_elmts,
                  const std::vector<std::type_index>& datatype,
                  const size_t buffer_size)
-  : Module()
+  : Stateful()
   , n_elmts(n_elmts)
   , n_bytes(tools::compute_bytes(n_elmts, datatype))
   , datatype(datatype)

diff --git a/include/Module/Adaptor/Adaptor_1_to_n.hpp → ...odule/Stateful/Adaptor/Adaptor_1_to_n.hpp b/include/Module/Adaptor/Adaptor_1_to_n.hpp → ...odule/Stateful/Adaptor/Adaptor_1_to_n.hpp
@@ -14,7 +14,7 @@
 #include <typeindex>
 #include <vector>
 
-#include "Module/Adaptor/Adaptor.hpp"
+#include "Module/Stateful/Adaptor/Adaptor.hpp"
 #include "Runtime/Socket/Socket.hpp"
 #include "Runtime/Task/Task.hpp"
 
@@ -71,7 +71,7 @@ class Adaptor_1_to_n : public Adaptor
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Adaptor/Adaptor_1_to_n.hxx"
+#include "Module/Stateful/Adaptor/Adaptor_1_to_n.hxx"
 #endif
 
 #endif /* ADAPTOR_1_TO_N_HPP_ */
diff --git a/include/Module/Adaptor/Adaptor_1_to_n.hxx → ...odule/Stateful/Adaptor/Adaptor_1_to_n.hxx b/include/Module/Adaptor/Adaptor_1_to_n.hxx → ...odule/Stateful/Adaptor/Adaptor_1_to_n.hxx
@@ -1,7 +1,7 @@
 #include <sstream>
 #include <string>
 
-#include "Module/Adaptor/Adaptor_1_to_n.hpp"
+#include "Module/Stateful/Adaptor/Adaptor_1_to_n.hpp"
 #include "Tools/Exception/exception.hpp"
 
 namespace spu

diff --git a/include/Module/Adaptor/Adaptor_n_to_1.hpp → ...odule/Stateful/Adaptor/Adaptor_n_to_1.hpp b/include/Module/Adaptor/Adaptor_n_to_1.hpp → ...odule/Stateful/Adaptor/Adaptor_n_to_1.hpp
@@ -14,7 +14,7 @@
 #include <typeindex>
 #include <vector>
 
-#include "Module/Adaptor/Adaptor.hpp"
+#include "Module/Stateful/Adaptor/Adaptor.hpp"
 #include "Runtime/Socket/Socket.hpp"
 #include "Runtime/Task/Task.hpp"
 
@@ -71,7 +71,7 @@ class Adaptor_n_to_1 : public Adaptor
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Adaptor/Adaptor_n_to_1.hxx"
+#include "Module/Stateful/Adaptor/Adaptor_n_to_1.hxx"
 #endif
 
 #endif /* ADAPTOR_N_TO_1_HPP_ */
diff --git a/include/Module/Adaptor/Adaptor_n_to_1.hxx → ...odule/Stateful/Adaptor/Adaptor_n_to_1.hxx b/include/Module/Adaptor/Adaptor_n_to_1.hxx → ...odule/Stateful/Adaptor/Adaptor_n_to_1.hxx
@@ -1,7 +1,7 @@
 #include <sstream>
 #include <string>
 
-#include "Module/Adaptor/Adaptor_n_to_1.hpp"
+#include "Module/Stateful/Adaptor/Adaptor_n_to_1.hpp"
 #include "Tools/Exception/exception.hpp"
 
 namespace spu

diff --git a/include/Module/Binaryop/Binaryop.hpp → ...ude/Module/Stateful/Binaryop/Binaryop.hpp b/include/Module/Binaryop/Binaryop.hpp → ...ude/Module/Stateful/Binaryop/Binaryop.hpp
@@ -9,7 +9,7 @@
 #include <memory>
 #include <vector>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 #include "Runtime/Socket/Socket.hpp"
 #include "Runtime/Task/Task.hpp"
 #include "Tools/Math/binaryop.h"
@@ -47,7 +47,7 @@ enum class performf : size_t
 }
 
 template<typename TI, typename TO, tools::proto_bop<TI, TO> BOP>
-class Binaryop : public Module
+class Binaryop : public Stateful
 {
   public:
     inline runtime::Task& operator[](const bop::tsk t);
@@ -150,7 +150,7 @@ using Binaryop_eq = Binaryop<TI, TO, tools::bop_eq<TI, TO>>;
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Binaryop/Binaryop.hxx"
+#include "Module/Stateful/Binaryop/Binaryop.hxx"
 #endif
 
 #endif /* BINARYOP_HPP_ */
diff --git a/include/Module/Binaryop/Binaryop.hxx → ...ude/Module/Stateful/Binaryop/Binaryop.hxx b/include/Module/Binaryop/Binaryop.hxx → ...ude/Module/Stateful/Binaryop/Binaryop.hxx
@@ -1,4 +1,4 @@
-#include "Module/Binaryop/Binaryop.hpp"
+#include "Module/Stateful/Binaryop/Binaryop.hpp"
 
 namespace spu
 {
@@ -35,7 +35,7 @@ Binaryop<TI, TO, BOP>::operator[](const std::string& tsk_sck)
 
 template<typename TI, typename TO, tools::proto_bop<TI, TO> BOP>
 Binaryop<TI, TO, BOP>::Binaryop(const size_t n_in0, const size_t n_in1)
-  : Module()
+  : Stateful()
   , n_elmts(n_in0 > n_in1 ? n_in0 : n_in1)
 {
     const std::string name = "Binaryop";

diff --git a/include/Module/Controller/Controller.hpp → ...Module/Stateful/Controller/Controller.hpp b/include/Module/Controller/Controller.hpp → ...Module/Stateful/Controller/Controller.hpp
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 #include "Tools/Interface/Interface_reset.hpp"
 
 namespace spu
@@ -34,7 +34,7 @@ enum class control : size_t
 }
 
 class Controller
-  : public Module
+  : public Stateful
   , public tools::Interface_reset
 {
   public:
@@ -67,7 +67,7 @@ class Controller
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Controller/Controller.hxx"
+#include "Module/Stateful/Controller/Controller.hxx"
 #endif
 
 #endif /* CONTROLLER_HPP_ */
diff --git a/include/Module/Controller/Controller.hxx → ...Module/Stateful/Controller/Controller.hxx b/include/Module/Controller/Controller.hxx → ...Module/Stateful/Controller/Controller.hxx
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "Module/Controller/Controller.hpp"
+#include "Module/Stateful/Controller/Controller.hpp"
 
 namespace spu
 {

diff --git a/...r/Controller_cyclic/Controller_cyclic.hpp → ...r/Controller_cyclic/Controller_cyclic.hpp b/...r/Controller_cyclic/Controller_cyclic.hpp → ...r/Controller_cyclic/Controller_cyclic.hpp
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "Module/Controller/Controller.hpp"
+#include "Module/Stateful/Controller/Controller.hpp"
 
 namespace spu
 {

diff --git a/...ler/Controller_limit/Controller_limit.hpp → ...ler/Controller_limit/Controller_limit.hpp b/...ler/Controller_limit/Controller_limit.hpp → ...ler/Controller_limit/Controller_limit.hpp
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "Module/Controller/Controller.hpp"
+#include "Module/Stateful/Controller/Controller.hpp"
 
 namespace spu
 {

diff --git a/...r/Controller_static/Controller_static.hpp → ...r/Controller_static/Controller_static.hpp b/...r/Controller_static/Controller_static.hpp → ...r/Controller_static/Controller_static.hpp
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "Module/Controller/Controller.hpp"
+#include "Module/Stateful/Controller/Controller.hpp"
 
 namespace spu
 {

diff --git a/include/Module/Delayer/Delayer.hpp → include/Module/Stateful/Delayer/Delayer.hpp b/include/Module/Delayer/Delayer.hpp → include/Module/Stateful/Delayer/Delayer.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 
 namespace spu
 {
@@ -36,7 +36,7 @@ enum class produce : uint8_t
 }
 
 template<typename D = int>
-class Delayer : public Module
+class Delayer : public Stateful
 {
   public:
     inline runtime::Task& operator[](const dly::tsk t);
@@ -66,6 +66,6 @@ class Delayer : public Module
 }
 }
 
-#include "Module/Delayer/Delayer.hxx"
+#include "Module/Stateful/Delayer/Delayer.hxx"
 
 #endif /* DELAYER_HPP_ */
diff --git a/include/Module/Delayer/Delayer.hxx → include/Module/Stateful/Delayer/Delayer.hxx b/include/Module/Delayer/Delayer.hxx → include/Module/Stateful/Delayer/Delayer.hxx
@@ -1,4 +1,4 @@
-#include "Module/Delayer/Delayer.hpp"
+#include "Module/Stateful/Delayer/Delayer.hpp"
 
 namespace spu
 {

diff --git a/include/Module/Finalizer/Finalizer.hpp → ...e/Module/Stateful/Finalizer/Finalizer.hpp b/include/Module/Finalizer/Finalizer.hpp → ...e/Module/Stateful/Finalizer/Finalizer.hpp
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 
 #include "Tools/Interface/Interface_reset.hpp"
 
@@ -36,7 +36,7 @@ enum class finalize : size_t
 
 template<typename T = int>
 class Finalizer
-  : public Module
+  : public Stateful
   , public tools::Interface_reset
 {
   public:
@@ -73,7 +73,7 @@ class Finalizer
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Finalizer/Finalizer.hxx"
+#include "Module/Stateful/Finalizer/Finalizer.hxx"
 #endif
 
 #endif /* FINALIZER_HPP_ */
diff --git a/include/Module/Finalizer/Finalizer.hxx → ...e/Module/Stateful/Finalizer/Finalizer.hxx b/include/Module/Finalizer/Finalizer.hxx → ...e/Module/Stateful/Finalizer/Finalizer.hxx
@@ -1,4 +1,4 @@
-#include "Module/Finalizer/Finalizer.hpp"
+#include "Module/Stateful/Finalizer/Finalizer.hpp"
 
 namespace spu
 {

diff --git a/include/Module/Incrementer/Incrementer.hpp → ...dule/Stateful/Incrementer/Incrementer.hpp b/include/Module/Incrementer/Incrementer.hpp → ...dule/Stateful/Incrementer/Incrementer.hpp
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 
 namespace spu
 {
@@ -40,7 +40,7 @@ enum class incrementf : size_t
 }
 
 template<typename T = int>
-class Incrementer : public Module
+class Incrementer : public Stateful
 {
   public:
     inline runtime::Task& operator[](const inc::tsk t);
@@ -76,7 +76,7 @@ class Incrementer : public Module
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Incrementer/Incrementer.hxx"
+#include "Module/Stateful/Incrementer/Incrementer.hxx"
 #endif
 
 #endif /* INCREMENTER_HPP_ */
diff --git a/include/Module/Incrementer/Incrementer.hxx → ...dule/Stateful/Incrementer/Incrementer.hxx b/include/Module/Incrementer/Incrementer.hxx → ...dule/Stateful/Incrementer/Incrementer.hxx
@@ -1,4 +1,4 @@
-#include "Module/Incrementer/Incrementer.hpp"
+#include "Module/Stateful/Incrementer/Incrementer.hpp"
 
 namespace spu
 {

diff --git a/include/Module/Initializer/Initializer.hpp → ...dule/Stateful/Initializer/Initializer.hpp b/include/Module/Initializer/Initializer.hpp → ...dule/Stateful/Initializer/Initializer.hpp
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "Module/Module.hpp"
+#include "Module/Stateful/Stateful.hpp"
 
 namespace spu
 {
@@ -32,7 +32,7 @@ enum class initialize : size_t
 }
 
 template<typename T = int>
-class Initializer : public Module
+class Initializer : public Stateful
 {
   public:
     inline runtime::Task& operator[](const ini::tsk t);
@@ -66,7 +66,7 @@ class Initializer : public Module
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#include "Module/Initializer/Initializer.hxx"
+#include "Module/Stateful/Initializer/Initializer.hxx"
 #endif
 
 #endif /* INITIALIZER_HPP_ */