Merge pull request #88 from ikbuibui/const_fmt

Make fmt format call const
ComputationalRadiationPhysics · Oct 28, 2024 · ad87442 · ad87442
2 parents 1fbd39f + 2c005b5
commit ad87442
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 21 deletions.
diff --git a/examples/cholesky.cpp b/examples/cholesky.cpp
@@ -54,7 +54,6 @@ int main(int argc, char* argv[])
         n_threads = atoi(argv[3]);
 
     auto rg = redGrapes::init(n_threads);
-    using RGTask = decltype(rg)::RGTask;
 
     size_t N = nblks * blksz;
 

diff --git a/redGrapes/dispatch/cuda/cuda_worker.hpp b/redGrapes/dispatch/cuda/cuda_worker.hpp
@@ -256,7 +256,7 @@ struct fmt::formatter<redGrapes::dispatch::cuda::CudaTaskProperties>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::dispatch::cuda::CudaTaskProperties const& prop, FormatContext& ctx)
+    auto format(redGrapes::dispatch::cuda::CudaTaskProperties const& prop, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "\"cuda_stream_idx\" : {}", *(prop.m_cuda_stream_idx));
     }

diff --git a/redGrapes/dispatch/cupla/scheduler.hpp b/redGrapes/dispatch/cupla/scheduler.hpp
@@ -183,7 +183,7 @@ struct fmt::formatter<redGrapes::dispatch::cupla::CuplaTaskProperties>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::dispatch::cupla::CuplaTaskProperties const& prop, FormatContext& ctx)
+    auto format(redGrapes::dispatch::cupla::CuplaTaskProperties const& prop, FormatContext& ctx) const
     {
         if(auto e = prop.cupla_event)
             return fmt::format_to(ctx.out(), "\"cupla_event\" : {}", *e);

diff --git a/redGrapes/resource/access/area.hpp b/redGrapes/resource/access/area.hpp
@@ -41,7 +41,7 @@ namespace redGrapes
 
             static bool is_serial(AreaAccess const& a, AreaAccess const& b)
             {
-                return !((a[1] <= b[0]) || (a[0] >= b[1]));
+                return (a[1] > b[0]) && (a[0] < b[1]);
             }
 
             bool is_superset_of(AreaAccess const& a) const
@@ -70,7 +70,7 @@ struct fmt::formatter<redGrapes::access::AreaAccess>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::access::AreaAccess const& acc, FormatContext& ctx)
+    auto format(redGrapes::access::AreaAccess const& acc, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "{{ \"area\" : {{ \"begin\" : {}, \"end\" : {} }} }}", acc[0], acc[1]);
     }

diff --git a/redGrapes/resource/access/combine.hpp b/redGrapes/resource/access/combine.hpp
@@ -146,6 +146,7 @@ struct fmt::formatter<redGrapes::access::ArrayAccess<Access, N, redGrapes::acces
 
     template<typename FormatContext>
     auto format(redGrapes::access::ArrayAccess<Access, N, redGrapes::access::And_t> const& acc, FormatContext& ctx)
+        const
     {
         auto out = ctx.out();
         out = fmt::format_to(out, "{{ \"and\" : [");
@@ -172,6 +173,7 @@ struct fmt::formatter<redGrapes::access::ArrayAccess<Access, N, redGrapes::acces
 
     template<typename FormatContext>
     auto format(redGrapes::access::ArrayAccess<Access, N, redGrapes::access::Or_t> const& acc, FormatContext& ctx)
+        const
     {
         auto out = ctx.out();
         out = fmt::format_to(out, "{{ \"or\" : [");
@@ -198,6 +200,7 @@ struct fmt::formatter<redGrapes::access::CombineAccess<Acc1, Acc2, redGrapes::ac
 
     template<typename FormatContext>
     auto format(redGrapes::access::CombineAccess<Acc1, Acc2, redGrapes::access::And_t> const& acc, FormatContext& ctx)
+        const
     {
         return fmt::format_to(ctx.out(), "{{ \"and\" : [ {}, {} ] }}", acc.first, acc.second);
     }
@@ -213,6 +216,7 @@ struct fmt::formatter<redGrapes::access::CombineAccess<Acc1, Acc2, redGrapes::ac
 
     template<typename FormatContext>
     auto format(redGrapes::access::CombineAccess<Acc1, Acc2, redGrapes::access::Or_t> const& acc, FormatContext& ctx)
+        const
     {
         return fmt::format_to(ctx.out(), "{{ \"or\" : [ {}, {} ] }}", acc.first, acc.second);
     }

diff --git a/redGrapes/resource/access/io.hpp b/redGrapes/resource/access/io.hpp
@@ -74,7 +74,7 @@ struct fmt::formatter<redGrapes::access::IOAccess>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::access::IOAccess const& acc, FormatContext& ctx)
+    auto format(redGrapes::access::IOAccess const& acc, FormatContext& ctx) const
     {
         std::string mode_str;
 

diff --git a/redGrapes/resource/resource.hpp b/redGrapes/resource/resource.hpp
@@ -43,21 +43,21 @@ namespace redGrapes
         {
             MappingFunc mappingFunc;
 
-            WorkerId operator()(ResourceId resourceId)
+            WorkerId operator()(ResourceId resourceId) const
             {
                 return mappingFunc(resourceId);
             }
         };
 
         struct ModuloMapping
         {
-            WorkerId operator()(ResourceId resourceId)
+            WorkerId operator()(ResourceId resourceId) const
             {
                 return resourceId % TaskFreeCtx::n_workers;
             }
         };
 
-        static MapResourceIdToWorker<ModuloMapping> map_resource_to_worker{};
+        static const MapResourceIdToWorker<ModuloMapping> map_resource_to_worker{};
 
     } // namespace mapping
 
@@ -396,7 +396,7 @@ struct fmt::formatter<redGrapes::ResourceAccess>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::ResourceAccess const& acc, FormatContext& ctx)
+    auto format(redGrapes::ResourceAccess const& acc, FormatContext& ctx) const
     {
         return fmt::format_to(
             ctx.out(),

diff --git a/redGrapes/resource/resource_user.hpp b/redGrapes/resource/resource_user.hpp
@@ -149,7 +149,7 @@ struct fmt::formatter<redGrapes::ResourceUser>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::ResourceUser const& r, FormatContext& ctx)
+    auto format(redGrapes::ResourceUser const& r, FormatContext& ctx) const
     {
         auto out = ctx.out();
         out = fmt::format_to(out, "[");

diff --git a/redGrapes/task/property/graph.hpp b/redGrapes/task/property/graph.hpp
@@ -186,7 +186,7 @@ struct fmt::formatter<redGrapes::GraphProperty<TTask>>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::GraphProperty<TTask> const& sg_prop, FormatContext& ctx)
+    auto format(redGrapes::GraphProperty<TTask> const& sg_prop, FormatContext& ctx) const
     {
         return ctx.out();
     }

diff --git a/redGrapes/task/property/id.hpp b/redGrapes/task/property/id.hpp
@@ -92,7 +92,7 @@ struct fmt::formatter<redGrapes::IDProperty>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::IDProperty const& id_prop, FormatContext& ctx)
+    auto format(redGrapes::IDProperty const& id_prop, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "\"id\" : {}", id_prop.task_id);
     }

diff --git a/redGrapes/task/property/inherit.hpp b/redGrapes/task/property/inherit.hpp
@@ -163,7 +163,7 @@ struct fmt::formatter<redGrapes::TaskPropertiesInherit<redGrapes::PropEnd_t>>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::TaskPropertiesInherit<redGrapes::PropEnd_t> const& prop, FormatContext& ctx)
+    auto format(redGrapes::TaskPropertiesInherit<redGrapes::PropEnd_t> const& prop, FormatContext& ctx) const
     {
         return ctx.out();
     }
@@ -178,7 +178,7 @@ struct fmt::formatter<redGrapes::TaskPropertiesInherit<T_Head, redGrapes::PropEn
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::TaskPropertiesInherit<T_Head, redGrapes::PropEnd_t> const& prop, FormatContext& ctx)
+    auto format(redGrapes::TaskPropertiesInherit<T_Head, redGrapes::PropEnd_t> const& prop, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "{}", (T_Head const&) prop);
     }
@@ -193,7 +193,7 @@ struct fmt::formatter<redGrapes::TaskPropertiesInherit<T_Head, T_Tail...>>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::TaskPropertiesInherit<T_Head, T_Tail...> const& prop, FormatContext& ctx)
+    auto format(redGrapes::TaskPropertiesInherit<T_Head, T_Tail...> const& prop, FormatContext& ctx) const
     {
         return fmt::format_to(
             ctx.out(),
@@ -212,7 +212,7 @@ struct fmt::formatter<redGrapes::TaskProperties1<Policies...>>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::TaskProperties1<Policies...> const& prop, FormatContext& ctx)
+    auto format(redGrapes::TaskProperties1<Policies...> const& prop, FormatContext& ctx) const
     {
         return fmt::format_to(
             ctx.out(),

diff --git a/redGrapes/task/property/label.hpp b/redGrapes/task/property/label.hpp
@@ -75,7 +75,7 @@ struct fmt::formatter<redGrapes::LabelProperty>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::LabelProperty const& label_prop, FormatContext& ctx)
+    auto format(redGrapes::LabelProperty const& label_prop, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "\"label\" : \"{}\"", label_prop.label);
     }

diff --git a/redGrapes/task/property/resource.hpp b/redGrapes/task/property/resource.hpp
@@ -152,7 +152,7 @@ struct fmt::formatter<redGrapes::ResourceProperty<TTask>>
     }
 
     template<typename FormatContext>
-    auto format(redGrapes::ResourceProperty<TTask> const& label_prop, FormatContext& ctx)
+    auto format(redGrapes::ResourceProperty<TTask> const& label_prop, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "\"resources\" : {}", (redGrapes::ResourceUser const&) label_prop);
     }

diff --git a/redGrapes/task/queue.hpp b/redGrapes/task/queue.hpp
@@ -96,7 +96,7 @@ namespace redGrapes
             static inline void* malloc(size_t size)
             {
                 //                return std::malloc(size);
-                return (void*) memory::Allocator().allocate(size).ptr;
+                return reinterpret_cast<void*>(memory::Allocator().allocate(size).ptr);
             }
 
             static inline void free(void* ptr)

diff --git a/test/resource.cpp b/test/resource.cpp
@@ -36,7 +36,7 @@ struct fmt::formatter<Access>
     }
 
     template<typename FormatContext>
-    auto format([[maybe_unused]] Access const& acc, FormatContext& ctx)
+    auto format([[maybe_unused]] Access const& acc, FormatContext& ctx) const
     {
         return fmt::format_to(ctx.out(), "Access");
     }