removed local_in_out memconstraint

Author: tonibohnlein

include/osp/bsp/model/BspArchitecture.hpp

@@ -46,7 +46,6 @@ enum class MemoryConstraintType {
     GLOBAL, /** The memory bounds apply to the sum of memory weights of the nodes assigned to the same processor. */
     PERSISTENT_AND_TRANSIENT, /** Memory bounds apply to the sum of memory weights of nodes assigned to the same processor plus
                                  the maximum communication weight of a node assigned to a processor. */
-    LOCAL_IN_OUT,             /** Memory constraints are local in-out. Experimental. */
     LOCAL_INC_EDGES,          /** Memory constraints are local incident edges. Experimental. */
     LOCAL_SOURCES_INC_EDGES   /** Memory constraints are local source incident edges. Experimental. */
 };
@@ -65,8 +64,6 @@ inline const char *ToString(MemoryConstraintType type) {
             return "GLOBAL";
         case MemoryConstraintType::PERSISTENT_AND_TRANSIENT:
             return "PERSISTENT_AND_TRANSIENT";
-        case MemoryConstraintType::LOCAL_IN_OUT:
-            return "LOCAL_IN_OUT";
         case MemoryConstraintType::LOCAL_INC_EDGES:
             return "LOCAL_INC_EDGES";
         case MemoryConstraintType::LOCAL_SOURCES_INC_EDGES:

include/osp/bsp/model/BspSchedule.hpp

@@ -457,9 +457,6 @@ class BspSchedule : public IBspSchedule<GraphT>, public IBspScheduleEval<GraphT>
             case MemoryConstraintType::GLOBAL:
                 return SatisfiesGlobalMemoryConstraints();
 
-            case MemoryConstraintType::LOCAL_IN_OUT:
-                return SatisfiesLocalInOutMemoryConstraints();
-
             case MemoryConstraintType::LOCAL_INC_EDGES:
                 return SatisfiesLocalIncEdgesMemoryConstraints();
 

include/osp/bsp/scheduler/GreedySchedulers/MemoryConstraintModules.hpp

@@ -211,62 +211,6 @@ struct IsMemoryConstraintSchedule<
 template <typename T>
 inline constexpr bool isMemoryConstraintScheduleV = IsMemoryConstraintSchedule<T>::value;
 
-template <typename GraphT>
-struct LocalInOutMemoryConstraint {
-    static_assert(std::is_convertible_v<VCommwT<GraphT>, VMemwT<GraphT>>,
-                  "LocalInOutMemoryConstraint requires that memory and communication weights are convertible.");
-
-    using GraphImplT = GraphT;
-
-    const BspInstance<GraphT> *instance_;
-    const BspSchedule<GraphT> *schedule_;
-
-    const unsigned *currentSuperstep_ = 0;
-
-    std::vector<VMemwT<GraphT>> currentProcMemory_;
-
-    LocalInOutMemoryConstraint() : instance_(nullptr), schedule_(nullptr) {}
-
-    inline void Initialize(const BspSchedule<GraphT> &schedule, const unsigned &supstepIdx) {
-        currentSuperstep_ = &supstepIdx;
-        schedule_ = &schedule;
-        instance_ = &schedule_->GetInstance();
-        currentProcMemory_.assign(instance_->NumberOfProcessors(), 0);
-
-        if (instance_->GetArchitecture().GetMemoryConstraintType() != MemoryConstraintType::LOCAL_IN_OUT) {
-            throw std::invalid_argument("Memory constraint type is not LOCAL_IN_OUT");
-        }
-    }
-
-    inline bool CanAdd(const VertexIdxT<GraphT> &v, const unsigned proc) const {
-        VMemwT<GraphT> incMemory
-            = instance_->GetComputationalDag().VertexMemWeight(v) + instance_->GetComputationalDag().VertexCommWeight(v);
-
-        for (const auto &pred : instance_->GetComputationalDag().Parents(v)) {
-            if (schedule_->AssignedProcessor(pred) == schedule_->AssignedProcessor(v)
-                && schedule_->AssignedSuperstep(pred) == *currentSuperstep_) {
-                incMemory -= instance_->GetComputationalDag().VertexCommWeight(pred);
-            }
-        }
-
-        return currentProcMemory_[proc] + incMemory <= instance_->GetArchitecture().MemoryBound(proc);
-    }
-
-    inline void Add(const VertexIdxT<GraphT> &v, const unsigned proc) {
-        currentProcMemory_[proc]
-            += instance_->GetComputationalDag().VertexMemWeight(v) + instance_->GetComputationalDag().VertexCommWeight(v);
-
-        for (const auto &pred : instance_->GetComputationalDag().Parents(v)) {
-            if (schedule_->AssignedProcessor(pred) == schedule_->AssignedProcessor(v)
-                && schedule_->AssignedSuperstep(pred) == *currentSuperstep_) {
-                currentProcMemory_[proc] -= instance_->GetComputationalDag().VertexCommWeight(pred);
-            }
-        }
-    }
-
-    inline void Reset(const unsigned proc) { currentProcMemory_[proc] = 0; }
-};
-
 template <typename GraphT>
 struct LocalIncEdgesMemoryConstraint {
     using GraphImplT = GraphT;

tests/bsp_schedulers_mem_const.cpp

@@ -165,63 +165,6 @@ void RunTestPersistentTransientMemory(Scheduler<GraphT> *testScheduler) {
     }
 }
 
-template <typename GraphT>
-void RunTestLocalInOutMemory(Scheduler<GraphT> *testScheduler) {
-    // static_assert(std::is_base_of<Scheduler, T>::value, "Class is not a scheduler!");
-    std::vector<std::string> filenamesGraph = TestGraphs();
-    std::vector<std::string> filenamesArchitectures = TestArchitectures();
-
-    // Getting root git directory
-    std::filesystem::path cwd = std::filesystem::current_path();
-    std::cout << cwd << std::endl;
-    while ((!cwd.empty()) && (cwd.filename() != "OneStopParallel")) {
-        cwd = cwd.parent_path();
-        std::cout << cwd << std::endl;
-    }
-
-    for (auto &filenameGraph : filenamesGraph) {
-        for (auto &filenameMachine : filenamesArchitectures) {
-            std::string nameGraph = filenameGraph.substr(filenameGraph.find_last_of("/\\") + 1);
-            nameGraph = nameGraph.substr(0, nameGraph.find_last_of("."));
-            std::string nameMachine = filenameMachine.substr(filenameMachine.find_last_of("/\\") + 1);
-            nameMachine = nameMachine.substr(0, nameMachine.rfind("."));
-
-            std::cout << std::endl << "Scheduler: " << testScheduler->GetScheduleName() << std::endl;
-            std::cout << "Graph: " << nameGraph << std::endl;
-            std::cout << "Architecture: " << nameMachine << std::endl;
-
-            BspInstance<GraphT> instance;
-
-            bool statusGraph = file_reader::ReadComputationalDagHyperdagFormatDB((cwd / filenameGraph).string(),
-                                                                                 instance.GetComputationalDag());
-            bool statusArchitecture
-                = file_reader::ReadBspArchitecture((cwd / "data/machine_params/p3.arch").string(), instance.GetArchitecture());
-
-            AddMemWeights(instance.GetComputationalDag());
-            instance.GetArchitecture().SetMemoryConstraintType(MemoryConstraintType::LOCAL_IN_OUT);
-            std::cout << "Memory constraint type: LOCAL_IN_OUT" << std::endl;
-
-            if (!statusGraph || !statusArchitecture) {
-                std::cout << "Reading files failed." << std::endl;
-                BOOST_CHECK(false);
-            }
-
-            const std::vector<VMemwT<GraphT>> boundsToTest = {10, 20, 50, 100};
-
-            for (const auto &bound : boundsToTest) {
-                instance.GetArchitecture().SetMemoryBound(bound);
-
-                BspSchedule<GraphT> schedule(instance);
-                const auto result = testScheduler->ComputeSchedule(schedule);
-
-                BOOST_CHECK_EQUAL(ReturnStatus::OSP_SUCCESS, result);
-                BOOST_CHECK(schedule.SatisfiesPrecedenceConstraints());
-                BOOST_CHECK(schedule.SatisfiesMemoryConstraints());
-            }
-        }
-    }
-}
-
 template <typename GraphT>
 void RunTestLocalIncEdgesMemory(Scheduler<GraphT> *testScheduler) {
     // static_assert(std::is_base_of<Scheduler, T>::value, "Class is not a scheduler!");
@@ -342,9 +285,6 @@ BOOST_AUTO_TEST_CASE(GreedyBspSchedulerLocalTest) {
     GreedyBspScheduler<GraphImplT, LocalMemoryConstraint<GraphImplT>> test1;
     RunTestLocalMemory(&test1);
 
-    GreedyBspScheduler<GraphImplT, LocalInOutMemoryConstraint<GraphImplT>> test2;
-    RunTestLocalInOutMemory(&test2);
-
     GreedyBspScheduler<GraphImplT, LocalIncEdgesMemoryConstraint<GraphImplT>> test3;
     RunTestLocalIncEdgesMemory(&test3);
 
@@ -358,9 +298,6 @@ BOOST_AUTO_TEST_CASE(GrowLocalAutoCoresLocalTest) {
     GrowLocalAutoCores<GraphImplT, LocalMemoryConstraint<GraphImplT>> test1;
     RunTestLocalMemory(&test1);
 
-    GrowLocalAutoCores<GraphImplT, LocalInOutMemoryConstraint<GraphImplT>> test2;
-    RunTestLocalInOutMemory(&test2);
-
     GrowLocalAutoCores<GraphImplT, LocalIncEdgesMemoryConstraint<GraphImplT>> test3;
     RunTestLocalIncEdgesMemory(&test3);
 
@@ -374,9 +311,6 @@ BOOST_AUTO_TEST_CASE(BspLockingLocalTest) {
     BspLocking<GraphImplT, LocalMemoryConstraint<GraphImplT>> test1;
     RunTestLocalMemory(&test1);
 
-    BspLocking<GraphImplT, LocalInOutMemoryConstraint<GraphImplT>> test2;
-    RunTestLocalInOutMemory(&test2);
-
     BspLocking<GraphImplT, LocalIncEdgesMemoryConstraint<GraphImplT>> test3;
     RunTestLocalIncEdgesMemory(&test3);
 
@@ -389,20 +323,6 @@ BOOST_AUTO_TEST_CASE(VarianceLocalTest) {
     RunTestLocalMemory(&test);
 }
 
-// BOOST_AUTO_TEST_CASE(kl_local_test) {
-
-//     VarianceFillup<ComputationalDagEdgeIdxVectorImplDefT,
-//                    LocalMemoryConstraint<ComputationalDagEdgeIdxVectorImplDefT>>
-//         test;
-
-//     kl_total_comm<ComputationalDagEdgeIdxVectorImplDefT,
-//     local_search_local_memory_constraint<ComputationalDagEdgeIdxVectorImplDefT>> kl;
-
-//     ComboScheduler<ComputationalDagEdgeIdxVectorImplDefT> combo_test(test, kl);
-
-//     run_test_local_memory(&combo_test);
-// };
-
 BOOST_AUTO_TEST_CASE(GreedyBspSchedulerPersistentTransientTest) {
     GreedyBspScheduler<ComputationalDagEdgeIdxVectorImplDefT, PersistentTransientMemoryConstraint<ComputationalDagEdgeIdxVectorImplDefT>>
         test;