portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-04 19:25:56 +01:00
Code Releases Activity

first steps to make Hadrons a library

Browse Source
This commit is contained in:
Antonin Portelli 2016-11-28 16:02:15 +09:00
parent fabcd4179d
commit 43928846f2
36 changed files with 194 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Hadrons Symbolic link
View File

@ -0,0 +1 @@
../programs/Hadrons

36
programs/Hadrons/Application.cc
View File

@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Application.hpp>
#include <Hadrons/GeneticScheduler.hpp>
#include <Grid/Hadrons/Application.hpp>
#include <Grid/Hadrons/GeneticScheduler.hpp>
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();
}

50
programs/Hadrons/Application.hpp
View File

@ -28,44 +28,44 @@ directory.
#ifndef Hadrons_Application_hpp_
#define Hadrons_Application_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Environment.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Environment.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
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<unsigned int> program_;

33
programs/Hadrons/Environment.cc
View File

@ -25,9 +25,9 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Environment.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Environment.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
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<unsigned int> 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))

36
programs/Hadrons/Environment.hpp
View File

@ -28,8 +28,8 @@ directory.
#ifndef Hadrons_Environment_hpp_
#define Hadrons_Environment_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Graph.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Graph.hpp>
BEGIN_HADRONS_NAMESPACE
@ -72,10 +72,10 @@ public:
private:
struct ModuleInfo
{
const std::type_info *type{nullptr};
std::string name;
std::unique_ptr<ModuleBase> data{nullptr};
std::vector<unsigned int> input;
const std::type_info *type{nullptr};
std::string name;
ModPt data{nullptr};
std::vector<unsigned int> input;
};
struct ObjInfo
{
@ -102,6 +102,12 @@ public:
void setSeed(const std::vector<int> &seed);
GridParallelRNG * get4dRng(void) const;
// module management
void pushModule(ModPt &pt);
template <typename M>
void createModule(const std::string name);
template <typename M>
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<T>::reset(T *pt)
* Environment template implementation *
******************************************************************************/
// module management ///////////////////////////////////////////////////////////
template <typename M>
void Environment::createModule(const std::string name)
{
ModPt pt(new M(name));
pushModule(pt);
}
template <typename M>
void Environment::createModule(const std::string name,
const typename M::Par &par)
{
ModPt pt(new M(name));
pt->setPar(par);
pushModule(pt);
}
template <typename M>
M * Environment::getModule(const unsigned int address) const
{

2
programs/Hadrons/Factory.hpp
View File

@ -28,7 +28,7 @@ directory.
#ifndef Hadrons_Factory_hpp_
#define Hadrons_Factory_hpp_
#include <Hadrons/Global.hpp>
#include <Grid/Hadrons/Global.hpp>
BEGIN_HADRONS_NAMESPACE

4
programs/Hadrons/GeneticScheduler.hpp
View File

@ -28,8 +28,8 @@ directory.
#ifndef Hadrons_GeneticScheduler_hpp_
#define Hadrons_GeneticScheduler_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Graph.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Graph.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Global.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Global.hpp>
#include <Grid/Hadrons/Global.hpp>
using namespace Grid;
using namespace QCD;

2
programs/Hadrons/Graph.hpp
View File

@ -28,7 +28,7 @@ directory.
#ifndef Hadrons_Graph_hpp_
#define Hadrons_Graph_hpp_
#include <Hadrons/Global.hpp>
#include <Grid/Hadrons/Global.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Hadrons.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Application.hpp>
#include <Grid/Hadrons/Application.hpp>
using namespace Grid;
using namespace QCD;

27
programs/Hadrons/Makefile.am
View File

@ -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

2
programs/Hadrons/Module.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Module.hpp>
#include <Grid/Hadrons/Module.hpp>
using namespace Grid;
using namespace QCD;

4
programs/Hadrons/Module.hpp
View File

@ -28,8 +28,8 @@ directory.
#ifndef Hadrons_Module_hpp_
#define Hadrons_Module_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Environment.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Environment.hpp>
BEGIN_HADRONS_NAMESPACE

6
programs/Hadrons/ModuleFactory.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_ModuleFactory_hpp_
#define Hadrons_ModuleFactory_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Factory.hpp>
#include <Hadrons/Module.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Factory.hpp>
#include <Grid/Hadrons/Module.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/ADWF.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/ADWF.hpp>
#include <Grid/Hadrons/Modules/ADWF.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/ADWF.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_ADWF_hpp_
#define Hadrons_ADWF_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/AWilson.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/AWilson.hpp>
#include <Grid/Hadrons/Modules/AWilson.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/AWilson.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_AWilson_hpp_
#define Hadrons_AWilson_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/CMeson.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/CMeson.hpp>
#include <Grid/Hadrons/Modules/CMeson.hpp>
using namespace Grid;
using namespace QCD;

6
programs/Hadrons/Modules/CMeson.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_CMeson_hpp_
#define Hadrons_CMeson_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/GLoad.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/GLoad.hpp>
#include <Grid/Hadrons/Modules/GLoad.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/GLoad.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_GLoad_hpp_
#define Hadrons_GLoad_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/GRandom.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/GRandom.hpp>
#include <Grid/Hadrons/Modules/GRandom.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/GRandom.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_GRandom_hpp_
#define Hadrons_GRandom_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/GUnit.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/GUnit.hpp>
#include <Grid/Hadrons/Modules/GUnit.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/GUnit.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_GUnit_hpp_
#define Hadrons_GUnit_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/MQuark.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/MQuark.hpp>
#include <Grid/Hadrons/Modules/MQuark.hpp>
using namespace Grid;
using namespace QCD;

6
programs/Hadrons/Modules/MQuark.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_MQuark_hpp_
#define Hadrons_MQuark_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/SolRBPrecCG.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/SolRBPrecCG.hpp>
#include <Grid/Hadrons/Modules/SolRBPrecCG.hpp>
using namespace Grid;
using namespace QCD;

6
programs/Hadrons/Modules/SolRBPrecCG.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_SolRBPrecCG_hpp_
#define Hadrons_SolRBPrecCG_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/SrcPoint.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/SrcPoint.hpp>
#include <Grid/Hadrons/Modules/SrcPoint.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/SrcPoint.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_SrcPoint_hpp_
#define Hadrons_SrcPoint_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

2
programs/Hadrons/Modules/SrcZ2.cc
View File

@ -25,7 +25,7 @@ See the full license in the file "LICENSE" in the top level distribution
directory.
*******************************************************************************/
#include <Hadrons/Modules/SrcZ2.hpp>
#include <Grid/Hadrons/Modules/SrcZ2.hpp>
using namespace Grid;
using namespace Hadrons;

6
programs/Hadrons/Modules/SrcZ2.hpp
View File

@ -28,9 +28,9 @@ directory.
#ifndef Hadrons_SrcZ2_hpp_
#define Hadrons_SrcZ2_hpp_
#include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp>
#include <Hadrons/ModuleFactory.hpp>
#include <Grid/Hadrons/Global.hpp>
#include <Grid/Hadrons/Module.hpp>
#include <Grid/Hadrons/ModuleFactory.hpp>
BEGIN_HADRONS_NAMESPACE

8
programs/Hadrons/make_module_list.sh
View File

@ -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
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

15
programs/Hadrons/modules.inc
View File

@ -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