From e1322151a810d230f34675545183e97559a71d86 Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Tue, 4 Mar 2025 15:39:44 +0100
Subject: [PATCH 1/2] Added new scheduling policies
---
unit_tests/scheduler/Test_Scheduler.cpp | 53 +++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/unit_tests/scheduler/Test_Scheduler.cpp b/unit_tests/scheduler/Test_Scheduler.cpp
index 54e57ec4..eb725ff3 100644
--- a/unit_tests/scheduler/Test_Scheduler.cpp
+++ b/unit_tests/scheduler/Test_Scheduler.cpp
@@ -17,6 +17,7 @@
#include "aidge/graph/Node.hpp"
#include "aidge/graph/GraphView.hpp"
#include "aidge/graph/OpArgs.hpp"
+#include "aidge/operator/GenericOperator.hpp"
#include "aidge/operator/Memorize.hpp"
#include "aidge/operator/Pop.hpp"
#include "aidge/operator/Stack.hpp"
@@ -28,6 +29,7 @@
#include "aidge/operator/MetaOperator.hpp"
#include "aidge/scheduler/SequentialScheduler.hpp"
#include "aidge/scheduler/ParallelScheduler.hpp"
+#include "aidge/graph/Testing.hpp"
#include "aidge/backend/cpu/operator/FCImpl.hpp"
#include "aidge/backend/cpu/operator/ConvImpl.hpp"
@@ -520,6 +522,57 @@ TEST_CASE("[cpu/scheduler] Accumulate", "[scheduler]") {
REQUIRE(*output == *expectedOutput);
}
+TEST_CASE("[cpu/scheduler] Branch", "[scheduler]") {
+ std::shared_ptr<Tensor> in = std::make_shared<Tensor>(
+ Array2D<float, 2, 3>{{{1, 2, 3}, {4, 5, 6}}});
+
+ std::shared_ptr<GraphView> g = Sequential({
+ Producer(in, "input"),
+ Parallel({
+ Sequential({
+ GenericOperator("b0_op1", {InputCategory::Data}, 1),
+ GenericOperator("b0_op2", {InputCategory::Data}, 1),
+ GenericOperator("b0_op3", {InputCategory::Data}, 1),
+ GenericOperator("b0_op4", {InputCategory::Data}, 1),
+ GenericOperator("b0_op5", {InputCategory::Data}, 1)
+ }),
+ Sequential({
+ GenericOperator("b1_op1", {InputCategory::Data}, 1),
+ GenericOperator("b1_op2", {InputCategory::Data}, 1),
+ GenericOperator("b1_op3", {InputCategory::Data}, 1)
+ }),
+ Sequential({
+ GenericOperator("b2_op1", {InputCategory::Data}, 1)
+ })
+ }),
+ GenericOperator("op1", {InputCategory::Data, InputCategory::Data, InputCategory::Data}, 1),
+ GenericOperator("op2", {InputCategory::Data}, 1),
+ GenericOperator("op3", {InputCategory::Data}, 1)
+ });
+
+ g->save("branch_forwarded");
+
+ auto scheduler = SequentialScheduler(g);
+ scheduler.generateScheduling();
+ scheduler.saveStaticSchedulingDiagram("branch_scheduling");
+
+ // Default scheduling order is not necessarily determinist, but is garanteed to be correct in every case.
+ // This behavior might change in the future.
+ auto seqSchedule = scheduler.getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::Default);
+ fmt::println("seqSchedule = {}", seqSchedule);
+
+ scheduler.tagForkBranches();
+ g->save("branch_forwarded_tag");
+
+ seqSchedule = scheduler.getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::ShortestBranchFirst);
+ REQUIRE(nodePtrTo(seqSchedule, nodePtrToType) == std::vector<std::string>{
+ "Producer", "b2_op1", "b1_op1", "b1_op2", "b1_op3", "b0_op1", "b0_op2", "b0_op3", "b0_op4", "b0_op5", "op1", "op2", "op3"});
+
+ seqSchedule = scheduler.getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::LonguestBranchFirst);
+ REQUIRE(nodePtrTo(seqSchedule, nodePtrToType) == std::vector<std::string>{
+ "Producer", "b0_op1", "b0_op2", "b0_op3", "b0_op4", "b0_op5", "b1_op1", "b1_op2", "b1_op3", "b2_op1", "op1", "op2", "op3"});
+}
+
#ifdef WITH_OPENSSL
TEST_CASE("[cpu/scheduler] Select", "[scheduler]") {
std::shared_ptr<Tensor> in = std::make_shared<Tensor>(
--
GitLab
From 616115446b9b4ede126cf88a124e5c40e61bddbb Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Tue, 11 Mar 2025 17:45:20 +0100
Subject: [PATCH 2/2] Fixed scheduler test
---
unit_tests/scheduler/Test_Scheduler.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/unit_tests/scheduler/Test_Scheduler.cpp b/unit_tests/scheduler/Test_Scheduler.cpp
index eb725ff3..be87e8ac 100644
--- a/unit_tests/scheduler/Test_Scheduler.cpp
+++ b/unit_tests/scheduler/Test_Scheduler.cpp
@@ -558,17 +558,17 @@ TEST_CASE("[cpu/scheduler] Branch", "[scheduler]") {
// Default scheduling order is not necessarily determinist, but is garanteed to be correct in every case.
// This behavior might change in the future.
- auto seqSchedule = scheduler.getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::Default);
+ auto seqSchedule = scheduler.Scheduler::getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::Default);
fmt::println("seqSchedule = {}", seqSchedule);
scheduler.tagForkBranches();
g->save("branch_forwarded_tag");
- seqSchedule = scheduler.getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::ShortestBranchFirst);
+ seqSchedule = scheduler.Scheduler::getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::ShortestBranchFirst);
REQUIRE(nodePtrTo(seqSchedule, nodePtrToType) == std::vector<std::string>{
"Producer", "b2_op1", "b1_op1", "b1_op2", "b1_op3", "b0_op1", "b0_op2", "b0_op3", "b0_op4", "b0_op5", "op1", "op2", "op3"});
- seqSchedule = scheduler.getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::LonguestBranchFirst);
+ seqSchedule = scheduler.Scheduler::getSequentialStaticScheduling(0, Scheduler::SchedulingPolicy::LonguestBranchFirst);
REQUIRE(nodePtrTo(seqSchedule, nodePtrToType) == std::vector<std::string>{
"Producer", "b0_op1", "b0_op2", "b0_op3", "b0_op4", "b0_op5", "b1_op1", "b1_op2", "b1_op3", "b2_op1", "op1", "op2", "op3"});
}
--
GitLab