Working on halo updates.

libNeonDomain/include/Neon/domain/internal/eGrid/eFieldDev.h

@@ -67,7 +67,7 @@ class eFieldDevice_t
         std::array<
             std::array<
                 std::vector<Neon::set::Transfer>,
-                Neon::set::TransferSemanticUtils::nOptions>,
+                Neon::set::StencilSemanticUtils::nOptions>,
             Neon::set::TransferModeUtils::nOptions>
             m_haloUpdateInfo;
     };
@@ -125,7 +125,7 @@ class eFieldDevice_t
                     for (auto mode : {Neon::set::TransferMode::get, Neon::set::TransferMode::put}) {
 
                         {  // (GET,PUT), FORWARD, GRID
-                            const auto           structure = Neon::set::TransferSemantic::grid;
+                            const auto           structure = Neon::set::StencilSemantic::standard;
                             auto&                transfers = h_haloUpdateInfo(mode, structure);
                             Neon::set::HuOptions huOptions(mode, transfers, structure);
                             this->haloUpdate__(m_data->grid->getBackend(), huOptions);
@@ -143,7 +143,7 @@ class eFieldDevice_t
     }
 
     auto h_haloUpdateInfo(Neon::set::TransferMode     mode,
-                          Neon::set::TransferSemantic structure)
+                          Neon::set::StencilSemantic structure)
         -> std::vector<Neon::set::Transfer>&
     {
         return m_data->m_haloUpdateInfo[static_cast<int>(mode)]
@@ -491,7 +491,7 @@ class eFieldDevice_t
 #pragma omp parallel for num_threads(ompNDevs) default(shared)
                 for (int setIdx = 0; setIdx < nDevs; setIdx++) {
                     for (int cardIdx = 0; cardIdx < self().cardinality(); cardIdx++) {
-                        constexpr auto structure = Neon::set::TransferSemantic::grid;
+                        constexpr auto structure = Neon::set::StencilSemantic::standard;
 
                         auto& peerTransferOpt = opt.getPeerTransferOpt(bk);
                         h_huSoAByCardSingleDevFwd(peerTransferOpt,
@@ -656,7 +656,7 @@ class eFieldDevice_t
 
                         Neon::set::PeerTransferOption& peerTransferOpt = huOptions.getPeerTransferOpt(bk);
                         // LATTICE + FORWARD
-                        constexpr auto structure = Neon::set::TransferSemantic::lattice;
+                        constexpr auto structure = Neon::set::StencilSemantic::streaming;
 
                         h_huSoAByCardSingleDevFwd(peerTransferOpt,
                                                   gpuIdx, cardIdx,
@@ -808,7 +808,7 @@ class eFieldDevice_t
     auto h_huSoAByCardSingleDevFwd(Neon::set::PeerTransferOption opt,
                                    int                           devIdx,
                                    const int                     cardIdx,
-                                   Neon::set::TransferSemantic   structure) const
+                                   Neon::set::StencilSemantic    structure) const
         -> void
     {
         const Neon::Backend& bk = m_data->grid->getBackend();
@@ -846,7 +846,7 @@ class eFieldDevice_t
                 }
             }
 
-            if (structure == Neon::set::TransferSemantic::lattice) {
+            if (structure == Neon::set::StencilSemantic::streaming) {
                 index_3d dir = grid().getStencil().neighbours().at(cardIdx);
                 switch (comDirection) {
                     case ComDirection_e::COM_DW: {

libNeonSet/include/Neon/set/Containter.h

@@ -1,18 +1,16 @@
 #pragma once
 
 #include "Neon/set/DevSet.h"
-#include "Neon/set/dependency/Token.h"
 #include "functional"
 #include "type_traits"
 
 #include "Neon/set/container/ContainerAPI.h"
 #include "Neon/set/container/types/HostManagedSyncType.h"
 #include "Neon/set/container/types/SynchronizationContainerType.h"
 
-#include "Neon/set/container/Loader.h"
-
 namespace Neon::set {
 
+struct Loader;
 
 struct Container
 {
@@ -111,7 +109,7 @@ struct Container
     template <typename MultiXpuDataT>
     static auto factoryDataTransfer(const MultiXpuDataT&        multiXpuData,
                                     Neon::set::TransferMode     transferMode,
-                                    Neon::set::TransferSemantic transferSemantic)
+                                    Neon::set::StencilSemantic transferSemantic)
         -> Neon::set::Container;
 
     template <typename MxpuDataT>

libNeonSet/include/Neon/set/Containter_imp.h

@@ -5,6 +5,8 @@
 #include "functional"
 #include "type_traits"
 
+#include "Neon/set/container/Loader.h"
+
 #include "Neon/set/container/DataTransferContainer.h"
 #include "Neon/set/container/DeviceContainer.h"
 #include "Neon/set/container/DeviceManagedContainer.h"
@@ -91,7 +93,7 @@ template <typename MultiXpuDataT>
 auto Container::
     factoryDataTransfer(const MultiXpuDataT&        multiXpuData,
                         Neon::set::TransferMode     transferMode,
-                        Neon::set::TransferSemantic transferSemantic)
+                        Neon::set::StencilSemantic transferSemantic)
         -> Neon::set::Container
 {
     auto k = new Neon::set::internal::DataTransferContainer(multiXpuData,

libNeonSet/include/Neon/set/HuOptions.h

@@ -11,17 +11,17 @@ struct HuOptions
     bool                          m_startWithBarrier = true;
     int                           m_streamSetIdx = 0;
     Neon::set::PeerTransferOption m_peerTransferOpt;
-    Neon::set::TransferSemantic   m_structure;
+    Neon::set::StencilSemantic    m_structure;
 
    public:
     HuOptions(Neon::set::TransferMode     transferMode /*<                                          Mode of the transfer: put or get                                 */,
               bool                        startWithBarrier /*<                                      If true a barrier is executed before initiating the halo update */,
               int                         streamSetIdx = Neon::Backend::mainStreamIdx /*<                                      Target stream for the halo update                               */,
-              Neon::set::TransferSemantic structure = Neon::set::TransferSemantic::grid /*<    Structure on top of which the transfer is one: grid or lattice  */);
+              Neon::set::StencilSemantic structure = Neon::set::StencilSemantic::standard /*<    Structure on top of which the transfer is one: grid or lattice  */);
 
     HuOptions(Neon::set::TransferMode transferMode,
               NEON_OUT std::vector<Neon::set::Transfer>& transfers,
-              Neon::set::TransferSemantic                structure = Neon::set::TransferSemantic::grid);
+              Neon::set::StencilSemantic                 structure = Neon::set::StencilSemantic::standard);
 
     auto getPeerTransferOpt(const Neon::Backend& bk) -> Neon::set::PeerTransferOption&;
     auto startWithBarrier() const -> bool;
@@ -30,7 +30,7 @@ struct HuOptions
     auto operationMode() const -> Neon::set::PeerTransferOption::operationMode_e;
     auto transferMode() const -> Neon::set::TransferMode;
     auto isExecuteMode() const -> bool;
-    auto getSemantic() const -> Neon::set::TransferSemantic;
+    auto getSemantic() const -> Neon::set::StencilSemantic;
 };
 }  // namespace set
 }  // namespace Neon

libNeonSet/include/Neon/set/StencilSemantic.h

@@ -0,0 +1,41 @@
+#pragma once
+#include <string>
+#include <vector>
+
+#include "Neon/core/core.h"
+
+namespace Neon::set {
+
+enum struct StencilSemantic
+{
+    standard = 0 /*<  Transfer for halo update on grid structure    */,
+    streaming = 1 /*< Transfer for halo update on lattice structure */
+};
+
+
+struct StencilSemanticUtils
+{
+    static constexpr int nOptions = 2;
+
+    static auto toString(StencilSemantic opt) -> std::string;
+    static auto fromString(const std::string& opt) -> StencilSemantic;
+    static auto getOptions() -> std::array<StencilSemantic, nOptions>;
+
+    struct Cli
+    {
+        explicit Cli(std::string);
+        explicit Cli(StencilSemantic model);
+        Cli();
+
+        auto getOption() -> StencilSemantic;
+        auto set(const std::string& opt) -> void;
+        auto getStringOptions() -> std::string;
+
+       private:
+        bool mSet = false;
+        StencilSemantic mOption;
+    };
+};
+
+
+}  // namespace Neon::set

libNeonSet/include/Neon/set/Transfer.h

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "Neon/core/core.h"
+#include "Neon/set/StencilSemantic.h"
 #include "Neon/set/TransferMode.h"
-#include "Neon/set/TransferSemantic.h"
 
 namespace Neon {
 namespace set {
@@ -31,14 +31,14 @@ struct Transfer
     Endpoint_t       m_dst;
     Endpoint_t       m_src;
     size_t           m_size{0};
-    TransferSemantic m_structure;
+    StencilSemantic  m_structure;
 
    public:
     Transfer(TransferMode      mode,
              const Endpoint_t& dst,
              const Endpoint_t& src,
              size_t            size,
-             TransferSemantic  structure = TransferSemantic::grid)
+             StencilSemantic   structure = StencilSemantic::standard)
         : m_mode(mode), m_dst(dst), m_src(src), m_size(size), m_structure(structure)
     {
     }
@@ -96,14 +96,14 @@ struct PeerTransferOption
     operationMode_e        m_operationMode = Neon::set::PeerTransferOption::execute;
     TransferMode           m_transferMode = Neon::set::TransferMode::get;
 
-    Neon::set::TransferSemantic m_structure;
+    Neon::set::StencilSemantic m_structure;
 
    public:
     /**
      * Constructor with stream parameter
      */
     explicit PeerTransferOption(TransferMode                tranferMode,
-                                Neon::set::TransferSemantic structure)
+                                Neon::set::StencilSemantic structure)
         : m_transfers(nullptr),
           m_streamSet(nullptr),
           m_operationMode(operationMode_e::execute),
@@ -120,7 +120,7 @@ struct PeerTransferOption
      */
     PeerTransferOption(TransferMode                    tranferMode,
                        std::vector<Transfer>& NEON_OUT transfers,
-                       Neon::set::TransferSemantic     structure)
+                       Neon::set::StencilSemantic      structure)
         : m_transfers(&transfers),
           m_streamSet(nullptr),
           m_operationMode(operationMode_e::storeInfo),
@@ -180,7 +180,7 @@ struct PeerTransferOption
         return *m_transfers;
     }
 
-    auto structure() const -> const Neon::set::TransferSemantic&
+    auto structure() const -> const Neon::set::StencilSemantic&
     {
         return m_structure;
     }

libNeonSet/include/Neon/set/container/ContainerAPI.h

@@ -1,13 +1,11 @@
 #pragma once
 
-#include "Neon/set/container/types/ContainerOperationType.h"
-#include "Neon/set/container/types/ContainerPatternType.h"
-
 #include "Neon/set/DevSet.h"
 #include "Neon/set/container/types/ContainerExecutionType.h"
+#include "Neon/set/container/types/ContainerOperationType.h"
+#include "Neon/set/container/types/ContainerPatternType.h"
+//#include "Neon/set/dependency/Token.h"
 
-
-#include "Neon/set/dependency/Token.h"
 #include "functional"
 #include "type_traits"
 
@@ -19,6 +17,10 @@ namespace Neon::set::container {
 struct Graph;
 }
 
+namespace Neon::set::dataDependency {
+struct Token;
+}
+
 namespace Neon::set::internal {
 
 /**
@@ -71,7 +73,7 @@ struct ContainerAPI
     /**
      * Returns a handle to the internal graph of Containers.
      */
-    virtual auto getGraph()
+    virtual auto getGraph() const
         -> const Neon::set::container::Graph&;
 
     /**
@@ -81,8 +83,8 @@ struct ContainerAPI
     virtual auto parse()
         -> const std::vector<Neon::set::dataDependency::Token>&;
 
-    virtual auto getTransferMode()const
-        ->Neon::set::TransferMode ;
+    virtual auto getTransferMode() const
+        -> Neon::set::TransferMode;
 
     /**
      * Returns a name associated to the container.

libNeonSet/include/Neon/set/container/DataTransferContainer.h

@@ -14,7 +14,7 @@ struct DataTransferContainer
 
     DataTransferContainer(const MxpuDataT&        multiXpuData,
                           Neon::set::TransferMode     transferMode,
-                          Neon::set::TransferSemantic transferSemantic)
+                          Neon::set::StencilSemantic transferSemantic)
         : mMultiXpuData(multiXpuData),
           mTransferMode(transferMode),
           mTransferSemantic(transferSemantic)
@@ -64,7 +64,7 @@ struct DataTransferContainer
                                 mDataTransferFun;
     MxpuDataT               mMultiXpuData;
     Neon::set::TransferMode     mTransferMode;
-    Neon::set::TransferSemantic mTransferSemantic;
+    Neon::set::StencilSemantic  mTransferSemantic;
 };
 
 }  // namespace Neon::set::internal

libNeonSet/include/Neon/set/container/DeviceContainer.h

@@ -4,9 +4,7 @@
 #include "Neon/set/container/ContainerAPI.h"
 #include "Neon/set/container/Loader.h"
 
-namespace Neon {
-namespace set {
-namespace internal {
+namespace Neon::set::internal {
 
 template <typename DataIteratorContainerT,
           typename UserComputeLambdaT>
@@ -150,6 +148,4 @@ struct DeviceContainer : ContainerAPI
     DataIteratorContainerT m_dataIteratorContainer;
 };
 
-}  // namespace internal
-}  // namespace set
 }  // namespace Neon