pass custom wrapper to task

ComputationalRadiationPhysics · Jul 31, 2024 · 3ba18c4 · 3ba18c4
1 parent dfc3d6e
commit 3ba18c4
Show file tree

Hide file tree

Showing 22 changed files with 365 additions and 358 deletions.
diff --git a/examples/1_resources.cpp b/examples/1_resources.cpp
@@ -6,20 +6,22 @@
  */
 
 #include <redGrapes/redGrapes.hpp>
+#include <redGrapes/resource/fieldresource.hpp>
+#include <redGrapes/resource/ioresource.hpp>
 
 #include <iostream>
 
 int main(int, char*[])
 {
     auto rg = redGrapes::init(1);
 
-    auto a = rg.createFieldResource<std::vector<int>>();
-    auto b = rg.createIOResource<int>();
-    auto c = rg.createIOResource<int>();
+    auto a = redGrapes::FieldResource<std::vector<int>>();
+    auto b = redGrapes::IOResource<int>();
+    auto c = redGrapes::IOResource<int>();
 
     redGrapes::ResourceUser user1(
         {a.read(), // complete resource
-         a.write().area({0}, {10}), // write only indices 0 to 10
+         a.write({0}, {10}), // write only indices 0 to 10
          b.write()},
         0,
         0);

diff --git a/examples/3_functors_with_resources.cpp b/examples/3_functors_with_resources.cpp
@@ -17,8 +17,8 @@ int main(void)
     spdlog::set_level(spdlog::level::trace);
     auto rg = redGrapes::init();
 
-    auto a = rg.createIOResource<int>();
-    auto b = rg.createIOResource<int>();
+    auto a = redGrapes::IOResource<int>();
+    auto b = redGrapes::IOResource<int>();
 
     for(int i = 0; i < 1; ++i)
     {

diff --git a/examples/5_access_demotion.cpp b/examples/5_access_demotion.cpp
@@ -7,8 +7,8 @@
 
 #include <redGrapes/redGrapes.hpp>
 #include <redGrapes/resource/access/io.hpp>
-#include <redGrapes/resource/resource.hpp>
 #include <redGrapes/resource/ioresource.hpp>
+#include <redGrapes/resource/resource.hpp>
 
 #include <chrono>
 #include <iostream>
@@ -20,23 +20,26 @@ int main(int, char*[])
 {
     spdlog::set_level(spdlog::level::trace);
     auto rg = rg::init();
-    auto a = rg.createIOResource<int>();
-
-    rg.emplace_task(
-        [&](auto a)
-        {
-            std::cout << "f1 writes A" << std::endl;
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-
-            std::cout << "f1 now only reads A" << std::endl;
-            rg.update_properties(decltype(rg)::RGTask::TaskProperties::Patch::Builder()
-                                     .remove_resources({a})
-                                     .add_resources({rg::newAccess(a, rg::access::IOAccess(rg::access::IOAccess::read))}));
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-
-            std::cout << "f1 done" << std::endl;
-        },
-        a.write());
+    auto a = redGrapes::IOResource<int>();
+
+    // Access demotion is not implemented
+
+    // rg.emplace_task(
+    //     [&](auto a)
+    //     {
+    //         std::cout << "f1 writes A" << std::endl;
+    //         std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    //         std::cout << "f1 now only reads A" << std::endl;
+    //         rg.update_properties(decltype(rg)::RGTask::TaskProperties::Patch::Builder()
+    //                                  .remove_resources({a})
+    //                                  .add_resources({rg::newAccess(a,
+    //                                  rg::access::IOAccess(rg::access::IOAccess::read))}));
+    //         std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    //         std::cout << "f1 done" << std::endl;
+    //     },
+    //     a.write());
 
     rg.emplace_task(
         []([[maybe_unused]] auto a)

diff --git a/examples/6_resource_scope.cpp b/examples/6_resource_scope.cpp
@@ -15,13 +15,13 @@ namespace rg = redGrapes;
 int main()
 {
     auto rg = rg::init(1);
-    auto a = rg.createIOResource<int>(); // scope-level=0
+    auto a = redGrapes::IOResource<int>(); // scope-level=0
 
     rg.emplace_task(
           [&]([[maybe_unused]] auto a)
           {
               std::cout << "scope = " << rg.scope_depth() << std::endl;
-              auto b = rg.createIOResource<int>(); // scope-level=1
+              auto b = redGrapes::IOResource<int>(); // scope-level=1
 
               rg.emplace_task(
                     [&](auto b)

diff --git a/examples/7_event.cpp b/examples/7_event.cpp
@@ -8,6 +8,7 @@
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_OFF
 
 #include <redGrapes/redGrapes.hpp>
+#include <redGrapes/resource/ioresource.hpp>
 
 #include <chrono>
 #include <iostream>

diff --git a/examples/8_child_destruction.cpp b/examples/8_child_destruction.cpp
@@ -17,35 +17,35 @@ int main()
     spdlog::set_level(spdlog::level::off);
 
     auto rg = redGrapes::init(1);
-    auto a = rg.createIOResource<int>(1);
+    auto a = redGrapes::IOResource<int>(1);
 
     rg.emplace_task(
           [&rg]([[maybe_unused]] auto a)
           {
               std::cout << "scope = " << rg.scope_depth() << " a = " << *a << std::endl;
-
+              auto a2 = redGrapes::IOResource(a);
               rg.emplace_task(
                   [&rg](auto a)
                   {
                       *a = 2;
                       std::cout << "scope = " << rg.scope_depth() << " a = " << *a << std::endl;
                   },
-                  a);
+                  a2.write());
               rg.emplace_task(
                   [&rg](auto a)
                   {
                       *a = 3;
                       std::cout << "scope = " << rg.scope_depth() << " a = " << *a << std::endl;
-                      auto b = redGrapes::IOResource(a.first);
+                      auto a3 = redGrapes::IOResource(a);
                       rg.emplace_task(
-                          [&rg](auto b)
+                          [&rg](auto a)
                           {
-                              std::cout << "scope = " << rg.scope_depth() << " a = " << *b << std::endl;
-                              *b = 4;
+                              std::cout << "scope = " << rg.scope_depth() << " a = " << *a << std::endl;
+                              *a = 4;
                           },
-                          b.write());
+                          a3.write());
                   },
-                  a);
+                  a2.write());
 
               *a = 4;
               std::cout << "scope = " << rg.scope_depth() << " a = " << *a << std::endl;

diff --git a/examples/cholesky.cpp b/examples/cholesky.cpp
@@ -23,7 +23,7 @@ void print_matrix(std::vector<redGrapes::IOResource<double*>> A, int nblks, int
             {
                 for(int jb = 0; jb < blocksize; ++jb)
                 {
-                    std::cout << (*A[ja * nblks + ia].read())[jb * blocksize + ib] << "; ";
+                    std::cout << (*A[ja * nblks + ia].getObject())[jb * blocksize + ib] << "; ";
                 }
             }
             std::cout << std::endl;
@@ -85,7 +85,8 @@ int main(int argc, char* argv[])
         for(size_t ib = 0; ib < blksz; ++ib)
             for(size_t ja = 0; ja < nblks; ++ja)
                 for(size_t jb = 0; jb < blksz; ++jb)
-                    (*A[ja * nblks + ia].write())[jb * blksz + ib] = Alin[(ia * blksz + ib) + (ja * blksz + jb) * N];
+                    (*A[ja * nblks + ia].getObject())[jb * blksz + ib]
+                        = Alin[(ia * blksz + ib) + (ja * blksz + jb) * N];
 
     print_matrix(A, nblks, blksz);
 

diff --git a/examples/game_of_life.cpp b/examples/game_of_life.cpp
@@ -123,8 +123,8 @@ int main(int, char*[])
                                 dst[{x + xi, y + yi}]
                                     = next_state((Cell const(*)[size.x + 2]) & (src[{x + xi, y + yi}]));
                     },
-                    buffers[next].write().area({x, y}, {x + chunk_size.x, y + chunk_size.y}),
-                    buffers[current].read().area({x - 1, y - 1}, {x + chunk_size.x + 2, y + chunk_size.y + 2}));
+                    buffers[next].write({x, y}, {x + chunk_size.x, y + chunk_size.y}),
+                    buffers[current].read({x - 1, y - 1}, {x + chunk_size.x + 2, y + chunk_size.y + 2}));
 
         current = next;
     }

diff --git a/examples/mpi.cpp b/examples/mpi.cpp
@@ -140,7 +140,7 @@ int main()
 
                   mpi_request_pool->get_status(request);
               },
-              field[current].at({3}).read(),
+              field[current].read({3}),
               mpi_config.read())
             .enable_stack_switching();
 
@@ -158,18 +158,18 @@ int main()
                   int recv_data_count;
                   MPI_Get_count(&status, MPI_CHAR, &recv_data_count);
               },
-              field[current].at({0}).write(),
+              field[current].write({0}),
               mpi_config.read())
             .enable_stack_switching();
 
         /*
          * Compute iteration
          */
-        for(size_t i = 1; i < field[current]->size(); ++i)
+        for(size_t i = 1; i < field[current].getObject()->size(); ++i)
             rg.emplace_task(
                 [i](auto dst, auto src) { dst[{i}] = src[{i - 1}]; },
-                field[next].at({i}).write(),
-                field[current].at({i - 1}).read());
+                field[next].write({i}),
+                field[current].read({i - 1}));
 
         /*
          * Write Output

diff --git a/redGrapes/redGrapes.hpp b/redGrapes/redGrapes.hpp
@@ -10,8 +10,6 @@
 #include "redGrapes/SchedulerDescription.hpp"
 #include "redGrapes/TaskFreeCtx.hpp"
 #include "redGrapes/globalSpace.hpp"
-#include "redGrapes/resource/fieldresource.hpp"
-#include "redGrapes/resource/ioresource.hpp"
 #include "redGrapes/scheduler/event.hpp"
 #include "redGrapes/scheduler/pool_scheduler.hpp"
 #include "redGrapes/task/task.hpp"
@@ -139,7 +137,10 @@ namespace redGrapes
 
             SPDLOG_TRACE("emplace task to worker {}", worker_id);
 
-            using Impl = typename std::invoke_result_t<BindArgs<Callable, Args...>, Callable, Args...>;
+            using Impl = typename std::invoke_result_t<
+                BindArgs<Callable, decltype(forward_arg(std::declval<Args>()))...>,
+                Callable,
+                decltype(forward_arg(std::declval<Args>()))...>;
             // this is not set to nullptr. But it goes out of scope. Memory is managed by allocate
             FunTask<Impl, RGTask>* task;
             memory::Allocator alloc(worker_id);
@@ -177,30 +178,6 @@ namespace redGrapes
             return getScheduler<DefaultTag>();
         }
 
-        template<typename Container>
-        auto createFieldResource(Container* c) -> FieldResource<Container>
-        {
-            return FieldResource<Container>(c);
-        }
-
-        template<typename Container, typename... Args>
-        auto createFieldResource(Args&&... args) -> FieldResource<Container>
-        {
-            return FieldResource<Container>(std::forward<Args>(args)...);
-        }
-
-        template<typename T>
-        auto createIOResource(std::shared_ptr<T> const& o) -> IOResource<T>
-        {
-            return IOResource<T>(o);
-        }
-
-        template<typename T, typename... Args>
-        auto createIOResource(Args&&... args) -> IOResource<T>
-        {
-            return IOResource<T>(std::forward<Args>(args)...);
-        }
-
         template<typename AccessPolicy>
         auto createResource() -> Resource<AccessPolicy>
         {

diff --git a/redGrapes/resource/access/field.hpp b/redGrapes/resource/access/field.hpp
@@ -11,17 +11,17 @@
 
 #pragma once
 
-#include "redGrapes/resource/access/area.hpp"
 #include "redGrapes/resource/access/combine.hpp"
 #include "redGrapes/resource/access/io.hpp"
+#include "redGrapes/resource/access/range.hpp"
 
 namespace redGrapes
 {
     namespace access
     {
 
         template<size_t dimension_t>
-        using FieldAccess = CombineAccess<IOAccess, ArrayAccess<AreaAccess, dimension_t, And_t>, And_t>;
+        using FieldAccess = CombineAccess<IOAccess, ArrayAccess<RangeAccess, dimension_t, And_t>, And_t>;
 
     } // namespace access
 

diff --git a/redGrapes/resource/access/area.hpp → redGrapes/resource/access/range.hpp b/redGrapes/resource/access/area.hpp → redGrapes/resource/access/range.hpp
@@ -20,16 +20,16 @@ namespace redGrapes
 {
     namespace access
     {
-
-        struct AreaAccess : std::array<size_t, 2>
+        // Must be in increasing order
+        struct RangeAccess : std::array<size_t, 2>
         {
-            AreaAccess()
+            RangeAccess()
             {
                 (*this)[0] = std::numeric_limits<size_t>::min();
                 (*this)[1] = std::numeric_limits<size_t>::max();
             }
 
-            AreaAccess(std::array<size_t, 2> a) : std::array<size_t, 2>(a)
+            RangeAccess(std::array<size_t, 2> a) : std::array<size_t, 2>(a)
             {
             }
 
@@ -39,17 +39,17 @@ namespace redGrapes
                        && (*this)[1] == std::numeric_limits<size_t>::max();
             }
 
-            static bool is_serial(AreaAccess const& a, AreaAccess const& b)
+            static bool is_serial(RangeAccess const& a, RangeAccess const& b)
             {
                 return !((a[1] <= b[0]) || (a[0] >= b[1]));
             }
 
-            bool is_superset_of(AreaAccess const& a) const
+            bool is_superset_of(RangeAccess const& a) const
             {
                 return (((*this)[0] <= a[0]) && ((*this)[1] >= a[1]));
             }
 
-            bool operator==(AreaAccess const& other) const
+            bool operator==(RangeAccess const& other) const
             {
                 return (*this)[0] == other[0] && (*this)[1] == other[1];
             }
@@ -62,15 +62,15 @@ namespace redGrapes
 } // namespace redGrapes
 
 template<>
-struct fmt::formatter<redGrapes::access::AreaAccess>
+struct fmt::formatter<redGrapes::access::RangeAccess>
 {
     constexpr auto parse(format_parse_context& ctx)
     {
         return ctx.begin();
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::access::AreaAccess const& acc, FormatContext& ctx)
+    auto format(redGrapes::access::RangeAccess const& acc, FormatContext& ctx)
     {
         return fmt::format_to(ctx.out(), "{{ \"area\" : {{ \"begin\" : {}, \"end\" : {} }} }}", acc[0], acc[1]);
     }