From 64161a8743ded19a767883793d7030d6e4093699 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 12 Dec 2017 13:08:01 +0000 Subject: [PATCH] Hadrons: much simpler reference dependency --- extras/Hadrons/Environment.cc | 78 +++---------------- extras/Hadrons/Environment.hpp | 27 +++---- extras/Hadrons/Graph.hpp | 12 +-- extras/Hadrons/Module.hpp | 1 + extras/Hadrons/Modules/MAction/DWF.hpp | 9 +++ extras/Hadrons/Modules/MAction/Wilson.hpp | 9 +++ extras/Hadrons/Modules/MContraction/Meson.hpp | 9 +++ extras/Hadrons/Modules/MFermion/GaugeProp.hpp | 9 +++ extras/Hadrons/Modules/MGauge/Unit.cc | 7 ++ extras/Hadrons/Modules/MGauge/Unit.hpp | 1 + extras/Hadrons/Modules/MSink/Point.hpp | 9 +++ extras/Hadrons/Modules/MSolver/RBPrecCG.hpp | 12 ++- extras/Hadrons/Modules/MSource/Point.hpp | 9 +++ .../Modules/templates/Module.cc.template | 8 ++ .../Modules/templates/Module.hpp.template | 1 + .../templates/Module_in_NS.cc.template | 8 ++ .../templates/Module_in_NS.hpp.template | 1 + .../Modules/templates/Module_tmp.hpp.template | 1 + .../templates/Module_tmp_in_NS.hpp.template | 9 +++ extras/Hadrons/VirtualMachine.cc | 77 +++++++++--------- 20 files changed, 171 insertions(+), 126 deletions(-) diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index ea41f343..66291966 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -341,81 +341,21 @@ Environment::Size Environment::getTotalSize(void) const return size; } -void Environment::addOwnership(const unsigned int owner, - const unsigned int property) +void Environment::freeObject(const unsigned int address) { - if (hasObject(property)) + if (hasCreatedObject(address)) { - object_[property].owners.insert(owner); - } - else - { - HADRON_ERROR("no object with address " + std::to_string(property)); - } - if (hasObject(owner)) - { - object_[owner].properties.insert(property); - } - else - { - HADRON_ERROR("no object with address " + std::to_string(owner)); + LOG(Message) << "Destroying object '" << object_[address].name + << "'" << std::endl; } + object_[address].size = 0; + object_[address].type = nullptr; + object_[address].data.reset(nullptr); } -void Environment::addOwnership(const std::string owner, - const std::string property) +void Environment::freeObject(const std::string name) { - addOwnership(getObjectAddress(owner), getObjectAddress(property)); -} - -bool Environment::hasOwners(const unsigned int address) const -{ - - if (hasObject(address)) - { - return (!object_[address].owners.empty()); - } - else - { - HADRON_ERROR("no object with address " + std::to_string(address)); - } -} - -bool Environment::hasOwners(const std::string name) const -{ - return hasOwners(getObjectAddress(name)); -} - -bool Environment::freeObject(const unsigned int address) -{ - if (!hasOwners(address)) - { - if (hasCreatedObject(address)) - { - LOG(Message) << "Destroying object '" << object_[address].name - << "'" << std::endl; - } - for (auto &p: object_[address].properties) - { - object_[p].owners.erase(address); - } - object_[address].size = 0; - object_[address].type = nullptr; - object_[address].owners.clear(); - object_[address].properties.clear(); - object_[address].data.reset(nullptr); - - return true; - } - else - { - return false; - } -} - -bool Environment::freeObject(const std::string name) -{ - return freeObject(getObjectAddress(name)); + freeObject(getObjectAddress(name)); } void Environment::freeAll(void) diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index 5177b312..811ee14e 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -82,7 +82,6 @@ private: const std::type_info *type{nullptr}; std::string name; int module{-1}; - std::set owners, properties; std::unique_ptr data{nullptr}; }; public: @@ -140,14 +139,8 @@ public: template bool isObjectOfType(const std::string name) const; Environment::Size getTotalSize(void) const; - void addOwnership(const unsigned int owner, - const unsigned int property); - void addOwnership(const std::string owner, - const std::string property); - bool hasOwners(const unsigned int address) const; - bool hasOwners(const std::string name) const; - bool freeObject(const unsigned int address); - bool freeObject(const std::string name); + void freeObject(const unsigned int address); + void freeObject(const std::string name); void freeAll(void); // print environment content void printContent(void) const; @@ -252,15 +245,23 @@ T * Environment::getObject(const unsigned int address) const { if (hasObject(address)) { - if (auto h = dynamic_cast *>(object_[address].data.get())) + if (hasCreatedObject(address)) { - return h->getPt(); + if (auto h = dynamic_cast *>(object_[address].data.get())) + { + return h->getPt(); + } + else + { + HADRON_ERROR("object with address " + std::to_string(address) + + " does not have type '" + typeName(&typeid(T)) + + "' (has type '" + getObjectType(address) + "')"); + } } else { HADRON_ERROR("object with address " + std::to_string(address) + - " does not have type '" + typeName(&typeid(T)) + - "' (has type '" + getObjectType(address) + "')"); + " is empty"); } } else diff --git a/extras/Hadrons/Graph.hpp b/extras/Hadrons/Graph.hpp index df255517..bb9ae679 100644 --- a/extras/Hadrons/Graph.hpp +++ b/extras/Hadrons/Graph.hpp @@ -430,7 +430,7 @@ std::vector Graph::getAdjacentVertices(const T &value) const { return ((e.first == value) or (e.second == value)); }; - auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + auto eIt = std::find_if(edgeSet_.begin(), edgeSet_.end(), pred); while (eIt != edgeSet_.end()) { @@ -442,7 +442,7 @@ std::vector Graph::getAdjacentVertices(const T &value) const { adjacentVertex.push_back((*eIt).first); } - eIt = find_if(++eIt, edgeSet_.end(), pred); + eIt = std::find_if(++eIt, edgeSet_.end(), pred); } return adjacentVertex; @@ -458,12 +458,12 @@ std::vector Graph::getChildren(const T &value) const { return (e.first == value); }; - auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + auto eIt = std::find_if(edgeSet_.begin(), edgeSet_.end(), pred); while (eIt != edgeSet_.end()) { child.push_back((*eIt).second); - eIt = find_if(++eIt, edgeSet_.end(), pred); + eIt = std::find_if(++eIt, edgeSet_.end(), pred); } return child; @@ -479,12 +479,12 @@ std::vector Graph::getParents(const T &value) const { return (e.second == value); }; - auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + auto eIt = std::find_if(edgeSet_.begin(), edgeSet_.end(), pred); while (eIt != edgeSet_.end()) { parent.push_back((*eIt).first); - eIt = find_if(++eIt, edgeSet_.end(), pred); + eIt = std::find_if(++eIt, edgeSet_.end(), pred); } return parent; diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index 14d98bfb..c6b58e9f 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -155,6 +155,7 @@ public: virtual std::string getRegisteredName(void); // dependencies/products virtual std::vector getInput(void) = 0; + virtual std::vector getReference(void) = 0; virtual std::vector getOutput(void) = 0; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name) = 0; diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index e7d28476..91e4ec94 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -64,6 +64,7 @@ public: virtual ~TDWF(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup @@ -92,6 +93,14 @@ std::vector TDWF::getInput(void) return in; } +template +std::vector TDWF::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + template std::vector TDWF::getOutput(void) { diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp index 591a3fed..1ca3bf59 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -62,6 +62,7 @@ public: virtual ~TWilson(void) = default; // dependencies/products virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup @@ -90,6 +91,14 @@ std::vector TWilson::getInput(void) return in; } +template +std::vector TWilson::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + template std::vector TWilson::getOutput(void) { diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index 7c0012d2..7d19feb8 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -95,6 +95,7 @@ public: virtual ~TMeson(void) = default; // dependencies/products virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); virtual void parseGammaString(std::vector &gammaList); protected: @@ -122,6 +123,14 @@ std::vector TMeson::getInput(void) return input; } +template +std::vector TMeson::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + template std::vector TMeson::getOutput(void) { diff --git a/extras/Hadrons/Modules/MFermion/GaugeProp.hpp b/extras/Hadrons/Modules/MFermion/GaugeProp.hpp index 8529825b..f860c403 100644 --- a/extras/Hadrons/Modules/MFermion/GaugeProp.hpp +++ b/extras/Hadrons/Modules/MFermion/GaugeProp.hpp @@ -84,6 +84,7 @@ public: virtual ~TGaugeProp(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup @@ -115,6 +116,14 @@ std::vector TGaugeProp::getInput(void) return in; } +template +std::vector TGaugeProp::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + template std::vector TGaugeProp::getOutput(void) { diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc index b3a7d634..bc05a785 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.cc +++ b/extras/Hadrons/Modules/MGauge/Unit.cc @@ -47,6 +47,13 @@ std::vector TUnit::getInput(void) return std::vector(); } +std::vector TUnit::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + std::vector TUnit::getOutput(void) { std::vector out = {getName()}; diff --git a/extras/Hadrons/Modules/MGauge/Unit.hpp b/extras/Hadrons/Modules/MGauge/Unit.hpp index c1650cc7..4b69f0ce 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.hpp +++ b/extras/Hadrons/Modules/MGauge/Unit.hpp @@ -50,6 +50,7 @@ public: virtual ~TUnit(void) = default; // dependencies/products virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup diff --git a/extras/Hadrons/Modules/MSink/Point.hpp b/extras/Hadrons/Modules/MSink/Point.hpp index 853a7c32..16b89434 100644 --- a/extras/Hadrons/Modules/MSink/Point.hpp +++ b/extras/Hadrons/Modules/MSink/Point.hpp @@ -60,6 +60,7 @@ public: virtual ~TPoint(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup @@ -93,6 +94,14 @@ std::vector TPoint::getInput(void) return in; } +template +std::vector TPoint::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + template std::vector TPoint::getOutput(void) { diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index d6c21412..bb4f3f62 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -61,6 +61,7 @@ public: virtual ~TRBPrecCG(void) = default; // dependencies/products virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup @@ -84,11 +85,19 @@ TRBPrecCG::TRBPrecCG(const std::string name) template std::vector TRBPrecCG::getInput(void) { - std::vector in = {par().action}; + std::vector in = {}; return in; } +template +std::vector TRBPrecCG::getReference(void) +{ + std::vector ref = {par().action}; + + return ref; +} + template std::vector TRBPrecCG::getOutput(void) { @@ -115,7 +124,6 @@ void TRBPrecCG::setup(void) schurSolver(mat, source, sol); }; envCreate(SolverFn, getName(), Ls, solver); - env().addOwnership(getName(), par().action); } // execution /////////////////////////////////////////////////////////////////// diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index b9813688..3fab41c0 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -71,6 +71,7 @@ public: virtual ~TPoint(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); protected: // setup @@ -100,6 +101,14 @@ std::vector TPoint::getInput(void) return in; } +template +std::vector TPoint::getReference(void) +{ + std::vector ref = {}; + + return ref; +} + template std::vector TPoint::getOutput(void) { diff --git a/extras/Hadrons/Modules/templates/Module.cc.template b/extras/Hadrons/Modules/templates/Module.cc.template index 0c509d6d..29edadfb 100644 --- a/extras/Hadrons/Modules/templates/Module.cc.template +++ b/extras/Hadrons/Modules/templates/Module.cc.template @@ -19,6 +19,14 @@ std::vector T___FILEBASENAME___::getInput(void) return in; } +template +std::vector T___FILEBASENAME___::getReference(void) +{ + std::vector in = {}; + + return in; +} + std::vector T___FILEBASENAME___::getOutput(void) { std::vector out = {getName()}; diff --git a/extras/Hadrons/Modules/templates/Module.hpp.template b/extras/Hadrons/Modules/templates/Module.hpp.template index fb43260f..b59e168f 100644 --- a/extras/Hadrons/Modules/templates/Module.hpp.template +++ b/extras/Hadrons/Modules/templates/Module.hpp.template @@ -26,6 +26,7 @@ public: virtual ~T___FILEBASENAME___(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); // setup virtual void setup(void); diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.cc.template b/extras/Hadrons/Modules/templates/Module_in_NS.cc.template index 8b2a0ec0..880129bd 100644 --- a/extras/Hadrons/Modules/templates/Module_in_NS.cc.template +++ b/extras/Hadrons/Modules/templates/Module_in_NS.cc.template @@ -20,6 +20,14 @@ std::vector T___FILEBASENAME___::getInput(void) return in; } +template +std::vector T___FILEBASENAME___::getReference(void) +{ + std::vector in = {}; + + return in; +} + std::vector T___FILEBASENAME___::getOutput(void) { std::vector out = {getName()}; diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template index ea77b12a..f90cb052 100644 --- a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template @@ -28,6 +28,7 @@ public: virtual ~T___FILEBASENAME___(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); // setup virtual void setup(void); diff --git a/extras/Hadrons/Modules/templates/Module_tmp.hpp.template b/extras/Hadrons/Modules/templates/Module_tmp.hpp.template index 2ee053a9..b4e7f87f 100644 --- a/extras/Hadrons/Modules/templates/Module_tmp.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_tmp.hpp.template @@ -27,6 +27,7 @@ public: virtual ~T___FILEBASENAME___(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); // setup virtual void setup(void); diff --git a/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template b/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template index b79c0ad3..9aef1c92 100644 --- a/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template @@ -29,6 +29,7 @@ public: virtual ~T___FILEBASENAME___(void) = default; // dependency relation virtual std::vector getInput(void); + virtual std::vector getReference(void); virtual std::vector getOutput(void); // setup virtual void setup(void); @@ -56,6 +57,14 @@ std::vector T___FILEBASENAME___::getInput(void) return in; } +template +std::vector T___FILEBASENAME___::getReference(void) +{ + std::vector in = {}; + + return in; +} + template std::vector T___FILEBASENAME___::getOutput(void) { diff --git a/extras/Hadrons/VirtualMachine.cc b/extras/Hadrons/VirtualMachine.cc index ae1d5b6b..7f967f66 100644 --- a/extras/Hadrons/VirtualMachine.cc +++ b/extras/Hadrons/VirtualMachine.cc @@ -82,8 +82,7 @@ void VirtualMachine::pushModule(VirtualMachine::ModPt &pt) m.data = std::move(pt); m.type = typeIdPt(*m.data.get()); m.name = name; - auto input = m.data->getInput(); - for (auto &in: input) + for (auto &in: m.data->getInput()) { if (!env().hasObject(in)) { @@ -91,11 +90,18 @@ void VirtualMachine::pushModule(VirtualMachine::ModPt &pt) } m.input.push_back(env().getObjectAddress(in)); } - auto output = m.data->getOutput(); + for (auto &ref: m.data->getReference()) + { + if (!env().hasObject(ref)) + { + env().addObject(ref , -1); + } + m.input.push_back(env().getObjectAddress(ref)); + } module_.push_back(std::move(m)); address = static_cast(module_.size() - 1); moduleAddress_[name] = address; - for (auto &out: output) + for (auto &out: getModule(address)->getOutput()) { if (!env().hasObject(out)) { @@ -114,6 +120,25 @@ void VirtualMachine::pushModule(VirtualMachine::ModPt &pt) + module_[env().getObjectModule(out)].name + "' (while pushing module '" + name + "')"); } + if (getModule(address)->getReference().size() > 0) + { + auto pred = [this, out](const ModuleInfo &n) + { + auto &in = n.input; + auto it = std::find(in.begin(), in.end(), env().getObjectAddress(out)); + + return (it != in.end()); + }; + auto it = std::find_if(module_.begin(), module_.end(), pred); + while (it != module_.end()) + { + for (auto &ref: getModule(address)->getReference()) + { + it->input.push_back(env().getObjectAddress(ref)); + } + it = std::find_if(++it, module_.end(), pred); + } + } } } } @@ -225,12 +250,17 @@ Graph VirtualMachine::makeModuleGraph(void) const { Graph moduleGraph; - for (unsigned int i = 0; i < module_.size(); ++i) + // create vertices + for (unsigned int m = 0; m < module_.size(); ++m) { - moduleGraph.addVertex(i); - for (auto &j: module_[i].input) + moduleGraph.addVertex(m); + } + // create edges + for (unsigned int m = 0; m < module_.size(); ++m) + { + for (auto &in: module_[m].input) { - moduleGraph.addEdge(env().getObjectModule(j), i); + moduleGraph.addEdge(env().getObjectModule(in), m); } } @@ -258,7 +288,6 @@ VirtualMachine::executeProgram(const std::vector &p) { Size memPeak = 0, sizeBefore, sizeAfter; std::vector> freeProg; - bool continueCollect, nothingFreed; // build garbage collection schedule LOG(Debug) << "Building garbage collection schedule..." << std::endl; @@ -307,25 +336,10 @@ VirtualMachine::executeProgram(const std::vector &p) { LOG(Message) << "Garbage collection..." << std::endl; } - nothingFreed = true; - do + for (auto &j: freeProg[i]) { - continueCollect = false; - auto toFree = freeProg[i]; - for (auto &j: toFree) - { - // continue garbage collection while there are still - // objects without owners - continueCollect = continueCollect or !env().hasOwners(j); - if(env().freeObject(j)) - { - // if an object has been freed, remove it from - // the garbage collection schedule - freeProg[i].erase(j); - nothingFreed = false; - } - } - } while (continueCollect); + env().freeObject(j); + } // free temporaries for (unsigned int i = 0; i < env().getMaxAddress(); ++i) { @@ -335,15 +349,6 @@ VirtualMachine::executeProgram(const std::vector &p) env().freeObject(i); } } - // any remaining objects in step i garbage collection schedule - // is scheduled for step i + 1 - if (i + 1 < p.size()) - { - for (auto &j: freeProg[i]) - { - freeProg[i + 1].insert(j); - } - } // print used memory after garbage collection if necessary if (!isDryRun()) {