diff --git a/lib/Hadrons b/lib/Hadrons new file mode 120000 index 00000000..5343d55a --- /dev/null +++ b/lib/Hadrons @@ -0,0 +1 @@ +../programs/Hadrons \ No newline at end of file diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index fe1c21a0..a89d7034 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace QCD; @@ -38,10 +38,9 @@ using namespace Hadrons; /****************************************************************************** * Application implementation * ******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -Application::Application(const std::string parameterFileName) -: parameterFileName_(parameterFileName) -, env_(Environment::getInstance()) +// constructors //////////////////////////////////////////////////////////////// +Application::Application(void) +: env_(Environment::getInstance()) { LOG(Message) << "Modules available:" << std::endl; auto list = ModuleFactory::getInstance().getBuilderList(); @@ -61,14 +60,31 @@ Application::Application(const std::string parameterFileName) LOG(Message) << "Local lattice : " << loc << std::endl; } -// destructor ////////////////////////////////////////////////////////////////// -Application::~Application(void) -{} +Application::Application(const Application::GlobalPar &par) +: Application() +{ + setPar(par); +} + +Application::Application(const std::string parameterFileName) +: Application() +{ + parameterFileName_ = parameterFileName; +} + +// access ////////////////////////////////////////////////////////////////////// +void Application::setPar(const Application::GlobalPar &par) +{ + par_ = par; +} // execute ///////////////////////////////////////////////////////////////////// void Application::run(void) { - parseParameterFile(); + if (!parameterFileName_.empty()) + { + parseParameterFile(); + } schedule(); configLoop(); } diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 20716adf..2ce8d694 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -28,44 +28,44 @@ directory. #ifndef Hadrons_Application_hpp_ #define Hadrons_Application_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE -class TrajRange: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(TrajRange, - unsigned int, start, - unsigned int, end, - unsigned int, step); -}; - -class GlobalPar: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, - TrajRange, trajCounter, - std::string, seed); -}; - /****************************************************************************** * Main program manager * ******************************************************************************/ class Application { public: - + class TrajRange: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(TrajRange, + unsigned int, start, + unsigned int, end, + unsigned int, step); + }; + class GlobalPar: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, + TrajRange, trajCounter, + std::string, seed); + }; public: - // constructor + // constructors + Application(void); + Application(const GlobalPar &par); Application(const std::string parameterFileName); // destructor - virtual ~Application(void); + virtual ~Application(void) = default; + // access + void setPar(const GlobalPar &par); // execute void run(void); -private: // parse parameter file void parseParameterFile(void); // schedule computation @@ -74,7 +74,7 @@ private: void configLoop(void); private: long unsigned int locVol_; - std::string parameterFileName_; + std::string parameterFileName_{""}; GlobalPar par_; Environment &env_; std::vector program_; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 402543df..e9c7c733 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -25,9 +25,9 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include -#include -#include +#include +#include +#include using namespace Grid; using namespace QCD; @@ -136,19 +136,18 @@ GridParallelRNG * Environment::get4dRng(void) const } // module management /////////////////////////////////////////////////////////// -void Environment::createModule(const std::string name, const std::string type, - XmlReader &reader) +void Environment::pushModule(Environment::ModPt &pt) { + std::string name = pt->getName(); + if (!hasModule(name)) { - auto &factory = ModuleFactory::getInstance(); std::vector inputAddress; ModuleInfo m; - - m.data = factory.create(type, name); + + m.data = std::move(pt); m.type = typeIdPt(*m.data.get()); m.name = name; - m.data->parseParameters(reader, "options"); auto input = m.data->getInput(); for (auto &in: input) { @@ -176,9 +175,9 @@ void Environment::createModule(const std::string name, const std::string type, else { HADRON_ERROR("object '" + out - + "' is already produced by module '" - + module_[object_[getObjectAddress(out)].module].name - + "' (while creating module '" + name + "')"); + + "' is already produced by module '" + + module_[object_[getObjectAddress(out)].module].name + + "' (while pushing module '" + name + "')"); } } } @@ -189,6 +188,16 @@ void Environment::createModule(const std::string name, const std::string type, } } +void Environment::createModule(const std::string name, const std::string type, + XmlReader &reader) +{ + auto &factory = ModuleFactory::getInstance(); + auto pt = factory.create(type, name); + + pt->parseParameters(reader, "options"); + pushModule(pt); +} + ModuleBase * Environment::getModule(const unsigned int address) const { if (hasModule(address)) diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 6d8d2b23..baea4550 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -28,8 +28,8 @@ directory. #ifndef Hadrons_Environment_hpp_ #define Hadrons_Environment_hpp_ -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE @@ -72,10 +72,10 @@ public: private: struct ModuleInfo { - const std::type_info *type{nullptr}; - std::string name; - std::unique_ptr data{nullptr}; - std::vector input; + const std::type_info *type{nullptr}; + std::string name; + ModPt data{nullptr}; + std::vector input; }; struct ObjInfo { @@ -102,6 +102,12 @@ public: void setSeed(const std::vector &seed); GridParallelRNG * get4dRng(void) const; // module management + void pushModule(ModPt &pt); + template + void createModule(const std::string name); + template + void createModule(const std::string name, + const typename M::Par &par); void createModule(const std::string name, const std::string type, XmlReader &reader); @@ -227,6 +233,24 @@ void Holder::reset(T *pt) * Environment template implementation * ******************************************************************************/ // module management /////////////////////////////////////////////////////////// +template +void Environment::createModule(const std::string name) +{ + ModPt pt(new M(name)); + + pushModule(pt); +} + +template +void Environment::createModule(const std::string name, + const typename M::Par &par) +{ + ModPt pt(new M(name)); + + pt->setPar(par); + pushModule(pt); +} + template M * Environment::getModule(const unsigned int address) const { diff --git a/programs/Hadrons/Factory.hpp b/programs/Hadrons/Factory.hpp index e609949a..ea358c21 100644 --- a/programs/Hadrons/Factory.hpp +++ b/programs/Hadrons/Factory.hpp @@ -28,7 +28,7 @@ directory. #ifndef Hadrons_Factory_hpp_ #define Hadrons_Factory_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/GeneticScheduler.hpp b/programs/Hadrons/GeneticScheduler.hpp index 026ee303..3d75f2a4 100644 --- a/programs/Hadrons/GeneticScheduler.hpp +++ b/programs/Hadrons/GeneticScheduler.hpp @@ -28,8 +28,8 @@ directory. #ifndef Hadrons_GeneticScheduler_hpp_ #define Hadrons_GeneticScheduler_hpp_ -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index a13efec1..62997e1f 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 78b43452..37ad077d 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -28,7 +28,7 @@ directory. #ifndef Hadrons_Graph_hpp_ #define Hadrons_Graph_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index 97b8686c..ad43b6cc 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 2372c025..cdf7a166 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -1,15 +1,26 @@ -AM_CXXFLAGS += -I$(top_srcdir)/programs -I../$(top_srcdir)/programs +lib_LIBRARIES = libHadrons.a bin_PROGRAMS = Hadrons include modules.inc -Hadrons_SOURCES = \ - $(modules) \ - Application.cc \ - Environment.cc \ - Global.cc \ - Hadrons.cc \ +libHadrons_a_SOURCES = \ + $(modules_cc) \ + Application.cc \ + Environment.cc \ + Global.cc \ Module.cc +libHadrons_adir = $(pkgincludedir)/Hadrons +nobase_libHadrons_a_HEADERS = \ + $(modules_hpp) \ + Application.hpp \ + Environment.hpp \ + Factory.hpp \ + GeneticScheduler.hpp \ + Global.hpp \ + Graph.hpp \ + Module.hpp \ + ModuleFactory.hpp -Hadrons_LDADD = -lGrid +Hadrons_SOURCES = Hadrons.cc +Hadrons_LDADD = libHadrons.a -lGrid diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index 6669a861..e8a80f07 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 1a219c59..60dcc936 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -28,8 +28,8 @@ directory. #ifndef Hadrons_Module_hpp_ #define Hadrons_Module_hpp_ -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/ModuleFactory.hpp b/programs/Hadrons/ModuleFactory.hpp index 0169ef94..01cc130c 100644 --- a/programs/Hadrons/ModuleFactory.hpp +++ b/programs/Hadrons/ModuleFactory.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_ModuleFactory_hpp_ #define Hadrons_ModuleFactory_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/ADWF.cc b/programs/Hadrons/Modules/ADWF.cc index a52caf40..c7fba722 100644 --- a/programs/Hadrons/Modules/ADWF.cc +++ b/programs/Hadrons/Modules/ADWF.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/ADWF.hpp b/programs/Hadrons/Modules/ADWF.hpp index 0f4f5402..159d5b20 100644 --- a/programs/Hadrons/Modules/ADWF.hpp +++ b/programs/Hadrons/Modules/ADWF.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_ADWF_hpp_ #define Hadrons_ADWF_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/AWilson.cc b/programs/Hadrons/Modules/AWilson.cc index e5a41bfd..a27a258d 100644 --- a/programs/Hadrons/Modules/AWilson.cc +++ b/programs/Hadrons/Modules/AWilson.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/AWilson.hpp b/programs/Hadrons/Modules/AWilson.hpp index cb35525e..93986315 100644 --- a/programs/Hadrons/Modules/AWilson.hpp +++ b/programs/Hadrons/Modules/AWilson.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_AWilson_hpp_ #define Hadrons_AWilson_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/CMeson.cc b/programs/Hadrons/Modules/CMeson.cc index c1cf153e..fef8179d 100644 --- a/programs/Hadrons/Modules/CMeson.cc +++ b/programs/Hadrons/Modules/CMeson.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; diff --git a/programs/Hadrons/Modules/CMeson.hpp b/programs/Hadrons/Modules/CMeson.hpp index 1cbd6d86..2e9daa6d 100644 --- a/programs/Hadrons/Modules/CMeson.hpp +++ b/programs/Hadrons/Modules/CMeson.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_CMeson_hpp_ #define Hadrons_CMeson_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/GLoad.cc b/programs/Hadrons/Modules/GLoad.cc index 69aa6c9b..b81307cd 100644 --- a/programs/Hadrons/Modules/GLoad.cc +++ b/programs/Hadrons/Modules/GLoad.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/GLoad.hpp b/programs/Hadrons/Modules/GLoad.hpp index af01e40e..9a089b61 100644 --- a/programs/Hadrons/Modules/GLoad.hpp +++ b/programs/Hadrons/Modules/GLoad.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_GLoad_hpp_ #define Hadrons_GLoad_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/GRandom.cc b/programs/Hadrons/Modules/GRandom.cc index 57b4efa9..7f5af2c2 100644 --- a/programs/Hadrons/Modules/GRandom.cc +++ b/programs/Hadrons/Modules/GRandom.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/GRandom.hpp b/programs/Hadrons/Modules/GRandom.hpp index a31028fd..6c42372e 100644 --- a/programs/Hadrons/Modules/GRandom.hpp +++ b/programs/Hadrons/Modules/GRandom.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_GRandom_hpp_ #define Hadrons_GRandom_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/GUnit.cc b/programs/Hadrons/Modules/GUnit.cc index 9e660799..34f134fe 100644 --- a/programs/Hadrons/Modules/GUnit.cc +++ b/programs/Hadrons/Modules/GUnit.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/GUnit.hpp b/programs/Hadrons/Modules/GUnit.hpp index eff34020..31b53a35 100644 --- a/programs/Hadrons/Modules/GUnit.hpp +++ b/programs/Hadrons/Modules/GUnit.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_GUnit_hpp_ #define Hadrons_GUnit_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index 195b558f..8f730b58 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; diff --git a/programs/Hadrons/Modules/MQuark.hpp b/programs/Hadrons/Modules/MQuark.hpp index 526815ef..f217e338 100644 --- a/programs/Hadrons/Modules/MQuark.hpp +++ b/programs/Hadrons/Modules/MQuark.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_MQuark_hpp_ #define Hadrons_MQuark_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/SolRBPrecCG.cc b/programs/Hadrons/Modules/SolRBPrecCG.cc index d93b39a8..7a7aa69d 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.cc +++ b/programs/Hadrons/Modules/SolRBPrecCG.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; diff --git a/programs/Hadrons/Modules/SolRBPrecCG.hpp b/programs/Hadrons/Modules/SolRBPrecCG.hpp index b987eb95..7482a70c 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.hpp +++ b/programs/Hadrons/Modules/SolRBPrecCG.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_SolRBPrecCG_hpp_ #define Hadrons_SolRBPrecCG_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/SrcPoint.cc b/programs/Hadrons/Modules/SrcPoint.cc index ca9c1345..a060b5d7 100644 --- a/programs/Hadrons/Modules/SrcPoint.cc +++ b/programs/Hadrons/Modules/SrcPoint.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/SrcPoint.hpp b/programs/Hadrons/Modules/SrcPoint.hpp index 75108319..8c1efce0 100644 --- a/programs/Hadrons/Modules/SrcPoint.hpp +++ b/programs/Hadrons/Modules/SrcPoint.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_SrcPoint_hpp_ #define Hadrons_SrcPoint_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules/SrcZ2.cc b/programs/Hadrons/Modules/SrcZ2.cc index 74e3add0..ec555a08 100644 --- a/programs/Hadrons/Modules/SrcZ2.cc +++ b/programs/Hadrons/Modules/SrcZ2.cc @@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Modules/SrcZ2.hpp b/programs/Hadrons/Modules/SrcZ2.hpp index a61f8688..bf0aebc0 100644 --- a/programs/Hadrons/Modules/SrcZ2.hpp +++ b/programs/Hadrons/Modules/SrcZ2.hpp @@ -28,9 +28,9 @@ directory. #ifndef Hadrons_SrcZ2_hpp_ #define Hadrons_SrcZ2_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/make_module_list.sh b/programs/Hadrons/make_module_list.sh index 78ed8040..0733efcb 100755 --- a/programs/Hadrons/make_module_list.sh +++ b/programs/Hadrons/make_module_list.sh @@ -1,4 +1,8 @@ #!/usr/bin/env bash -echo 'modules =\' > modules.inc -find Modules -name '*.cc' -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> modules.inc \ No newline at end of file +echo 'modules_cc =\' > modules.inc +find Modules -name '*.cc' -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> modules.inc +echo '' >> modules.inc +echo 'modules_hpp =\' >> modules.inc +find Modules -name '*.hpp' -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> modules.inc +echo '' >> modules.inc diff --git a/programs/Hadrons/modules.inc b/programs/Hadrons/modules.inc index 6ca8329e..9040c406 100644 --- a/programs/Hadrons/modules.inc +++ b/programs/Hadrons/modules.inc @@ -1,4 +1,4 @@ -modules =\ +modules_cc =\ Modules/ADWF.cc \ Modules/AWilson.cc \ Modules/CMeson.cc \ @@ -9,3 +9,16 @@ modules =\ Modules/SolRBPrecCG.cc \ Modules/SrcPoint.cc \ Modules/SrcZ2.cc + +modules_hpp =\ + Modules/ADWF.hpp \ + Modules/AWilson.hpp \ + Modules/CMeson.hpp \ + Modules/GLoad.hpp \ + Modules/GRandom.hpp \ + Modules/GUnit.hpp \ + Modules/MQuark.hpp \ + Modules/SolRBPrecCG.hpp \ + Modules/SrcPoint.hpp \ + Modules/SrcZ2.hpp +