portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Merge branch 'feature/hadrons' into feature/qed-fvol

Browse Source
This commit is contained in:
Antonin Portelli 2016-12-22 00:26:43 +01:00
commit 149a46b92c
4 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/Hadrons/Application.cc
View File

@ -306,7 +306,7 @@ void Application::configLoop(void)
<< " " << BIG_SEP << std::endl; << " " << BIG_SEP << std::endl;
env_.setTrajectory(t); env_.setTrajectory(t);
env_.executeProgram(program_); env_.executeProgram(program_);
env_.freeAll();
} }
LOG(Message) << BIG_SEP << " End of measurement " << BIG_SEP << std::endl; LOG(Message) << BIG_SEP << " End of measurement " << BIG_SEP << std::endl;
env_.freeAll();
} }

47
extras/Hadrons/Environment.cc
View File

@ -410,12 +410,19 @@ Environment::Size Environment::executeProgram(const std::vector<std::string> &p)
// general memory management /////////////////////////////////////////////////// // general memory management ///////////////////////////////////////////////////
void Environment::addObject(const std::string name, const int moduleAddress) void Environment::addObject(const std::string name, const int moduleAddress)
{ {
ObjInfo info; if (!hasObject(name))
{
info.name = name; ObjInfo info;
info.module = moduleAddress;
object_.push_back(std::move(info)); info.name = name;
objectAddress_[name] = static_cast<unsigned int>(object_.size() - 1); info.module = moduleAddress;
object_.push_back(std::move(info));
objectAddress_[name] = static_cast<unsigned int>(object_.size() - 1);
}
else
{
HADRON_ERROR("object '" + name + "' already exists");
}
} }
void Environment::registerObject(const unsigned int address, void Environment::registerObject(const unsigned int address,
@ -444,6 +451,10 @@ void Environment::registerObject(const unsigned int address,
void Environment::registerObject(const std::string name, void Environment::registerObject(const std::string name,
const unsigned int size, const unsigned int Ls) const unsigned int size, const unsigned int Ls)
{ {
if (!hasObject(name))
{
addObject(name);
}
registerObject(getObjectAddress(name), size, Ls); registerObject(getObjectAddress(name), size, Ls);
} }
@ -573,6 +584,30 @@ bool Environment::hasRegisteredObject(const std::string name) const
} }
} }
bool Environment::hasCreatedObject(const unsigned int address) const
{
if (hasObject(address))
{
return (object_[address].data != nullptr);
}
else
{
return false;
}
}
bool Environment::hasCreatedObject(const std::string name) const
{
if (hasObject(name))
{
return hasCreatedObject(getObjectAddress(name));
}
else
{
return false;
}
}
bool Environment::isObject5d(const unsigned int address) const bool Environment::isObject5d(const unsigned int address) const
{ {
return (getObjectLs(address) > 1); return (getObjectLs(address) > 1);

4
extras/Hadrons/Environment.hpp
View File

@ -137,7 +137,7 @@ public:
Size executeProgram(const std::vector<std::string> &p); Size executeProgram(const std::vector<std::string> &p);
// general memory management // general memory management
void addObject(const std::string name, void addObject(const std::string name,
const int moduleAddress); const int moduleAddress = -1);
void registerObject(const unsigned int address, void registerObject(const unsigned int address,
const unsigned int size, const unsigned int size,
const unsigned int Ls = 1); const unsigned int Ls = 1);
@ -176,6 +176,8 @@ public:
bool hasObject(const std::string name) const; bool hasObject(const std::string name) const;
bool hasRegisteredObject(const unsigned int address) const; bool hasRegisteredObject(const unsigned int address) const;
bool hasRegisteredObject(const std::string name) const; bool hasRegisteredObject(const std::string name) const;
bool hasCreatedObject(const unsigned int address) const;
bool hasCreatedObject(const std::string name) const;
bool isObject5d(const unsigned int address) const; bool isObject5d(const unsigned int address) const;
bool isObject5d(const std::string name) const; bool isObject5d(const std::string name) const;
Environment::Size getTotalSize(void) const; Environment::Size getTotalSize(void) const;

4
extras/Hadrons/GeneticScheduler.hpp
View File

@ -134,7 +134,7 @@ void GeneticScheduler<T>::nextGeneration(void)
LOG(Debug) << "Starting population:\n" << *this << std::endl; LOG(Debug) << "Starting population:\n" << *this << std::endl;
// random mutations // random mutations
PARALLEL_FOR_LOOP //PARALLEL_FOR_LOOP
for (unsigned int i = 0; i < par_.popSize; ++i) for (unsigned int i = 0; i < par_.popSize; ++i)
{ {
doMutation(); doMutation();
@ -142,7 +142,7 @@ void GeneticScheduler<T>::nextGeneration(void)
LOG(Debug) << "After mutations:\n" << *this << std::endl; LOG(Debug) << "After mutations:\n" << *this << std::endl;
// mating // mating
PARALLEL_FOR_LOOP //PARALLEL_FOR_LOOP
for (unsigned int i = 0; i < par_.popSize/2; ++i) for (unsigned int i = 0; i < par_.popSize/2; ++i)
{ {
doCrossover(); doCrossover();