From 538b16610b773613a5b0689b55ff976310264dc8 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 27 Oct 2015 17:33:18 +0000 Subject: [PATCH 001/807] First commit for measurement software 'Hadrons' --- Makefile.am | 2 +- configure | 6 ++++ configure.ac | 2 ++ programs/Hadrons/Application.cc | 58 ++++++++++++++++++++++++++++++++ programs/Hadrons/Application.hpp | 47 ++++++++++++++++++++++++++ programs/Hadrons/Global.cc | 31 +++++++++++++++++ programs/Hadrons/Global.hpp | 47 ++++++++++++++++++++++++++ programs/Hadrons/Hadrons.cc | 32 ++++++++++++++++++ programs/Hadrons/Makefile.am | 13 +++++++ programs/Makefile.am | 1 + 10 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 programs/Hadrons/Application.cc create mode 100644 programs/Hadrons/Application.hpp create mode 100644 programs/Hadrons/Global.cc create mode 100644 programs/Hadrons/Global.hpp create mode 100644 programs/Hadrons/Hadrons.cc create mode 100644 programs/Hadrons/Makefile.am create mode 100644 programs/Makefile.am diff --git a/Makefile.am b/Makefile.am index 3b1d5690..1b3db103 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # additional include paths necessary to compile the C++ library AM_CXXFLAGS = -I$(top_srcdir)/ -SUBDIRS = lib tests benchmarks +SUBDIRS = lib tests benchmarks programs filelist: $(SUBDIRS) \ No newline at end of file diff --git a/configure b/configure index dbc34570..b3b95c09 100755 --- a/configure +++ b/configure @@ -6536,6 +6536,10 @@ ac_config_files="$ac_config_files tests/Makefile" ac_config_files="$ac_config_files benchmarks/Makefile" +ac_config_files="$ac_config_files programs/Makefile" + +ac_config_files="$ac_config_files programs/Hadrons/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -7279,6 +7283,8 @@ do "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES benchmarks/Makefile" ;; + "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; + "programs/Hadrons/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Hadrons/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index e81abd0f..8e61e750 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,8 @@ AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(lib/Makefile) AC_CONFIG_FILES(tests/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) +AC_CONFIG_FILES(programs/Makefile) +AC_CONFIG_FILES(programs/Hadrons/Makefile) AC_OUTPUT diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc new file mode 100644 index 00000000..6fea55d5 --- /dev/null +++ b/programs/Hadrons/Application.cc @@ -0,0 +1,58 @@ +/* + * Application.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** + * Application implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +Application::Application(int argc, char *argv[]) +{ + if (argc < 2) + { + cerr << "usage: " << argv[0] << " [Grid options]"; + cerr << endl; + exit(EXIT_FAILURE); + } + parameterFileName_ = argv[1]; + Grid_init(&argc, &argv); + HadronsLogError.Active(GridLogError.isActive()); + HadronsLogWarning.Active(GridLogWarning.isActive()); + HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << endl; +} + +// destructor ////////////////////////////////////////////////////////////////// +Application::~Application(void) +{ + LOG(Message) << "Grid is finalizing now" << endl; + Grid_finalize(); +} + +// execute ///////////////////////////////////////////////////////////////////// +void Application::run(void) +{ + +} diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp new file mode 100644 index 00000000..4246c071 --- /dev/null +++ b/programs/Hadrons/Application.hpp @@ -0,0 +1,47 @@ +/* + * Application.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_Application_hpp_ +#define Hadrons_Application_hpp_ + +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Main program manager * + ******************************************************************************/ +class Application +{ +public: + // constructor + Application(int argc, char *argv[]); + // destructor + virtual ~Application(void); + // execute + void run(void); +private: + void parseParameters(void); +private: + std::string parameterFileName_; +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Application_hpp_ diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc new file mode 100644 index 00000000..aea2f7c1 --- /dev/null +++ b/programs/Hadrons/Global.cc @@ -0,0 +1,31 @@ +/* + * Application.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +HadronsLogger Hadrons::HadronsLogError(1,"Error"); +HadronsLogger Hadrons::HadronsLogWarning(1,"Warning"); +HadronsLogger Hadrons::HadronsLogMessage(1,"Message"); +HadronsLogger Hadrons::HadronsLogDebug(1,"Debug"); + + diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp new file mode 100644 index 00000000..12e8158f --- /dev/null +++ b/programs/Hadrons/Global.hpp @@ -0,0 +1,47 @@ +/* + * Globals.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * LatCore is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatCore is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatCore. If not, see . + */ + +#ifndef Hadrons_Global_hpp_ +#define Hadrons_Global_hpp_ + +#include + +#define BEGIN_HADRONS_NAMESPACE \ +namespace Hadrons {\ +using namespace Grid; +#define END_HADRONS_NAMESPACE } + +BEGIN_HADRONS_NAMESPACE + +class HadronsLogger: public Logger +{ +public: + HadronsLogger(int on, std::string nm): Logger("Hadrons", on, nm){}; +}; + +#define LOG(channel) std::cout << HadronsLog##channel + +extern HadronsLogger HadronsLogError; +extern HadronsLogger HadronsLogWarning; +extern HadronsLogger HadronsLogMessage; +extern HadronsLogger HadronsLogDebug; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Global_hpp_ diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc new file mode 100644 index 00000000..6788c237 --- /dev/null +++ b/programs/Hadrons/Hadrons.cc @@ -0,0 +1,32 @@ +/* + * Hadrons.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * LatCore is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatCore is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatCore. If not, see . + */ + +#include + +using namespace std; +using namespace Hadrons; + +int main(int argc, char *argv[]) +{ + Application application(argc, argv); + + application.run(); + + return EXIT_SUCCESS; +} diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am new file mode 100644 index 00000000..870b0747 --- /dev/null +++ b/programs/Hadrons/Makefile.am @@ -0,0 +1,13 @@ +AM_CXXFLAGS = -I$(top_srcdir)/programs -I$(top_srcdir)/lib +AM_LDFLAGS = -L$(top_builddir)/lib + +bin_PROGRAMS = Hadrons + +Hadrons_SOURCES = \ + Application.cc \ + Application.hpp \ + Global.hpp \ + Global.cc \ + Hadrons.cc + +Hadrons_LDADD = -lGrid diff --git a/programs/Makefile.am b/programs/Makefile.am new file mode 100644 index 00000000..d8c2b675 --- /dev/null +++ b/programs/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = Hadrons \ No newline at end of file From c4e22025503a22261e92c3a3193eac3b85075cb0 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 5 Nov 2015 14:28:14 +0000 Subject: [PATCH 002/807] First graph class implementation and test --- programs/Hadrons/Application.cc | 31 ++++ programs/Hadrons/Application.hpp | 3 +- programs/Hadrons/Environment.cc | 31 ++++ programs/Hadrons/Environment.hpp | 43 +++++ programs/Hadrons/Global.hpp | 6 + programs/Hadrons/Graph.hpp | 299 +++++++++++++++++++++++++++++++ programs/Hadrons/Make.inc | 4 + 7 files changed, 416 insertions(+), 1 deletion(-) create mode 100644 programs/Hadrons/Environment.cc create mode 100644 programs/Hadrons/Environment.hpp create mode 100644 programs/Hadrons/Graph.hpp create mode 100644 programs/Hadrons/Make.inc diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 6fea55d5..5cbd1baa 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -18,6 +18,7 @@ */ #include +#include using namespace std; using namespace Grid; @@ -53,6 +54,36 @@ Application::~Application(void) // execute ///////////////////////////////////////////////////////////////////// void Application::run(void) +{ + Graph g; + + cout << g << endl; + g.addEdge("A", "B"); + g.addEdge("B", "D"); + g.addEdge("D", "E"); + g.addEdge("E", "C"); + g.addEdge("C", "A"); + g.addEdge("Z", "Y"); + g.addEdge("Z", "W"); + g.addEdge("Z", "R"); + g.addEdge("W", "R"); + auto v = g.getAdjacentVertices("B"); + for (auto &s: v) + { + cout << s << " "; + } + cout << endl; + cout << g << endl; + g.depthFirstSearch(); + g.removedMarked(); + cout << g << endl; + g.depthFirstSearch(); + g.removedMarked(); + cout << g << endl; +} + +// parse parameter file //////////////////////////////////////////////////////// +void Application::parseParameterFile(void) { } diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 4246c071..deb1160f 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -37,7 +37,8 @@ public: // execute void run(void); private: - void parseParameters(void); + // parse parameter file + void parseParameterFile(void); private: std::string parameterFileName_; }; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc new file mode 100644 index 00000000..bf95b175 --- /dev/null +++ b/programs/Hadrons/Environment.cc @@ -0,0 +1,31 @@ +/* + * Environment.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** + * Environment implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +Environment::Environment(void) +{} diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp new file mode 100644 index 00000000..205f0aa0 --- /dev/null +++ b/programs/Hadrons/Environment.hpp @@ -0,0 +1,43 @@ +/* + * Environment.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_Environment_hpp_ +#define Hadrons_Environment_hpp_ + +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Global environment * + ******************************************************************************/ +// TODO: make it a singleton +class Environment +{ +public: + // constructor + Environment(void); + // destructor + virtual ~Environment(void) = default; +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Environment_hpp_ diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 12e8158f..44c395db 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -21,6 +21,7 @@ #define Hadrons_Global_hpp_ #include +#include #define BEGIN_HADRONS_NAMESPACE \ namespace Hadrons {\ @@ -36,6 +37,11 @@ public: }; #define LOG(channel) std::cout << HadronsLog##channel +#define HADRON_ERROR(msg)\ +LOG(Error) << msg << std::endl;\ +abort(); + +#define DEBUG_VAR(var) LOG(Debug) << #var << "= " << (var) << std::endl; extern HadronsLogger HadronsLogError; extern HadronsLogger HadronsLogWarning; diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp new file mode 100644 index 00000000..802812c7 --- /dev/null +++ b/programs/Hadrons/Graph.hpp @@ -0,0 +1,299 @@ +/* + * Graph.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_Graph_hpp_ +#define Hadrons_Graph_hpp_ + +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Oriented graph class * + ******************************************************************************/ +// I/O for edges +template +std::ostream & operator<<(std::ostream &out, const std::pair &e) +{ + out << "\"" << e.first << "\" -> \"" << e.second << "\""; + + return out; +} + +// main class +template +class Graph +{ +public: + typedef std::pair Edge; +public: + // constructor + Graph(void) = default; + // destructor + virtual ~Graph(void) = default; + // access + void addVertex(const T &value); + void addEdge(const Edge &e); + void addEdge(const T &start, const T &end); + void removeVertex(const T &value); + void removeEdge(const Edge &e); + void removeEdge(const T &start, const T &end); + // tests + bool gotValue(const T &value) const; + // graph topological manipulations + std::vector getAdjacentVertices(const T &value) const; + std::vector> getConnectedComponents(void) const; + // I/O + friend std::ostream & operator<<(std::ostream &out, const Graph &g) + { + out << "{"; + for (auto &e: g.edgeSet_) + { + out << e << ", "; + } + if (g.edgeSet_.size() != 0) + { + out << "\b\b"; + } + out << "}"; + + return out; + } +public: + // vertex marking + void mark(const T &value, const bool doMark = true); + void unmark(const T &value); + bool isMarked(const T &value) const; + // prune marked/unmarked vertices + void removedMarked(const bool isMarked = true); + void removedUnmarked(void); + // depth-first search marking + void depthFirstSearch(void); + void depthFirstSearch(const T &root); +private: + std::map isMarked_; + std::set edgeSet_; +}; + +/****************************************************************************** + * template implementation * + ******************************************************************************/ +// access ////////////////////////////////////////////////////////////////////// +template +void Graph::addVertex(const T &value) +{ + isMarked_[value] = false; +} + +template +void Graph::addEdge(const Edge &e) +{ + addVertex(e.first); + addVertex(e.second); + edgeSet_.insert(e); +} + +template +void Graph::addEdge(const T &start, const T &end) +{ + addEdge(Edge(start, end)); +} + +template +void Graph::removeVertex(const T &value) +{ + // remove vertex from the mark table + auto vIt = isMarked_.find(value); + + if (vIt != isMarked_.end()) + { + isMarked_.erase(vIt); + } + else + { + HADRON_ERROR("vertex " << value << " does not exists"); + } + + // remove all edges containing the vertex + auto pred = [&value](const Edge &e) + { + return ((e.first == value) or (e.second == value)); + }; + auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + + while (eIt != edgeSet_.end()) + { + edgeSet_.erase(eIt); + eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + } +} + +template +void Graph::removeEdge(const Edge &e) +{ + auto eIt = edgeSet_.find(e); + + if (eIt != edgeSet_.end()) + { + edgeSet_.erase(eIt); + } + else + { + HADRON_ERROR("edge " << e << " does not exists"); + } +} + +template +void Graph::removeEdge(const T &start, const T &end) +{ + removeEdge(Edge(start, end)); +} + +// tests /////////////////////////////////////////////////////////////////////// +template +bool Graph::gotValue(const T &value) const +{ + try + { + isMarked_.at(value); + } + catch (std::out_of_range &) + { + return false; + } + + return true; +} + +// vertex marking ////////////////////////////////////////////////////////////// +template +void Graph::mark(const T &value, const bool doMark) +{ + try + { + isMarked_.at(value) = doMark; + } + catch (std::out_of_range &) + { + HADRON_ERROR("vertex " << value << " does not exists"); + } +} + +template +void Graph::unmark(const T &value) +{ + mark(value, false); +} + +template +bool Graph::isMarked(const T &value) const +{ + try + { + return isMarked_.at(value); + } + catch (std::out_of_range &) + { + HADRON_ERROR("vertex " << value << " does not exists"); + + return false; + } +} + +// prune marked/unmarked vertices ////////////////////////////////////////////// +template +void Graph::removedMarked(const bool isMarked) +{ + auto isMarkedCopy = isMarked_; + + for (auto &v: isMarkedCopy) + { + if (v.second == isMarked) + { + removeVertex(v.first); + } + } +} + +template +void Graph::removedUnmarked(void) +{ + removedMarked(false); +} + +// depth-first search marking ////////////////////////////////////////////////// +template +void Graph::depthFirstSearch(void) +{ + depthFirstSearch(isMarked_.begin()->first); +} + +template +void Graph::depthFirstSearch(const T &root) +{ + std::vector adjacentVertex; + + mark(root); + adjacentVertex = getAdjacentVertices(root); + for (auto &v: adjacentVertex) + { + if (!isMarked(v)) + { + depthFirstSearch(v); + } + } +} + +// graph topological manipulations ///////////////////////////////////////////// +template +std::vector Graph::getAdjacentVertices(const T &value) const +{ + std::vector adjacentVertex; + + auto pred = [&value](const Edge &e) + { + return ((e.first == value) or (e.second == value)); + }; + auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + + while (eIt != edgeSet_.end()) + { + if (eIt->first == value) + { + adjacentVertex.push_back((*eIt).second); + } + else if (eIt->second == value) + { + adjacentVertex.push_back((*eIt).first); + } + eIt = find_if(++eIt, edgeSet_.end(), pred); + } + + return adjacentVertex; +} + +template +std::vector> Graph::getConnectedComponents(void) const +{ + +} + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Graph_hpp_ diff --git a/programs/Hadrons/Make.inc b/programs/Hadrons/Make.inc new file mode 100644 index 00000000..13c13c4e --- /dev/null +++ b/programs/Hadrons/Make.inc @@ -0,0 +1,4 @@ +bin_PROGRAMS = Hadrons + +Hadrons_SOURCES = Hadrons.cc +Hadrons_LDADD = -lGrid From 6f090e22c0da75e7447edafc82adaec5d123e263 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 2 Dec 2015 19:33:34 +0000 Subject: [PATCH 003/807] Hadrons: graph topological sort --- programs/Hadrons/Application.cc | 29 +++-- programs/Hadrons/Global.hpp | 1 + programs/Hadrons/Graph.hpp | 203 +++++++++++++++++++++++++++++--- 3 files changed, 205 insertions(+), 28 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 5cbd1baa..923bd0eb 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -57,29 +57,32 @@ void Application::run(void) { Graph g; - cout << g << endl; g.addEdge("A", "B"); g.addEdge("B", "D"); g.addEdge("D", "E"); g.addEdge("E", "C"); - g.addEdge("C", "A"); g.addEdge("Z", "Y"); g.addEdge("Z", "W"); g.addEdge("Z", "R"); g.addEdge("W", "R"); - auto v = g.getAdjacentVertices("B"); - for (auto &s: v) + g.addEdge("U", "I"); + + cout << g << endl; + auto vec = g.getConnectedComponents(); + for (auto &h: vec) { - cout << s << " "; + cout << h << endl; + } + for (auto &h: vec) + { + auto top = h.topoSort(); + while (!top.empty()) + { + cout << top.top() << " "; + top.pop(); + } + cout << endl; } - cout << endl; - cout << g << endl; - g.depthFirstSearch(); - g.removedMarked(); - cout << g << endl; - g.depthFirstSearch(); - g.removedMarked(); - cout << g << endl; } // parse parameter file //////////////////////////////////////////////////////// diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 44c395db..3b90b7ed 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -22,6 +22,7 @@ #include #include +#include #define BEGIN_HADRONS_NAMESPACE \ namespace Hadrons {\ diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 802812c7..e96c22b9 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -48,17 +48,22 @@ public: // destructor virtual ~Graph(void) = default; // access - void addVertex(const T &value); - void addEdge(const Edge &e); - void addEdge(const T &start, const T &end); - void removeVertex(const T &value); - void removeEdge(const Edge &e); - void removeEdge(const T &start, const T &end); + void addVertex(const T &value); + void addEdge(const Edge &e); + void addEdge(const T &start, const T &end); + void removeVertex(const T &value); + void removeEdge(const Edge &e); + void removeEdge(const T &start, const T &end); + unsigned int size(void) const; // tests bool gotValue(const T &value) const; // graph topological manipulations std::vector getAdjacentVertices(const T &value) const; + std::vector getChildren(const T &value) const; + std::vector getParents(const T &value) const; + std::vector getRoots(void) const; std::vector> getConnectedComponents(void) const; + std::stack topoSort(void); // I/O friend std::ostream & operator<<(std::ostream &out, const Graph &g) { @@ -75,14 +80,18 @@ public: return out; } -public: +private: // vertex marking - void mark(const T &value, const bool doMark = true); - void unmark(const T &value); - bool isMarked(const T &value) const; + void mark(const T &value, const bool doMark = true); + void markAll(const bool doMark = true); + void unmark(const T &value); + void unmarkAll(void); + bool isMarked(const T &value) const; + const T * getFirstMarked(const bool isMarked = true) const; + const T * getFirstUnmarked(void) const; // prune marked/unmarked vertices - void removedMarked(const bool isMarked = true); - void removedUnmarked(void); + void removeMarked(const bool isMarked = true); + void removeUnmarked(void); // depth-first search marking void depthFirstSearch(void); void depthFirstSearch(const T &root); @@ -165,6 +174,12 @@ void Graph::removeEdge(const T &start, const T &end) removeEdge(Edge(start, end)); } +template +unsigned int Graph::size(void) const +{ + return isMarked_.size(); +} + // tests /////////////////////////////////////////////////////////////////////// template bool Graph::gotValue(const T &value) const @@ -195,12 +210,27 @@ void Graph::mark(const T &value, const bool doMark) } } +template +void Graph::markAll(const bool doMark) +{ + for (auto &v: isMarked_) + { + mark(v.first, doMark); + } +} + template void Graph::unmark(const T &value) { mark(value, false); } +template +void Graph::unmarkAll(void) +{ + markAll(false); +} + template bool Graph::isMarked(const T &value) const { @@ -216,9 +246,34 @@ bool Graph::isMarked(const T &value) const } } +template +const T * Graph::getFirstMarked(const bool isMarked) const +{ + auto pred = [&isMarked](const std::pair &v) + { + return (v.second == isMarked); + }; + auto vIt = std::find_if(isMarked_.begin(), isMarked_.end(), pred); + + if (vIt != isMarked_.end()) + { + return &(vIt->first); + } + else + { + return nullptr; + } +} + +template +const T * Graph::getFirstUnmarked(void) const +{ + return getFirstMarked(false); +} + // prune marked/unmarked vertices ////////////////////////////////////////////// template -void Graph::removedMarked(const bool isMarked) +void Graph::removeMarked(const bool isMarked) { auto isMarkedCopy = isMarked_; @@ -232,9 +287,9 @@ void Graph::removedMarked(const bool isMarked) } template -void Graph::removedUnmarked(void) +void Graph::removeUnmarked(void) { - removedMarked(false); + removeMarked(false); } // depth-first search marking ////////////////////////////////////////////////// @@ -288,10 +343,128 @@ std::vector Graph::getAdjacentVertices(const T &value) const return adjacentVertex; } +template +std::vector Graph::getChildren(const T &value) const +{ + std::vector child; + + auto pred = [&value](const Edge &e) + { + return (e.first == value); + }; + auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + + while (eIt != edgeSet_.end()) + { + child.push_back((*eIt).second); + eIt = find_if(++eIt, edgeSet_.end(), pred); + } + + return child; +} + +template +std::vector Graph::getParents(const T &value) const +{ + std::vector parent; + + auto pred = [&value](const Edge &e) + { + return (e.second == value); + }; + auto eIt = find_if(edgeSet_.begin(), edgeSet_.end(), pred); + + while (eIt != edgeSet_.end()) + { + parent.push_back((*eIt).first); + eIt = find_if(++eIt, edgeSet_.end(), pred); + } + + return parent; +} + +template +std::vector Graph::getRoots(void) const +{ + std::vector root; + + for (auto &v: isMarked_) + { + auto parent = getParents(v.first); + + if (parent.size() == 0) + { + root.push_back(v.first); + } + } + + return root; +} + template std::vector> Graph::getConnectedComponents(void) const { + std::vector> res; + Graph copy(*this); + while (copy.size() > 0) + { + copy.depthFirstSearch(); + res.push_back(copy); + res.back().removeUnmarked(); + res.back().unmarkAll(); + copy.removeMarked(); + copy.unmarkAll(); + } + + return res; +} + +// topological sort using Kahn's algorithm +template +std::stack Graph::topoSort(void) +{ + std::stack res; + const T *vPt; + std::map tmpMarked(isMarked_); + + // visit function + std::function visit = [&](const T &v) + { + if (tmpMarked.at(v)) + { + HADRON_ERROR("cannot topologically sort a cyclic graph"); + } + if (!this->isMarked(v)) + { + std::vector child = this->getChildren(v); + + tmpMarked[v] = true; + for (auto &c: child) + { + visit(c); + } + this->mark(v); + tmpMarked[v] = false; + res.push(v); + } + }; + + // reset temporary marks + for (auto &v: tmpMarked) + { + tmpMarked.at(v.first) = false; + } + // loop on unmarked vertices + vPt = getFirstUnmarked(); + while (vPt) + { + visit(*vPt); + vPt = getFirstUnmarked(); + } + unmarkAll(); + + return res; } END_HADRONS_NAMESPACE From bb195607ab067a8ad26e3138282111d737050205 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 2 Dec 2015 19:40:11 +0000 Subject: [PATCH 004/807] Hadrons: fix in topological sort algorithm name --- programs/Hadrons/Graph.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index e96c22b9..15eba21a 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -420,7 +420,7 @@ std::vector> Graph::getConnectedComponents(void) const return res; } -// topological sort using Kahn's algorithm +// topological sort using Tarjan's algorithm template std::stack Graph::topoSort(void) { From 20ce7e0270d982fd6d11171f21a72a916795546c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 7 Dec 2015 15:46:36 +0000 Subject: [PATCH 005/807] Hadrons: algorithm to determine all possible topological ordering --- programs/Hadrons/Application.cc | 15 +++-- programs/Hadrons/Graph.hpp | 113 ++++++++++++++++++++++++++++---- 2 files changed, 111 insertions(+), 17 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 923bd0eb..8f132056 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -59,6 +59,8 @@ void Application::run(void) g.addEdge("A", "B"); g.addEdge("B", "D"); + g.addEdge("B", "X1"); + g.addEdge("X1", "X2"); g.addEdge("D", "E"); g.addEdge("E", "C"); g.addEdge("Z", "Y"); @@ -75,13 +77,16 @@ void Application::run(void) } for (auto &h: vec) { - auto top = h.topoSort(); - while (!top.empty()) + auto top = h.allTopoSort(); + for (auto &s: top) { - cout << top.top() << " "; - top.pop(); + for (auto &v: s) + { + cout << v << " "; + } + cout << endl; } - cout << endl; + cout << "--------" << endl; } } diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 15eba21a..14077ed0 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -58,12 +58,13 @@ public: // tests bool gotValue(const T &value) const; // graph topological manipulations - std::vector getAdjacentVertices(const T &value) const; - std::vector getChildren(const T &value) const; - std::vector getParents(const T &value) const; - std::vector getRoots(void) const; - std::vector> getConnectedComponents(void) const; - std::stack topoSort(void); + std::vector getAdjacentVertices(const T &value) const; + std::vector getChildren(const T &value) const; + std::vector getParents(const T &value) const; + std::vector getRoots(void) const; + std::vector> getConnectedComponents(void) const; + std::vector topoSort(void); + std::vector> allTopoSort(void); // I/O friend std::ostream & operator<<(std::ostream &out, const Graph &g) { @@ -96,8 +97,8 @@ private: void depthFirstSearch(void); void depthFirstSearch(const T &root); private: - std::map isMarked_; - std::set edgeSet_; + std::map isMarked_; + std::set edgeSet_; }; /****************************************************************************** @@ -422,12 +423,13 @@ std::vector> Graph::getConnectedComponents(void) const // topological sort using Tarjan's algorithm template -std::stack Graph::topoSort(void) +std::vector Graph::topoSort(void) { - std::stack res; + std::stack buf; + std::vector res; const T *vPt; std::map tmpMarked(isMarked_); - + // visit function std::function visit = [&](const T &v) { @@ -446,7 +448,7 @@ std::stack Graph::topoSort(void) } this->mark(v); tmpMarked[v] = false; - res.push(v); + buf.push(v); } }; @@ -455,6 +457,7 @@ std::stack Graph::topoSort(void) { tmpMarked.at(v.first) = false; } + // loop on unmarked vertices vPt = getFirstUnmarked(); while (vPt) @@ -464,6 +467,92 @@ std::stack Graph::topoSort(void) } unmarkAll(); + // create result vector + while (!buf.empty()) + { + res.push_back(buf.top()); + buf.pop(); + } + + return res; +} + +// generate all possible topological sorts +// Y. L. Varol & D. Rotem, Comput. J. 24(1), pp. 83–84, 1981 +// http://comjnl.oupjournals.org/cgi/doi/10.1093/comjnl/24.1.83 +template +std::vector> Graph::allTopoSort(void) +{ + std::vector> res; + std::map> iMat; + + // create incidence matrix + for (auto &v1: isMarked_) + for (auto &v2: isMarked_) + { + iMat[v1.first][v2.first] = false; + } + for (auto &v: isMarked_) + { + auto cVec = getChildren(v.first); + + for (auto &c: cVec) + { + iMat[v.first][c] = true; + } + } + + // generate initial topological sort + res.push_back(topoSort()); + + // generate all other topological sorts by permutation + std::vector p = res[0]; + const unsigned int n = size(); + std::vector loc(n); + unsigned int i, k, k1; + T obj_k, obj_k1; + bool isFinal; + + for (unsigned int j = 0; j < n; ++j) + { + loc[j] = j; + } + i = 0; + while (i < n-1) + { + k = loc[i]; + k1 = k + 1; + obj_k = p[k]; + if (k1 >= n) + { + isFinal = true; + obj_k1 = obj_k; + } + else + { + isFinal = false; + obj_k1 = p[k1]; + } + if (iMat[res[0][i]][obj_k1] or isFinal) + { + for (unsigned int l = k; l >= i + 1; --l) + { + p[l] = p[l-1]; + } + p[i] = obj_k; + loc[i] = i; + i++; + } + else + { + p[k] = obj_k1; + p[k1] = obj_k; + loc[i] = k1; + i = 0; + res.push_back(p); + } + } + return res; } From d4db009a5804a28a1ec9dac15f888d131cc8c34d Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 7 Dec 2015 18:26:38 +0000 Subject: [PATCH 006/807] Hadrons: starting scheduler implementation --- programs/Hadrons/Application.cc | 79 ++++++++++++++++++------------- programs/Hadrons/Application.hpp | 4 ++ programs/Hadrons/Graph.hpp | 32 +++++++++++++ programs/Hadrons/InputObjects.hpp | 60 +++++++++++++++++++++++ 4 files changed, 142 insertions(+), 33 deletions(-) create mode 100644 programs/Hadrons/InputObjects.hpp diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 8f132056..f0e6f6a4 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -55,43 +55,56 @@ Application::~Application(void) // execute ///////////////////////////////////////////////////////////////////// void Application::run(void) { - Graph g; - - g.addEdge("A", "B"); - g.addEdge("B", "D"); - g.addEdge("B", "X1"); - g.addEdge("X1", "X2"); - g.addEdge("D", "E"); - g.addEdge("E", "C"); - g.addEdge("Z", "Y"); - g.addEdge("Z", "W"); - g.addEdge("Z", "R"); - g.addEdge("W", "R"); - g.addEdge("U", "I"); - - cout << g << endl; - auto vec = g.getConnectedComponents(); - for (auto &h: vec) - { - cout << h << endl; - } - for (auto &h: vec) - { - auto top = h.allTopoSort(); - for (auto &s: top) - { - for (auto &v: s) - { - cout << v << " "; - } - cout << endl; - } - cout << "--------" << endl; - } + parseParameterFile(); + schedule(); } // parse parameter file //////////////////////////////////////////////////////// void Application::parseParameterFile(void) { + XmlReader reader(parameterFileName_); + LOG(Message) << "Reading '" << parameterFileName_ << "'..." << endl; + read(reader, "parameters", parameters_); +} + +// schedule computation //////////////////////////////////////////////////////// +void Application::schedule(void) +{ + Graph moduleGraph; + + LOG(Message) << "Scheduling computation..." << endl; + for (auto &m: parameters_.modules) + { + for (auto &p: m.in) + { + moduleGraph.addEdge(p, m.name); + } + } + + vector> con = moduleGraph.getConnectedComponents(); + + LOG(Message) << "Program:" << endl; + LOG(Message) << " #segments: " << con.size() << endl; + for (unsigned int i = 0; i < con.size(); ++i) + { + vector> t = con[i].allTopoSort(); + auto m = makeDependencyMatrix(t); + + for (auto &v: t[0]) + { + cout << v << " "; + } + cout << endl; + for (auto &v1: t[0]) + { + for (auto &v2: t[0]) + { + cout << m[v1][v2] << " "; + } + cout << endl; + } + + LOG(Message) << " segment " << i << ":" << endl; + } } diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index deb1160f..670c644e 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -21,6 +21,7 @@ #define Hadrons_Application_hpp_ #include +#include BEGIN_HADRONS_NAMESPACE @@ -39,8 +40,11 @@ public: private: // parse parameter file void parseParameterFile(void); + // schedule computation + void schedule(void); private: std::string parameterFileName_; + Parameters parameters_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 14077ed0..a2747c1a 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -101,6 +101,11 @@ private: std::set edgeSet_; }; +// build depedency matrix from topological sorts +template +std::map> +makeDependencyMatrix(const std::vector> &topSort); + /****************************************************************************** * template implementation * ******************************************************************************/ @@ -556,6 +561,33 @@ std::vector> Graph::allTopoSort(void) return res; } +// build depedency matrix from topological sorts /////////////////////////////// +template +std::map> +makeDependencyMatrix(const std::vector> &topSort) +{ + std::map> m; + const std::vector &vList = topSort[0]; + + for (auto &v1: vList) + for (auto &v2: vList) + { + bool dep = true; + + for (auto &t: topSort) + { + auto i1 = std::find(t.begin(), t.end(), v1); + auto i2 = std::find(t.begin(), t.end(), v2); + + dep = dep and (i1 - i2 > 0); + if (!dep) break; + } + m[v1][v2] = dep; + } + + return m; +} + END_HADRONS_NAMESPACE #endif // Hadrons_Graph_hpp_ diff --git a/programs/Hadrons/InputObjects.hpp b/programs/Hadrons/InputObjects.hpp new file mode 100644 index 00000000..d18615fa --- /dev/null +++ b/programs/Hadrons/InputObjects.hpp @@ -0,0 +1,60 @@ +/* + * InputObjects.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_InputObjects_hpp_ +#define Hadrons_InputObjects_hpp_ + +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Serializable input classes * + ******************************************************************************/ +class Module: Serializable +{ +public: + // constructor + Module(void) = default; + // destructor + virtual ~Module(void) = default; + // serializable members + GRID_DECL_CLASS_MEMBERS(Module, + std::string , name, + std::vector, in + ); +}; + +class Parameters: Serializable +{ +public: + // constructor + Parameters(void) = default; + // destructor + virtual ~Parameters(void) = default; + // serializable members + GRID_DECL_CLASS_MEMBERS(Parameters, + std::vector, latticeSize, + std::vector , modules + ); +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_InputObjects_hpp_ From 76c78f04e232b9daba647cd30fc8781413cc5178 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 23 Dec 2015 14:21:35 +0000 Subject: [PATCH 007/807] Hadrons: first complete prototype for run loop --- programs/Hadrons/Application.cc | 101 ++++++++++++++---- programs/Hadrons/Application.hpp | 46 +++++++- programs/Hadrons/CMeson.cc | 65 +++++++++++ programs/Hadrons/CMeson.hpp | 65 +++++++++++ programs/Hadrons/Environment.cc | 1 + programs/Hadrons/Environment.hpp | 8 +- programs/Hadrons/Global.hpp | 13 +++ programs/Hadrons/MQuark.cc | 63 +++++++++++ .../Hadrons/{InputObjects.hpp => MQuark.hpp} | 54 +++++----- programs/Hadrons/Makefile.am | 13 ++- programs/Hadrons/Module.cc | 38 +++++++ programs/Hadrons/Module.hpp | 72 +++++++++++++ programs/Hadrons/ModuleFactory.cc | 70 ++++++++++++ programs/Hadrons/ModuleFactory.hpp | 51 +++++++++ 14 files changed, 600 insertions(+), 60 deletions(-) create mode 100644 programs/Hadrons/CMeson.cc create mode 100644 programs/Hadrons/CMeson.hpp create mode 100644 programs/Hadrons/MQuark.cc rename programs/Hadrons/{InputObjects.hpp => MQuark.hpp} (52%) create mode 100644 programs/Hadrons/Module.cc create mode 100644 programs/Hadrons/Module.hpp create mode 100644 programs/Hadrons/ModuleFactory.cc create mode 100644 programs/Hadrons/ModuleFactory.hpp diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index f0e6f6a4..c21dba5d 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -29,6 +29,8 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Application::Application(int argc, char *argv[]) +: env_(Environment::getInstance()) +, modFactory_(ModuleFactory::getInstance()) { if (argc < 2) { @@ -43,6 +45,12 @@ Application::Application(int argc, char *argv[]) HadronsLogMessage.Active(GridLogMessage.isActive()); HadronsLogDebug.Active(GridLogDebug.isActive()); LOG(Message) << "Grid initialized" << endl; + LOG(Message) << "Modules available:" << endl; + auto list = modFactory_.getModuleList(); + for (auto &m: list) + { + LOG(Message) << " " << m << endl; + } } // destructor ////////////////////////////////////////////////////////////////// @@ -57,15 +65,40 @@ void Application::run(void) { parseParameterFile(); schedule(); + configLoop(); } // parse parameter file //////////////////////////////////////////////////////// +class ModuleId: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(ModuleId, + std::string, name, + std::string, type); +}; + void Application::parseParameterFile(void) { XmlReader reader(parameterFileName_); + ModuleId id; LOG(Message) << "Reading '" << parameterFileName_ << "'..." << endl; - read(reader, "parameters", parameters_); + read(reader, "parameters", par_); + push(reader, "modules"); + push(reader, "module"); + do + { + read(reader, "id", id); + module_[id.name] = modFactory_.create(id.type, id.name); + module_[id.name]->parseParameters(reader, "options"); + vector output = module_[id.name]->getOutput(); + for (auto &n: output) + { + associatedModule_[n] = id.name; + } + } while (reader.nextElement("module")); + pop(reader); + pop(reader); } // schedule computation //////////////////////////////////////////////////////// @@ -74,37 +107,63 @@ void Application::schedule(void) Graph moduleGraph; LOG(Message) << "Scheduling computation..." << endl; - for (auto &m: parameters_.modules) + + // create dependency graph + for (auto &m: module_) { - for (auto &p: m.in) + vector input = m.second->getInput(); + for (auto &n: input) { - moduleGraph.addEdge(p, m.name); + try + { + moduleGraph.addEdge(associatedModule_.at(n), m.first); + } + catch (out_of_range &) + { + HADRON_ERROR("unknown object '" + n + "'"); + } } } - vector> con = moduleGraph.getConnectedComponents(); + // topological sort + map> m; + unsigned int k = 0; + vector> con = moduleGraph.getConnectedComponents(); LOG(Message) << "Program:" << endl; - LOG(Message) << " #segments: " << con.size() << endl; for (unsigned int i = 0; i < con.size(); ++i) { vector> t = con[i].allTopoSort(); - auto m = makeDependencyMatrix(t); - - for (auto &v: t[0]) + + m = makeDependencyMatrix(t); + for (unsigned int j = 0; j < t[0].size(); ++j) { - cout << v << " "; + program_.push_back(t[0][j]); + LOG(Message) << setw(4) << right << k << ": " + << program_[k] << endl; + k++; } - cout << endl; - for (auto &v1: t[0]) - { - for (auto &v2: t[0]) - { - cout << m[v1][v2] << " "; - } - cout << endl; - } - - LOG(Message) << " segment " << i << ":" << endl; + } +} + +// program execution /////////////////////////////////////////////////////////// +void Application::configLoop(void) +{ + auto range = par_.configs.range; + + for (unsigned int t = range.start; t < range.end; t += range.step) + { + LOG(Message) << "Starting measurement for trajectory " << t << endl; + execute(); + } +} + +void Application::execute(void) +{ + for (unsigned int i = 0; i < program_.size(); ++i) + { + LOG(Message) << "Measurement step (" << i+1 << "/" << program_.size() + << ")" << endl; + (*module_[program_[i]])(env_); } } diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 670c644e..71cc0a80 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -21,15 +21,47 @@ #define Hadrons_Application_hpp_ #include -#include +#include +#include + +namespace Grid { + GRID_SERIALIZABLE_ENUM(ConfigType, undef, load, 1, unit, 2, gen, 3); +} BEGIN_HADRONS_NAMESPACE +class TrajRange: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(TrajRange, + unsigned int, start, + unsigned int, end, + unsigned int, step); +}; + +class ConfigPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(ConfigPar, + std::string, ioStem, + TrajRange, range); +}; + +class GlobalPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, + std::vector, latticeSize, + ConfigPar, configs); +}; + /****************************************************************************** * Main program manager * ******************************************************************************/ class Application { +public: + public: // constructor Application(int argc, char *argv[]); @@ -42,9 +74,17 @@ private: void parseParameterFile(void); // schedule computation void schedule(void); + // program execution + void configLoop(void); + void execute(void); private: - std::string parameterFileName_; - Parameters parameters_; + std::string parameterFileName_; + GlobalPar par_; + Environment &env_; + ModuleFactory &modFactory_; + std::map> module_; + std::map associatedModule_; + std::vector program_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc new file mode 100644 index 00000000..d9fe3547 --- /dev/null +++ b/programs/Hadrons/CMeson.cc @@ -0,0 +1,65 @@ +/* + * CMeson.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** + * CMeson implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +CMeson::CMeson(const string &name) +: Module(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void CMeson::parseParameters(XmlReader &reader, const std::string &name) +{ + read(reader, name, par_); +} + +// dependency relation ///////////////////////////////////////////////////////// +vector CMeson::getInput(void) +{ + vector input = {par_.q1, par_.q2}; + + return input; +} + +vector CMeson::getOutput(void) +{ + vector output = {getName()}; + + return output; +} + +// memory footprint //////////////////////////////////////////////////////////// +double CMeson::nCreatedProp(void) +{ + return 0.; +} + +// execution /////////////////////////////////////////////////////////////////// +void CMeson::operator()(Environment &env) +{ + LOG(Message) << "computing meson contraction '" << getName() << "'" << endl; +} diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp new file mode 100644 index 00000000..7f13ce9a --- /dev/null +++ b/programs/Hadrons/CMeson.hpp @@ -0,0 +1,65 @@ +/* + * CMeson.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_CMeson_hpp_ +#define Hadrons_CMeson_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * CMeson * + ******************************************************************************/ +class CMeson: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, + std::string, q1, + std::string, q2, + std::string, output); + }; +public: + // constructor + CMeson(const std::string &name); + // destructor + virtual ~CMeson(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string &name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // memory footprint + virtual double nCreatedProp(void); + // execution + virtual void operator()(Environment &env); +private: + Par par_; +}; + +MODULE_REGISTER(CMeson); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_CMeson_hpp_ diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index bf95b175..66dd540e 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -29,3 +29,4 @@ using namespace Hadrons; // constructor ///////////////////////////////////////////////////////////////// Environment::Environment(void) {} + diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 205f0aa0..62da9839 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -21,21 +21,15 @@ #define Hadrons_Environment_hpp_ #include -#include BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Global environment * ******************************************************************************/ -// TODO: make it a singleton class Environment { -public: - // constructor - Environment(void); - // destructor - virtual ~Environment(void) = default; + SINGLETON(Environment); }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 3b90b7ed..2294adef 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -49,6 +49,19 @@ extern HadronsLogger HadronsLogWarning; extern HadronsLogger HadronsLogMessage; extern HadronsLogger HadronsLogDebug; +// singleton pattern +#define SINGLETON(name)\ +public:\ + name(const name &e) = delete;\ + void operator=(const name &e) = delete;\ + static name & getInstance(void)\ + {\ + static name e;\ + return e;\ + }\ +private:\ + name(void); + END_HADRONS_NAMESPACE #endif // Hadrons_Global_hpp_ diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc new file mode 100644 index 00000000..82c46c52 --- /dev/null +++ b/programs/Hadrons/MQuark.cc @@ -0,0 +1,63 @@ +/* + * MQuark.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** + * MQuark implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +MQuark::MQuark(const std::string &name) +: Module(name) +{} + +// parse parameters +void MQuark::parseParameters(XmlReader &reader, const std::string &name) +{ + read(reader, name, par_); +} + +// dependency relation +vector MQuark::getInput(void) +{ + return vector(); +} + +vector MQuark::getOutput(void) +{ + vector out = {getName(), getName() + "_5d"}; + + return out; +} + +// memory footprint +double MQuark::nCreatedProp(void) +{ + return static_cast((par_.Ls > 1) ? par_.Ls + 1 : 1); +} + +// execution +void MQuark::operator()(Environment &env) +{ + LOG(Message) << "computing quark propagator '" << getName() << "'" << endl; +} diff --git a/programs/Hadrons/InputObjects.hpp b/programs/Hadrons/MQuark.hpp similarity index 52% rename from programs/Hadrons/InputObjects.hpp rename to programs/Hadrons/MQuark.hpp index d18615fa..ae1efa12 100644 --- a/programs/Hadrons/InputObjects.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -1,5 +1,5 @@ /* - * InputObjects.hpp, part of Grid + * MQuark.hpp, part of Grid * * Copyright (C) 2015 Antonin Portelli * @@ -17,44 +17,46 @@ * along with Grid. If not, see . */ -#ifndef Hadrons_InputObjects_hpp_ -#define Hadrons_InputObjects_hpp_ +#ifndef Hadrons_MQuark_hpp_ +#define Hadrons_MQuark_hpp_ #include +#include +#include BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * Serializable input classes * + * MQuark * ******************************************************************************/ -class Module: Serializable +class MQuark: public Module { +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, unsigned int, Ls); + }; public: // constructor - Module(void) = default; + MQuark(const std::string &name); // destructor - virtual ~Module(void) = default; - // serializable members - GRID_DECL_CLASS_MEMBERS(Module, - std::string , name, - std::vector, in - ); + virtual ~MQuark(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string &name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // memory footprint + virtual double nCreatedProp(void); + // execution + virtual void operator()(Environment &env); +private: + Par par_; }; -class Parameters: Serializable -{ -public: - // constructor - Parameters(void) = default; - // destructor - virtual ~Parameters(void) = default; - // serializable members - GRID_DECL_CLASS_MEMBERS(Parameters, - std::vector, latticeSize, - std::vector , modules - ); -}; +MODULE_REGISTER(MQuark); END_HADRONS_NAMESPACE -#endif // Hadrons_InputObjects_hpp_ +#endif // Hadrons_MQuark_hpp_ diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 870b0747..b907f8c8 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -5,9 +5,16 @@ bin_PROGRAMS = Hadrons Hadrons_SOURCES = \ Application.cc \ - Application.hpp \ - Global.hpp \ + Environment.cc \ Global.cc \ - Hadrons.cc + Hadrons.cc \ + Module.cc \ + ModuleFactory.cc + +Hadrons_SOURCES += \ + MQuark.cc + +Hadrons_SOURCES += \ + CMeson.cc Hadrons_LDADD = -lGrid diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc new file mode 100644 index 00000000..be689867 --- /dev/null +++ b/programs/Hadrons/Module.cc @@ -0,0 +1,38 @@ +/* + * Module.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** + * Module implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +Module::Module(const string &name) +: name_(name) +{} + +// access ////////////////////////////////////////////////////////////////////// +string Module::getName(void) const +{ + return name_; +} diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp new file mode 100644 index 00000000..bf82a9e7 --- /dev/null +++ b/programs/Hadrons/Module.hpp @@ -0,0 +1,72 @@ +/* + * Module.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_Module_hpp_ +#define Hadrons_Module_hpp_ + +#include + +BEGIN_HADRONS_NAMESPACE + +// module registration macro +#define MODULE_REGISTER(mod)\ +class mod##Registrar\ +{\ +public:\ + mod##Registrar(void)\ + {\ + ModuleFactory &modFac = ModuleFactory::getInstance();\ + modFac.registerModule(#mod, [&](const std::string &name)\ + {\ + return std::unique_ptr(new mod(name));\ + });\ + }\ +};\ +static mod##Registrar mod##RegistrarInstance; + +/****************************************************************************** + * Module * + ******************************************************************************/ +class Environment; + +class Module +{ +public: + // constructor + Module(const std::string &name); + // destructor + virtual ~Module(void) = default; + // access + std::string getName(void) const; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string &name) = 0; + // dependency relation + virtual std::vector getInput(void) = 0; + virtual std::vector getOutput(void) = 0; + // memory footprint + virtual double nCreatedProp(void) = 0; + // execution + virtual void operator()(Environment &env) = 0; +private: + std::string name_; +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Module_hpp_ diff --git a/programs/Hadrons/ModuleFactory.cc b/programs/Hadrons/ModuleFactory.cc new file mode 100644 index 00000000..2a87da3a --- /dev/null +++ b/programs/Hadrons/ModuleFactory.cc @@ -0,0 +1,70 @@ +/* + * ModuleFactory.cc, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#include + +using namespace std; +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** + * ModuleFactory implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +ModuleFactory::ModuleFactory(void) +{ +} + +// registration //////////////////////////////////////////////////////////////// +void ModuleFactory::registerModule(const std::string &type, + const FactoryFunc &f) +{ + factory_[type] = f; +} + +// get module list ///////////////////////////////////////////////////////////// +std::vector ModuleFactory::getModuleList(void) const +{ + std::vector list; + + for (auto &f: factory_) + { + list.push_back(f.first); + } + + return list; +} + +// factory ///////////////////////////////////////////////////////////////////// +unique_ptr ModuleFactory::create(const string &type, + const string &name) const +{ + FactoryFunc func; + + try + { + func = factory_.at(type); + } + catch (out_of_range) + { + HADRON_ERROR("module type '" + type + "' unknown"); + } + + return func(name); +} diff --git a/programs/Hadrons/ModuleFactory.hpp b/programs/Hadrons/ModuleFactory.hpp new file mode 100644 index 00000000..822dc8e7 --- /dev/null +++ b/programs/Hadrons/ModuleFactory.hpp @@ -0,0 +1,51 @@ +/* + * ModuleFactory.hpp, part of Grid + * + * Copyright (C) 2015 Antonin Portelli + * + * Grid is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Grid is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Grid. If not, see . + */ + +#ifndef Hadrons_ModuleFactory_hpp_ +#define Hadrons_ModuleFactory_hpp_ + +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * ModuleFactory * + ******************************************************************************/ +class ModuleFactory +{ + SINGLETON(ModuleFactory) +public: + typedef std::function(const std::string &)> + FactoryFunc; +public: + // registration + void registerModule(const std::string &type, const FactoryFunc &f); + // get module list + std::vector getModuleList(void) const; + // factory + std::unique_ptr create(const std::string &type, + const std::string &name) const; +private: + std::map factory_; +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_ModuleFactory_hpp_ From 54eacec2614d0059d50072e21df8978ed37cc6d6 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 23 Dec 2015 14:30:33 +0000 Subject: [PATCH 008/807] Hadrons: namespace std not used anymore in compiled sources --- programs/Hadrons/Application.cc | 46 +++++++++++++++---------------- programs/Hadrons/CMeson.cc | 14 +++++----- programs/Hadrons/Environment.cc | 1 - programs/Hadrons/Global.cc | 1 - programs/Hadrons/Hadrons.cc | 1 - programs/Hadrons/MQuark.cc | 12 ++++---- programs/Hadrons/Module.cc | 5 ++-- programs/Hadrons/ModuleFactory.cc | 7 ++--- 8 files changed, 41 insertions(+), 46 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index c21dba5d..21184667 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -20,7 +20,6 @@ #include #include -using namespace std; using namespace Grid; using namespace Hadrons; @@ -34,9 +33,9 @@ Application::Application(int argc, char *argv[]) { if (argc < 2) { - cerr << "usage: " << argv[0] << " [Grid options]"; - cerr << endl; - exit(EXIT_FAILURE); + std::cerr << "usage: " << argv[0] << " [Grid options]"; + std::cerr << std::endl; + std::exit(EXIT_FAILURE); } parameterFileName_ = argv[1]; Grid_init(&argc, &argv); @@ -44,19 +43,19 @@ Application::Application(int argc, char *argv[]) HadronsLogWarning.Active(GridLogWarning.isActive()); HadronsLogMessage.Active(GridLogMessage.isActive()); HadronsLogDebug.Active(GridLogDebug.isActive()); - LOG(Message) << "Grid initialized" << endl; - LOG(Message) << "Modules available:" << endl; + LOG(Message) << "Grid initialized" << std::endl; + LOG(Message) << "Modules available:" << std::endl; auto list = modFactory_.getModuleList(); for (auto &m: list) { - LOG(Message) << " " << m << endl; + LOG(Message) << " " << m << std::endl; } } // destructor ////////////////////////////////////////////////////////////////// Application::~Application(void) { - LOG(Message) << "Grid is finalizing now" << endl; + LOG(Message) << "Grid is finalizing now" << std::endl; Grid_finalize(); } @@ -82,7 +81,7 @@ void Application::parseParameterFile(void) XmlReader reader(parameterFileName_); ModuleId id; - LOG(Message) << "Reading '" << parameterFileName_ << "'..." << endl; + LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl; read(reader, "parameters", par_); push(reader, "modules"); push(reader, "module"); @@ -91,7 +90,7 @@ void Application::parseParameterFile(void) read(reader, "id", id); module_[id.name] = modFactory_.create(id.type, id.name); module_[id.name]->parseParameters(reader, "options"); - vector output = module_[id.name]->getOutput(); + std::vector output = module_[id.name]->getOutput(); for (auto &n: output) { associatedModule_[n] = id.name; @@ -104,21 +103,21 @@ void Application::parseParameterFile(void) // schedule computation //////////////////////////////////////////////////////// void Application::schedule(void) { - Graph moduleGraph; + Graph moduleGraph; - LOG(Message) << "Scheduling computation..." << endl; + LOG(Message) << "Scheduling computation..." << std::endl; // create dependency graph for (auto &m: module_) { - vector input = m.second->getInput(); + std::vector input = m.second->getInput(); for (auto &n: input) { try { moduleGraph.addEdge(associatedModule_.at(n), m.first); } - catch (out_of_range &) + catch (std::out_of_range &) { HADRON_ERROR("unknown object '" + n + "'"); } @@ -126,21 +125,21 @@ void Application::schedule(void) } // topological sort - map> m; - unsigned int k = 0; + std::map> m; + unsigned int k = 0; - vector> con = moduleGraph.getConnectedComponents(); - LOG(Message) << "Program:" << endl; + std::vector> con = moduleGraph.getConnectedComponents(); + LOG(Message) << "Program:" << std::endl; for (unsigned int i = 0; i < con.size(); ++i) { - vector> t = con[i].allTopoSort(); + std::vector> t = con[i].allTopoSort(); m = makeDependencyMatrix(t); for (unsigned int j = 0; j < t[0].size(); ++j) { program_.push_back(t[0][j]); - LOG(Message) << setw(4) << right << k << ": " - << program_[k] << endl; + LOG(Message) << std::setw(4) << std::right << k << ": " + << program_[k] << std::endl; k++; } } @@ -153,7 +152,8 @@ void Application::configLoop(void) for (unsigned int t = range.start; t < range.end; t += range.step) { - LOG(Message) << "Starting measurement for trajectory " << t << endl; + LOG(Message) << "Starting measurement for trajectory " << t + << std::endl; execute(); } } @@ -163,7 +163,7 @@ void Application::execute(void) for (unsigned int i = 0; i < program_.size(); ++i) { LOG(Message) << "Measurement step (" << i+1 << "/" << program_.size() - << ")" << endl; + << ")" << std::endl; (*module_[program_[i]])(env_); } } diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index d9fe3547..32febc13 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Grid; using namespace Hadrons; @@ -27,7 +26,7 @@ using namespace Hadrons; * CMeson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -CMeson::CMeson(const string &name) +CMeson::CMeson(const std::string &name) : Module(name) {} @@ -38,16 +37,16 @@ void CMeson::parseParameters(XmlReader &reader, const std::string &name) } // dependency relation ///////////////////////////////////////////////////////// -vector CMeson::getInput(void) +std::vector CMeson::getInput(void) { - vector input = {par_.q1, par_.q2}; + std::vector input = {par_.q1, par_.q2}; return input; } -vector CMeson::getOutput(void) +std::vector CMeson::getOutput(void) { - vector output = {getName()}; + std::vector output = {getName()}; return output; } @@ -61,5 +60,6 @@ double CMeson::nCreatedProp(void) // execution /////////////////////////////////////////////////////////////////// void CMeson::operator()(Environment &env) { - LOG(Message) << "computing meson contraction '" << getName() << "'" << endl; + LOG(Message) << "computing meson contraction '" << getName() << "'" + << std::endl; } diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 66dd540e..391f0c04 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index aea2f7c1..a560d71f 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Grid; using namespace Hadrons; diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index 6788c237..00da4a76 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Hadrons; int main(int argc, char *argv[]) diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index 82c46c52..2cc27311 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Grid; using namespace Hadrons; @@ -38,14 +37,14 @@ void MQuark::parseParameters(XmlReader &reader, const std::string &name) } // dependency relation -vector MQuark::getInput(void) +std::vector MQuark::getInput(void) { - return vector(); + return std::vector(); } -vector MQuark::getOutput(void) +std::vector MQuark::getOutput(void) { - vector out = {getName(), getName() + "_5d"}; + std::vector out = {getName(), getName() + "_5d"}; return out; } @@ -59,5 +58,6 @@ double MQuark::nCreatedProp(void) // execution void MQuark::operator()(Environment &env) { - LOG(Message) << "computing quark propagator '" << getName() << "'" << endl; + LOG(Message) << "computing quark propagator '" << getName() << "'" + << std::endl; } diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index be689867..5267449c 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Grid; using namespace Hadrons; @@ -27,12 +26,12 @@ using namespace Hadrons; * Module implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Module::Module(const string &name) +Module::Module(const std::string &name) : name_(name) {} // access ////////////////////////////////////////////////////////////////////// -string Module::getName(void) const +std::string Module::getName(void) const { return name_; } diff --git a/programs/Hadrons/ModuleFactory.cc b/programs/Hadrons/ModuleFactory.cc index 2a87da3a..084d272d 100644 --- a/programs/Hadrons/ModuleFactory.cc +++ b/programs/Hadrons/ModuleFactory.cc @@ -19,7 +19,6 @@ #include -using namespace std; using namespace Grid; using namespace Hadrons; @@ -52,8 +51,8 @@ std::vector ModuleFactory::getModuleList(void) const } // factory ///////////////////////////////////////////////////////////////////// -unique_ptr ModuleFactory::create(const string &type, - const string &name) const +std::unique_ptr ModuleFactory::create(const std::string &type, + const std::string &name) const { FactoryFunc func; @@ -61,7 +60,7 @@ unique_ptr ModuleFactory::create(const string &type, { func = factory_.at(type); } - catch (out_of_range) + catch (std::out_of_range) { HADRON_ERROR("module type '" + type + "' unknown"); } From 30146e977c31327a328e328f59f78b888c0da55f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 13 Jan 2016 20:20:43 -0800 Subject: [PATCH 009/807] gitignore update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d40d0a86..ce2bf144 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,7 @@ Thumbs.db # build directory # ################### build/* +build_debug/* # IDE related files # ##################### From 17c43f49acecb40da3b137fb4800f4a0912b3f52 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 13 Jan 2016 20:22:37 -0800 Subject: [PATCH 010/807] Hadrons: application class now take parameter file name as argument --- programs/Hadrons/Application.cc | 18 +++--------------- programs/Hadrons/Application.hpp | 2 +- programs/Hadrons/Hadrons.cc | 20 +++++++++++++++++++- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 21184667..0fad9c1e 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -27,23 +27,11 @@ using namespace Hadrons; * Application implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Application::Application(int argc, char *argv[]) -: env_(Environment::getInstance()) +Application::Application(const std::string parameterFileName) +: parameterFileName_(parameterFileName) +, env_(Environment::getInstance()) , modFactory_(ModuleFactory::getInstance()) { - if (argc < 2) - { - std::cerr << "usage: " << argv[0] << " [Grid options]"; - std::cerr << std::endl; - std::exit(EXIT_FAILURE); - } - parameterFileName_ = argv[1]; - Grid_init(&argc, &argv); - HadronsLogError.Active(GridLogError.isActive()); - HadronsLogWarning.Active(GridLogWarning.isActive()); - HadronsLogMessage.Active(GridLogMessage.isActive()); - HadronsLogDebug.Active(GridLogDebug.isActive()); - LOG(Message) << "Grid initialized" << std::endl; LOG(Message) << "Modules available:" << std::endl; auto list = modFactory_.getModuleList(); for (auto &m: list) diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 71cc0a80..7b53af98 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -64,7 +64,7 @@ public: public: // constructor - Application(int argc, char *argv[]); + Application(const std::string parameterFileName); // destructor virtual ~Application(void); // execute diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index 00da4a76..853de83c 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -23,7 +23,25 @@ using namespace Hadrons; int main(int argc, char *argv[]) { - Application application(argc, argv); + // parse command line + std::string parameterFileName; + + if (argc < 2) + { + std::cerr << "usage: " << argv[0] << " [Grid options]"; + std::cerr << std::endl; + std::exit(EXIT_FAILURE); + } + parameterFileName = argv[1]; + Grid_init(&argc, &argv); + HadronsLogError.Active(GridLogError.isActive()); + HadronsLogWarning.Active(GridLogWarning.isActive()); + HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << std::endl; + + // execution + Application application(parameterFileName); application.run(); From ae682674e0dc1bae84c3a0e9c5225062e031267b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 13 Jan 2016 20:23:51 -0800 Subject: [PATCH 011/807] Hadrons: first full implementation of the scheduler --- programs/Hadrons/Application.cc | 63 ++++++++++++--- programs/Hadrons/Application.hpp | 22 +++--- programs/Hadrons/CMeson.cc | 8 +- programs/Hadrons/CMeson.hpp | 6 +- programs/Hadrons/Environment.cc | 130 ++++++++++++++++++++++++++++++- programs/Hadrons/Environment.hpp | 23 ++++++ programs/Hadrons/Global.hpp | 3 +- programs/Hadrons/Graph.hpp | 24 +++--- programs/Hadrons/MQuark.cc | 14 +++- programs/Hadrons/MQuark.hpp | 7 +- programs/Hadrons/Module.cc | 9 +++ programs/Hadrons/Module.hpp | 10 +-- 12 files changed, 264 insertions(+), 55 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 0fad9c1e..c8c44adc 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -83,6 +83,7 @@ void Application::parseParameterFile(void) { associatedModule_[n] = id.name; } + input_[id.name] = module_[id.name]->getInput(); } while (reader.nextElement("module")); pop(reader); pop(reader); @@ -113,19 +114,35 @@ void Application::schedule(void) } // topological sort - std::map> m; - unsigned int k = 0; + unsigned int k = 0; std::vector> con = moduleGraph.getConnectedComponents(); LOG(Message) << "Program:" << std::endl; for (unsigned int i = 0; i < con.size(); ++i) { std::vector> t = con[i].allTopoSort(); + int memPeak, minMemPeak = -1; + unsigned int bestInd; + bool msg; - m = makeDependencyMatrix(t); - for (unsigned int j = 0; j < t[0].size(); ++j) + env_.dryRun(true); + for (unsigned int p = 0; p < t.size(); ++p) { - program_.push_back(t[0][j]); + msg = HadronsLogMessage.isActive(); + HadronsLogMessage.Active(false); + memPeak = execute(t[p]); + if ((memPeak < minMemPeak) or (minMemPeak < 0)) + { + minMemPeak = memPeak; + bestInd = p; + } + HadronsLogMessage.Active(msg); + env_.freeAll(); + } + env_.dryRun(false); + for (unsigned int j = 0; j < t[bestInd].size(); ++j) + { + program_.push_back(t[bestInd][j]); LOG(Message) << std::setw(4) << std::right << k << ": " << program_[k] << std::endl; k++; @@ -142,16 +159,42 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; - execute(); + execute(program_); + env_.freeAll(); } } -void Application::execute(void) +unsigned int Application::execute(const std::vector &program) { - for (unsigned int i = 0; i < program_.size(); ++i) + unsigned int memPeak = 0; + + for (unsigned int i = 0; i < program.size(); ++i) { - LOG(Message) << "Measurement step (" << i+1 << "/" << program_.size() + LOG(Message) << "Measurement step (" << i+1 << "/" << program.size() << ")" << std::endl; - (*module_[program_[i]])(env_); + (*module_[program[i]])(env_); + LOG(Message) << "allocated propagators: " << env_.nProp() << std::endl; + if (env_.nProp() > memPeak) + { + memPeak = env_.nProp(); + } + for (auto &n: associatedModule_) + { + bool canFree = true; + + for (unsigned int j = i + 1; j < program.size(); ++j) + { + auto &in = input_[program[j]]; + auto it = std::find(in.begin(), in.end(), n.first); + canFree = canFree and (it == in.end()); + } + if (canFree and env_.propExists(n.first)) + { + LOG(Message) << "freeing '" << n.first << "'" << std::endl; + env_.free(n.first); + } + } } + + return memPeak; } diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 7b53af98..fd583fce 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -51,8 +51,7 @@ class GlobalPar: Serializable { public: GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, - std::vector, latticeSize, - ConfigPar, configs); + ConfigPar, configs); }; /****************************************************************************** @@ -75,16 +74,17 @@ private: // schedule computation void schedule(void); // program execution - void configLoop(void); - void execute(void); + void configLoop(void); + unsigned int execute(const std::vector &program); private: - std::string parameterFileName_; - GlobalPar par_; - Environment &env_; - ModuleFactory &modFactory_; - std::map> module_; - std::map associatedModule_; - std::vector program_; + std::string parameterFileName_; + GlobalPar par_; + Environment &env_; + ModuleFactory &modFactory_; + std::map> module_; + std::map associatedModule_; + std::map> input_; + std::vector program_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index 32febc13..e93cb18c 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -52,13 +52,11 @@ std::vector CMeson::getOutput(void) } // memory footprint //////////////////////////////////////////////////////////// -double CMeson::nCreatedProp(void) -{ - return 0.; -} +void CMeson::allocate(Environment &env) +{} // execution /////////////////////////////////////////////////////////////////// -void CMeson::operator()(Environment &env) +void CMeson::execute(Environment &env) { LOG(Message) << "computing meson contraction '" << getName() << "'" << std::endl; diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index 7f13ce9a..843ae00b 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -50,10 +50,10 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // memory footprint - virtual double nCreatedProp(void); + // allocation + virtual void allocate(Environment &env); // execution - virtual void operator()(Environment &env); + virtual void execute(Environment &env); private: Par par_; }; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 391f0c04..fb9052f0 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -20,6 +20,7 @@ #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** @@ -27,5 +28,132 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Environment::Environment(void) -{} +{ + grid4d_.reset(SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi())); +} +// dry run ///////////////////////////////////////////////////////////////////// +void Environment::dryRun(const bool isDry) +{ + dryRun_ = isDry; +} + +bool Environment::isDryRun(void) +{ + return dryRun_; +} + +// quark propagators /////////////////////////////////////////////////////////// +void Environment::addProp(const std::string name, const unsigned int Ls) +{ + if (propExists(name)) + { + HADRON_ERROR("propagator '" + name + "' already exists"); + } + if (Ls > 1) + { + GridCartesian *pt; + + try + { + pt = grid5d_.at(Ls).get(); + } + catch(std::out_of_range &) + { + grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, + grid4d_.get())); + pt = grid5d_[Ls].get(); + } + if (!isDryRun()) + { + prop_[name].reset(new LatticePropagator(pt)); + } + else + { + prop_[name].reset(nullptr); + } + propSize_[name] = Ls; + } + else + { + if (!isDryRun()) + { + prop_[name].reset(new LatticePropagator(grid4d_.get())); + } + else + { + prop_[name].reset(nullptr); + } + propSize_[name] = 1; + } +} + +void Environment::freeProp(const std::string name) +{ + if (propExists(name)) + { + prop_.erase(name); + propSize_.erase(name); + } + else + { + HADRON_ERROR("trying to free unknown propagator '" + name + "'"); + } +} + +LatticePropagator * Environment::getProp(const std::string name) +{ + if (propExists(name)) + { + return prop_[name].get(); + } + else + { + HADRON_ERROR("propagator '" + name + "' unknown"); + + return nullptr; + } +} + +bool Environment::propExists(const std::string name) +{ + auto it = prop_.find(name); + + if (it == prop_.end()) + { + return false; + } + else + { + return true; + } +} + +unsigned int Environment::nProp(void) +{ + unsigned int size = 0; + + for (auto &s: propSize_) + { + size += s.second; + } + + return size; +} + +// general free //////////////////////////////////////////////////////////////// +void Environment::free(const std::string name) +{ + if (propExists(name)) + { + freeProp(name); + } +} + +void Environment::freeAll(void) +{ + prop_.clear(); + propSize_.clear(); +} diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 62da9839..66576658 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -30,6 +30,29 @@ BEGIN_HADRONS_NAMESPACE class Environment { SINGLETON(Environment); +public: + typedef std::unique_ptr GridPt; + typedef std::unique_ptr PropPt; +public: + // dry run + void dryRun(const bool isDry); + bool isDryRun(void); + // quark propagators + void addProp(const std::string name, + const unsigned int Ls = 1); + void freeProp(const std::string name); + LatticePropagator * getProp(const std::string name); + bool propExists(const std::string name); + unsigned int nProp(void); + // general free + void free(const std::string name); + void freeAll(void); +private: + bool dryRun_{false}; + GridPt grid4d_; + std::map grid5d_; + std::map prop_; + std::map propSize_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 2294adef..693a9829 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -26,7 +26,8 @@ #define BEGIN_HADRONS_NAMESPACE \ namespace Hadrons {\ -using namespace Grid; +using namespace Grid;\ +using namespace QCD; #define END_HADRONS_NAMESPACE } BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index a2747c1a..7440975b 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -190,27 +190,27 @@ unsigned int Graph::size(void) const template bool Graph::gotValue(const T &value) const { - try - { - isMarked_.at(value); - } - catch (std::out_of_range &) + auto it = isMarked_.find(value); + + if (it == isMarked_.end()) { return false; } - - return true; + else + { + return true; + } } // vertex marking ////////////////////////////////////////////////////////////// template void Graph::mark(const T &value, const bool doMark) { - try + if (gotValue(value)) { - isMarked_.at(value) = doMark; + isMarked_[value] = doMark; } - catch (std::out_of_range &) + else { HADRON_ERROR("vertex " << value << " does not exists"); } @@ -240,11 +240,11 @@ void Graph::unmarkAll(void) template bool Graph::isMarked(const T &value) const { - try + if (gotValue(value)) { return isMarked_.at(value); } - catch (std::out_of_range &) + else { HADRON_ERROR("vertex " << value << " does not exists"); diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index 2cc27311..f2ae3ee9 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -49,14 +49,20 @@ std::vector MQuark::getOutput(void) return out; } -// memory footprint -double MQuark::nCreatedProp(void) +// allocation ////////////////////////////////////////////////////////////////// +void MQuark::allocate(Environment &env) { - return static_cast((par_.Ls > 1) ? par_.Ls + 1 : 1); + env.addProp(getName()); + quark_ = env.getProp(getName()); + if (par_.Ls > 1) + { + env.addProp(getName() + "_5d", par_.Ls); + quark5d_ = env.getProp(getName() + "_5d"); + } } // execution -void MQuark::operator()(Environment &env) +void MQuark::execute(Environment &env) { LOG(Message) << "computing quark propagator '" << getName() << "'" << std::endl; diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index ae1efa12..f5ab94fb 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -47,12 +47,13 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // memory footprint - virtual double nCreatedProp(void); + // allocation + virtual void allocate(Environment &env); // execution - virtual void operator()(Environment &env); + virtual void execute(Environment &env); private: Par par_; + LatticePropagator *quark_{nullptr}, *quark5d_{nullptr}; }; MODULE_REGISTER(MQuark); diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index 5267449c..a5809155 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -35,3 +35,12 @@ std::string Module::getName(void) const { return name_; } + +void Module::operator()(Environment &env) +{ + allocate(env); + if (!env.isDryRun()) + { + execute(env); + } +} diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index bf82a9e7..a8d3b40e 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -21,6 +21,7 @@ #define Hadrons_Module_hpp_ #include +#include BEGIN_HADRONS_NAMESPACE @@ -43,8 +44,6 @@ static mod##Registrar mod##RegistrarInstance; /****************************************************************************** * Module * ******************************************************************************/ -class Environment; - class Module { public: @@ -59,10 +58,11 @@ public: // dependency relation virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; - // memory footprint - virtual double nCreatedProp(void) = 0; + // allocation + virtual void allocate(Environment &env) = 0; // execution - virtual void operator()(Environment &env) = 0; + void operator()(Environment &env); + virtual void execute(Environment &env) = 0; private: std::string name_; }; From 1e10b4571de52c404a578f61c663dd4104f10e27 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 23 Feb 2016 16:21:45 +0000 Subject: [PATCH 012/807] fix after Grid update --- programs/Hadrons/Global.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 693a9829..e99b491a 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -35,7 +35,8 @@ BEGIN_HADRONS_NAMESPACE class HadronsLogger: public Logger { public: - HadronsLogger(int on, std::string nm): Logger("Hadrons", on, nm){}; + HadronsLogger(int on, std::string nm): Logger("Hadrons", on, nm, + Logger::BLACK){}; }; #define LOG(channel) std::cout << HadronsLog##channel From a0d8eb2c245aa1245f61ac2c2dce7bde26a82479 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 23 Feb 2016 16:33:00 +0000 Subject: [PATCH 013/807] minor code cleaning --- programs/Hadrons/Application.cc | 5 +---- programs/Hadrons/Global.cc | 2 -- programs/Hadrons/Hadrons.cc | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index c8c44adc..5eb43363 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -42,10 +42,7 @@ Application::Application(const std::string parameterFileName) // destructor ////////////////////////////////////////////////////////////////// Application::~Application(void) -{ - LOG(Message) << "Grid is finalizing now" << std::endl; - Grid_finalize(); -} +{} // execute ///////////////////////////////////////////////////////////////////// void Application::run(void) diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index a560d71f..a8d8f22b 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -26,5 +26,3 @@ HadronsLogger Hadrons::HadronsLogError(1,"Error"); HadronsLogger Hadrons::HadronsLogWarning(1,"Warning"); HadronsLogger Hadrons::HadronsLogMessage(1,"Message"); HadronsLogger Hadrons::HadronsLogDebug(1,"Debug"); - - diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index 853de83c..d53ca497 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -33,6 +33,8 @@ int main(int argc, char *argv[]) std::exit(EXIT_FAILURE); } parameterFileName = argv[1]; + + // initialization Grid_init(&argc, &argv); HadronsLogError.Active(GridLogError.isActive()); HadronsLogWarning.Active(GridLogWarning.isActive()); @@ -45,5 +47,9 @@ int main(int argc, char *argv[]) application.run(); + // epilogue + LOG(Message) << "Grid is finalizing now" << std::endl; + Grid_finalize(); + return EXIT_SUCCESS; } From 5980fa86407b5bcd538db2cb17b537324d266256 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 25 Feb 2016 11:56:16 +0000 Subject: [PATCH 014/807] test implementation of DWF inverter --- programs/Hadrons/Application.cc | 1 + programs/Hadrons/Environment.cc | 73 +++++++++++++++++++++++++++++--- programs/Hadrons/Environment.hpp | 41 ++++++++++++------ programs/Hadrons/MQuark.cc | 16 +++++++ 4 files changed, 112 insertions(+), 19 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 5eb43363..00ca8f61 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -156,6 +156,7 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; + env_.loadUnitGauge(); execute(program_); env_.freeAll(); } diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index fb9052f0..ac7c81fa 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -29,9 +29,15 @@ using namespace Hadrons; // constructor ///////////////////////////////////////////////////////////////// Environment::Environment(void) { + std::vector seed4d({1,2,3,4}); + grid4d_.reset(SpaceTimeGrid::makeFourDimGrid( GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), GridDefaultMpi())); + gridRb4d_.reset(SpaceTimeGrid::makeFourDimRedBlackGrid(grid4d_.get())); + rng4d_.reset(new GridParallelRNG(grid4d_.get())); + rng4d_->SeedFixedIntegers(seed4d); + gauge_.reset(new LatticeGaugeField(grid4d_.get())); } // dry run ///////////////////////////////////////////////////////////////////// @@ -45,30 +51,67 @@ bool Environment::isDryRun(void) return dryRun_; } +// grids /////////////////////////////////////////////////////////////////////// +GridCartesian * Environment::get4dGrid(void) +{ + return grid4d_.get(); +} + +GridRedBlackCartesian * Environment::getRb4dGrid(void) +{ + return gridRb4d_.get(); +} + +GridCartesian * Environment::get5dGrid(const unsigned int Ls) +{ + try + { + return grid5d_.at(Ls).get(); + } + catch(std::out_of_range &) + { + HADRON_ERROR("no 5D grid with Ls= " << Ls); + } +} + +GridRedBlackCartesian * Environment::getRb5dGrid(const unsigned int Ls) +{ + try + { + return gridRb5d_.at(Ls).get(); + } + catch(std::out_of_range &) + { + HADRON_ERROR("no red-black 5D grid with Ls= " << Ls); + } +} + // quark propagators /////////////////////////////////////////////////////////// void Environment::addProp(const std::string name, const unsigned int Ls) { + GridCartesian *p4 = grid4d_.get(); + if (propExists(name)) { HADRON_ERROR("propagator '" + name + "' already exists"); } if (Ls > 1) { - GridCartesian *pt; + GridCartesian *p; try { - pt = grid5d_.at(Ls).get(); + p = grid5d_.at(Ls).get(); } catch(std::out_of_range &) { - grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, - grid4d_.get())); - pt = grid5d_[Ls].get(); + grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, p4)); + gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, p4)); + p = grid5d_[Ls].get(); } if (!isDryRun()) { - prop_[name].reset(new LatticePropagator(pt)); + prop_[name].reset(new LatticePropagator(p)); } else { @@ -80,7 +123,7 @@ void Environment::addProp(const std::string name, const unsigned int Ls) { if (!isDryRun()) { - prop_[name].reset(new LatticePropagator(grid4d_.get())); + prop_[name].reset(new LatticePropagator(p4)); } else { @@ -143,6 +186,22 @@ unsigned int Environment::nProp(void) return size; } +// gauge configuration ///////////////////////////////////////////////////////// +LatticeGaugeField * Environment::getGauge(void) +{ + return gauge_.get(); +} + +void Environment::loadUnitGauge(void) +{ + SU3::ColdConfiguration(*rng4d_, *gauge_); +} + +void Environment::loadRandomGauge(void) +{ + SU3::HotConfiguration(*rng4d_, *gauge_); +} + // general free //////////////////////////////////////////////////////////////// void Environment::free(const std::string name) { diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 66576658..17ca462d 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -31,28 +31,45 @@ class Environment { SINGLETON(Environment); public: - typedef std::unique_ptr GridPt; - typedef std::unique_ptr PropPt; + typedef std::unique_ptr GridPt; + typedef std::unique_ptr GridRbPt; + typedef std::unique_ptr RngPt; + typedef std::unique_ptr PropPt; + typedef std::unique_ptr GaugePt; public: // dry run - void dryRun(const bool isDry); - bool isDryRun(void); + void dryRun(const bool isDry); + bool isDryRun(void); + // grids + GridCartesian * get4dGrid(void); + GridRedBlackCartesian * getRb4dGrid(void); + GridCartesian * get5dGrid(const unsigned int Ls); + GridRedBlackCartesian * getRb5dGrid(const unsigned int Ls); // quark propagators - void addProp(const std::string name, - const unsigned int Ls = 1); - void freeProp(const std::string name); - LatticePropagator * getProp(const std::string name); - bool propExists(const std::string name); - unsigned int nProp(void); + void addProp(const std::string name, + const unsigned int Ls = 1); + void freeProp(const std::string name); + LatticePropagator * getProp(const std::string name); + bool propExists(const std::string name); + unsigned int nProp(void); + // gauge configuration + LatticeGaugeField * getGauge(void); + void loadUnitGauge(void); + void loadRandomGauge(void); // general free - void free(const std::string name); - void freeAll(void); + void free(const std::string name); + void freeAll(void); private: bool dryRun_{false}; GridPt grid4d_; std::map grid5d_; + GridRbPt gridRb4d_; + std::map gridRb5d_; + RngPt rng4d_; std::map prop_; std::map propSize_; + GaugePt gauge_; + }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index f2ae3ee9..c328e3a8 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -66,4 +66,20 @@ void MQuark::execute(Environment &env) { LOG(Message) << "computing quark propagator '" << getName() << "'" << std::endl; + + GridCartesian *g4d = env.get4dGrid(), + *g5d = env.get5dGrid(par_.Ls); + GridRedBlackCartesian *gRb4d = env.getRb4dGrid(), + *gRb5d = env.getRb5dGrid(par_.Ls); + LatticeGaugeField &Umu = *env.getGauge(); + LatticeFermion src(g5d); src=zero; + LatticeFermion result(g5d); result=zero; + + RealD mass=0.1; + RealD M5=1.8; + DomainWallFermionR Ddwf(Umu, *g5d, *gRb5d, *g4d, *gRb4d, mass, M5); + + ConjugateGradient CG(1.0e-8,10000); + SchurRedBlackDiagMooeeSolve SchurSolver(CG); + SchurSolver(Ddwf,src,result); } From 92f666905fa08a6ca92840e252e32e3f33d09b04 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 25 Feb 2016 12:06:24 +0000 Subject: [PATCH 015/807] copyright script update to 80 column text --- scripts/copyright | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/scripts/copyright b/scripts/copyright index 76ed6603..b4783b74 100755 --- a/scripts/copyright +++ b/scripts/copyright @@ -5,13 +5,12 @@ while (( "$#" )); do echo $1 cat > message <> message cat >> message < tmp.fil From fdd084859304d69cc456c142a7c6840cbe18694d Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 25 Feb 2016 12:07:21 +0000 Subject: [PATCH 016/807] Hadrons: license text update --- programs/Hadrons/Application.cc | 44 ++++++++++++++++++------------ programs/Hadrons/Application.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/CMeson.cc | 44 ++++++++++++++++++------------ programs/Hadrons/CMeson.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/Environment.cc | 44 ++++++++++++++++++------------ programs/Hadrons/Environment.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/Global.cc | 44 ++++++++++++++++++------------ programs/Hadrons/Global.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/Graph.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/Hadrons.cc | 44 ++++++++++++++++++------------ programs/Hadrons/MQuark.cc | 44 ++++++++++++++++++------------ programs/Hadrons/MQuark.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/Module.cc | 44 ++++++++++++++++++------------ programs/Hadrons/Module.hpp | 44 ++++++++++++++++++------------ programs/Hadrons/ModuleFactory.cc | 44 ++++++++++++++++++------------ programs/Hadrons/ModuleFactory.hpp | 44 ++++++++++++++++++------------ 16 files changed, 416 insertions(+), 288 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 00ca8f61..fe33953f 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -1,21 +1,29 @@ -/* - * Application.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Application.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include #include diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index fd583fce..b02382e4 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -1,21 +1,29 @@ -/* - * Application.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Application.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_Application_hpp_ #define Hadrons_Application_hpp_ diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index e93cb18c..e9748f83 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -1,21 +1,29 @@ -/* - * CMeson.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/CMeson.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index 843ae00b..f9916131 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -1,21 +1,29 @@ -/* - * CMeson.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/CMeson.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_CMeson_hpp_ #define Hadrons_CMeson_hpp_ diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index ac7c81fa..c78dec9a 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -1,21 +1,29 @@ -/* - * Environment.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Environment.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 17ca462d..12138d88 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -1,21 +1,29 @@ -/* - * Environment.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Environment.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_Environment_hpp_ #define Hadrons_Environment_hpp_ diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index a8d8f22b..18c3028e 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -1,21 +1,29 @@ -/* - * Application.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Global.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index e99b491a..f364452e 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -1,21 +1,29 @@ -/* - * Globals.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * LatCore is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LatCore is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LatCore. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Global.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_Global_hpp_ #define Hadrons_Global_hpp_ diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 7440975b..8b8afcc6 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -1,21 +1,29 @@ -/* - * Graph.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Graph.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_Graph_hpp_ #define Hadrons_Graph_hpp_ diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index d53ca497..73ac03f9 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -1,21 +1,29 @@ -/* - * Hadrons.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * LatCore is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LatCore is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LatCore. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Hadrons.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index c328e3a8..92311a37 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -1,21 +1,29 @@ -/* - * MQuark.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/MQuark.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index f5ab94fb..c11cc8c1 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -1,21 +1,29 @@ -/* - * MQuark.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/MQuark.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_MQuark_hpp_ #define Hadrons_MQuark_hpp_ diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index a5809155..62f7fc68 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -1,21 +1,29 @@ -/* - * Module.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Module.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index a8d3b40e..d929afec 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -1,21 +1,29 @@ -/* - * Module.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Module.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_Module_hpp_ #define Hadrons_Module_hpp_ diff --git a/programs/Hadrons/ModuleFactory.cc b/programs/Hadrons/ModuleFactory.cc index 084d272d..bb8cefad 100644 --- a/programs/Hadrons/ModuleFactory.cc +++ b/programs/Hadrons/ModuleFactory.cc @@ -1,21 +1,29 @@ -/* - * ModuleFactory.cc, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/ModuleFactory.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #include diff --git a/programs/Hadrons/ModuleFactory.hpp b/programs/Hadrons/ModuleFactory.hpp index 822dc8e7..f2db8d6a 100644 --- a/programs/Hadrons/ModuleFactory.hpp +++ b/programs/Hadrons/ModuleFactory.hpp @@ -1,21 +1,29 @@ -/* - * ModuleFactory.hpp, part of Grid - * - * Copyright (C) 2015 Antonin Portelli - * - * Grid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Grid is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Grid. If not, see . - */ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/ModuleFactory.hpp + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ #ifndef Hadrons_ModuleFactory_hpp_ #define Hadrons_ModuleFactory_hpp_ From feae35d92ce603a10981bf290c9d67300528b2c9 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sat, 16 Apr 2016 08:41:12 +0100 Subject: [PATCH 017/807] Hadrons: pass strings by value --- programs/Hadrons/CMeson.cc | 4 ++-- programs/Hadrons/CMeson.hpp | 4 ++-- programs/Hadrons/MQuark.cc | 4 ++-- programs/Hadrons/MQuark.hpp | 4 ++-- programs/Hadrons/MSource.cc | 9 +++++++++ programs/Hadrons/MSource.hpp | 14 ++++++++++++++ programs/Hadrons/Module.cc | 2 +- programs/Hadrons/Module.hpp | 6 +++--- programs/Hadrons/ModuleFactory.cc | 6 +++--- programs/Hadrons/ModuleFactory.hpp | 8 ++++---- 10 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 programs/Hadrons/MSource.cc create mode 100644 programs/Hadrons/MSource.hpp diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index e9748f83..8283cb9d 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -34,12 +34,12 @@ using namespace Hadrons; * CMeson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -CMeson::CMeson(const std::string &name) +CMeson::CMeson(const std::string name) : Module(name) {} // parse parameters //////////////////////////////////////////////////////////// -void CMeson::parseParameters(XmlReader &reader, const std::string &name) +void CMeson::parseParameters(XmlReader &reader, const std::string name) { read(reader, name, par_); } diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index f9916131..c834f1e0 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -50,11 +50,11 @@ public: }; public: // constructor - CMeson(const std::string &name); + CMeson(const std::string name); // destructor virtual ~CMeson(void) = default; // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string &name); + virtual void parseParameters(XmlReader &reader, const std::string name); // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index 92311a37..a39fa927 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -34,12 +34,12 @@ using namespace Hadrons; * MQuark implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -MQuark::MQuark(const std::string &name) +MQuark::MQuark(const std::string name) : Module(name) {} // parse parameters -void MQuark::parseParameters(XmlReader &reader, const std::string &name) +void MQuark::parseParameters(XmlReader &reader, const std::string name) { read(reader, name, par_); } diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index c11cc8c1..da0933e4 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -47,11 +47,11 @@ public: }; public: // constructor - MQuark(const std::string &name); + MQuark(const std::string name); // destructor virtual ~MQuark(void) = default; // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string &name); + virtual void parseParameters(XmlReader &reader, const std::string name); // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc new file mode 100644 index 00000000..f9b7f9d1 --- /dev/null +++ b/programs/Hadrons/MSource.cc @@ -0,0 +1,9 @@ +// +// MSource.cpp +// Grid +// +// Created by Antonin Portelli on 16/04/2016. +// +// + +#include "MSource.hpp" diff --git a/programs/Hadrons/MSource.hpp b/programs/Hadrons/MSource.hpp new file mode 100644 index 00000000..1ba667e8 --- /dev/null +++ b/programs/Hadrons/MSource.hpp @@ -0,0 +1,14 @@ +// +// MSource.hpp +// Grid +// +// Created by Antonin Portelli on 16/04/2016. +// +// + +#ifndef MSource_hpp +#define MSource_hpp + +#include + +#endif /* MSource_hpp */ diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index 62f7fc68..a588ce97 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -34,7 +34,7 @@ using namespace Hadrons; * Module implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Module::Module(const std::string &name) +Module::Module(const std::string name) : name_(name) {} diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index d929afec..67a201bc 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -41,7 +41,7 @@ public:\ mod##Registrar(void)\ {\ ModuleFactory &modFac = ModuleFactory::getInstance();\ - modFac.registerModule(#mod, [&](const std::string &name)\ + modFac.registerModule(#mod, [&](const std::string name)\ {\ return std::unique_ptr(new mod(name));\ });\ @@ -56,13 +56,13 @@ class Module { public: // constructor - Module(const std::string &name); + Module(const std::string name); // destructor virtual ~Module(void) = default; // access std::string getName(void) const; // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string &name) = 0; + virtual void parseParameters(XmlReader &reader, const std::string name) = 0; // dependency relation virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; diff --git a/programs/Hadrons/ModuleFactory.cc b/programs/Hadrons/ModuleFactory.cc index bb8cefad..6e59aa57 100644 --- a/programs/Hadrons/ModuleFactory.cc +++ b/programs/Hadrons/ModuleFactory.cc @@ -39,7 +39,7 @@ ModuleFactory::ModuleFactory(void) } // registration //////////////////////////////////////////////////////////////// -void ModuleFactory::registerModule(const std::string &type, +void ModuleFactory::registerModule(const std::string type, const FactoryFunc &f) { factory_[type] = f; @@ -59,8 +59,8 @@ std::vector ModuleFactory::getModuleList(void) const } // factory ///////////////////////////////////////////////////////////////////// -std::unique_ptr ModuleFactory::create(const std::string &type, - const std::string &name) const +std::unique_ptr ModuleFactory::create(const std::string type, + const std::string name) const { FactoryFunc func; diff --git a/programs/Hadrons/ModuleFactory.hpp b/programs/Hadrons/ModuleFactory.hpp index f2db8d6a..a959847f 100644 --- a/programs/Hadrons/ModuleFactory.hpp +++ b/programs/Hadrons/ModuleFactory.hpp @@ -40,16 +40,16 @@ class ModuleFactory { SINGLETON(ModuleFactory) public: - typedef std::function(const std::string &)> + typedef std::function(const std::string )> FactoryFunc; public: // registration - void registerModule(const std::string &type, const FactoryFunc &f); + void registerModule(const std::string type, const FactoryFunc &f); // get module list std::vector getModuleList(void) const; // factory - std::unique_ptr create(const std::string &type, - const std::string &name) const; + std::unique_ptr create(const std::string type, + const std::string name) const; private: std::map factory_; }; From 9ee54e0db76e11d6945f184d042a06b573a0daa3 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sat, 16 Apr 2016 08:41:28 +0100 Subject: [PATCH 018/807] debug output removed --- lib/communicator/Communicator_mpi.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/communicator/Communicator_mpi.cc b/lib/communicator/Communicator_mpi.cc index f804e8fe..dff9811a 100644 --- a/lib/communicator/Communicator_mpi.cc +++ b/lib/communicator/Communicator_mpi.cc @@ -53,7 +53,6 @@ CartesianCommunicator::CartesianCommunicator(const std::vector &processors) _Nprocessors=1; _processors = processors; _processor_coor.resize(_ndimension); - std::cout << processors << std::endl; MPI_Cart_create(MPI_COMM_WORLD, _ndimension,&_processors[0],&periodic[0],1,&communicator); MPI_Comm_rank(communicator,&_processor); From e33b0f6ff73e0160c2efe7d9351eb7f6bbb0450c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sat, 16 Apr 2016 08:41:53 +0100 Subject: [PATCH 019/807] cleaner output --- lib/Log.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Log.h b/lib/Log.h index e55c2e52..05676775 100644 --- a/lib/Log.h +++ b/lib/Log.h @@ -69,8 +69,8 @@ public: StopWatch.Stop(); GridTime now = StopWatch.Elapsed(); StopWatch.Start(); - stream << BLACK<< log.topName << BLACK<< " : "; - stream << log.COLOUR < Date: Sat, 30 Apr 2016 00:17:04 -0700 Subject: [PATCH 020/807] Hadrons: first prototype with working inversions --- programs/Hadrons/AWilson.cc | 56 +++++++ programs/Hadrons/AWilson.hpp | 65 ++++++++ programs/Hadrons/Application.cc | 118 +++++++++----- programs/Hadrons/Application.hpp | 6 +- programs/Hadrons/CMeson.cc | 4 - programs/Hadrons/CMeson.hpp | 2 - programs/Hadrons/Environment.cc | 152 ++++++++++++++---- programs/Hadrons/Environment.hpp | 47 ++++-- programs/Hadrons/Factory.hpp | 104 ++++++++++++ .../{ModuleFactory.cc => FermionAction.cc} | 51 ++---- programs/Hadrons/FermionAction.hpp | 83 ++++++++++ programs/Hadrons/FermionActionFactory.hpp | 47 ++++++ programs/Hadrons/Global.hpp | 15 +- programs/Hadrons/MQuark.cc | 75 ++++++--- programs/Hadrons/MQuark.hpp | 11 +- programs/Hadrons/MSource.cc | 148 ++++++++++++++++- programs/Hadrons/MSource.hpp | 111 +++++++++++-- programs/Hadrons/Makefile.am | 20 ++- programs/Hadrons/Module.cc | 1 + programs/Hadrons/Module.hpp | 12 +- programs/Hadrons/ModuleFactory.hpp | 18 +-- programs/Hadrons/SRBPrecCG.cc | 74 +++++++++ programs/Hadrons/SRBPrecCG.hpp | 69 ++++++++ 23 files changed, 1092 insertions(+), 197 deletions(-) create mode 100644 programs/Hadrons/AWilson.cc create mode 100644 programs/Hadrons/AWilson.hpp create mode 100644 programs/Hadrons/Factory.hpp rename programs/Hadrons/{ModuleFactory.cc => FermionAction.cc} (55%) create mode 100644 programs/Hadrons/FermionAction.hpp create mode 100644 programs/Hadrons/FermionActionFactory.hpp create mode 100644 programs/Hadrons/SRBPrecCG.cc create mode 100644 programs/Hadrons/SRBPrecCG.hpp diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc new file mode 100644 index 00000000..2f8483f3 --- /dev/null +++ b/programs/Hadrons/AWilson.cc @@ -0,0 +1,56 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/AWilson.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* AWilson implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +AWilson::AWilson(const std::string name) +: FermionAction(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void AWilson::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// create operator ///////////////////////////////////////////////////////////// +void AWilson::create(Environment &env) +{ + auto &U = *env.getGauge(); + auto &grid = *env.getGrid(); + auto &gridRb = *env.getRbGrid(); + + setFMat(new WilsonFermionR(U, grid, gridRb, par_.mass)); +} diff --git a/programs/Hadrons/AWilson.hpp b/programs/Hadrons/AWilson.hpp new file mode 100644 index 00000000..aa40b99d --- /dev/null +++ b/programs/Hadrons/AWilson.hpp @@ -0,0 +1,65 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/AWilson.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_AWilson_hpp_ +#define Hadrons_AWilson_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Wilson fermions * + ******************************************************************************/ +class AWilson: public FermionAction +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, double, mass); + }; +public: + // constructor + AWilson(const std::string name); + // destructor + virtual ~AWilson(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // create operator + virtual void create(Environment &env); +private: + Par par_; +}; + +ACTION_REGISTER(AWilson); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_AWilson_hpp_ diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index fe33953f..af12d227 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -38,10 +38,17 @@ using namespace Hadrons; Application::Application(const std::string parameterFileName) : parameterFileName_(parameterFileName) , env_(Environment::getInstance()) +, actionFactory_(FermionActionFactory::getInstance()) , modFactory_(ModuleFactory::getInstance()) { + LOG(Message) << "Fermion actions available:" << std::endl; + auto list = actionFactory_.getBuilderList(); + for (auto &m: list) + { + LOG(Message) << " " << m << std::endl; + } LOG(Message) << "Modules available:" << std::endl; - auto list = modFactory_.getModuleList(); + list = modFactory_.getBuilderList(); for (auto &m: list) { LOG(Message) << " " << m << std::endl; @@ -61,10 +68,10 @@ void Application::run(void) } // parse parameter file //////////////////////////////////////////////////////// -class ModuleId: Serializable +class ObjectId: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(ModuleId, + GRID_SERIALIZABLE_CLASS_MEMBERS(ObjectId, std::string, name, std::string, type); }; @@ -72,10 +79,22 @@ public: void Application::parseParameterFile(void) { XmlReader reader(parameterFileName_); - ModuleId id; + ObjectId id; LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl; read(reader, "parameters", par_); + push(reader, "actions"); + push(reader, "action"); + do + { + read(reader, "id", id); + env_.addFermionAction(actionFactory_.create(id.type, id.name)); + auto &action = *env_.getFermionAction(id.name); + action.parseParameters(reader, "options"); + action.create(env_); + } while (reader.nextElement("action")); + pop(reader); + pop(reader); push(reader, "modules"); push(reader, "module"); do @@ -92,6 +111,7 @@ void Application::parseParameterFile(void) } while (reader.nextElement("module")); pop(reader); pop(reader); + env_.setSeed(strToVec(par_.seed)); } // schedule computation //////////////////////////////////////////////////////// @@ -122,33 +142,38 @@ void Application::schedule(void) unsigned int k = 0; std::vector> con = moduleGraph.getConnectedComponents(); - LOG(Message) << "Program:" << std::endl; + for (unsigned int i = 0; i < con.size(); ++i) { - std::vector> t = con[i].allTopoSort(); - int memPeak, minMemPeak = -1; - unsigned int bestInd; - bool msg; - - env_.dryRun(true); - for (unsigned int p = 0; p < t.size(); ++p) +// std::vector> t = con[i].allTopoSort(); +// int memPeak, minMemPeak = -1; +// unsigned int bestInd; +// bool msg; +// +// LOG(Message) << "analyzing " << t.size() << " possible programs..." +// << std::endl; +// env_.dryRun(true); +// for (unsigned int p = 0; p < t.size(); ++p) +// { +// msg = HadronsLogMessage.isActive(); +// HadronsLogMessage.Active(false); +// +// memPeak = execute(t[p]); +// if ((memPeak < minMemPeak) or (minMemPeak < 0)) +// { +// minMemPeak = memPeak; +// bestInd = p; +// } +// HadronsLogMessage.Active(msg); +// env_.freeAll(); +// } +// env_.dryRun(false); + std::vector t = con[i].topoSort(); + LOG(Message) << "Program " << i + 1 << ":" << std::endl; + for (unsigned int j = 0; j < t.size(); ++j) { - msg = HadronsLogMessage.isActive(); - HadronsLogMessage.Active(false); - memPeak = execute(t[p]); - if ((memPeak < minMemPeak) or (minMemPeak < 0)) - { - minMemPeak = memPeak; - bestInd = p; - } - HadronsLogMessage.Active(msg); - env_.freeAll(); - } - env_.dryRun(false); - for (unsigned int j = 0; j < t[bestInd].size(); ++j) - { - program_.push_back(t[bestInd][j]); - LOG(Message) << std::setw(4) << std::right << k << ": " + program_.push_back(t[j]); + LOG(Message) << std::setw(4) << std::right << k + 1 << ": " << program_[k] << std::endl; k++; } @@ -164,7 +189,7 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; - env_.loadUnitGauge(); + env_.loadRandomGauge(); execute(program_); env_.freeAll(); } @@ -172,8 +197,25 @@ void Application::configLoop(void) unsigned int Application::execute(const std::vector &program) { - unsigned int memPeak = 0; + unsigned int memPeak = 0; + std::vector> freeProg; + freeProg.resize(program.size()); + for (auto &n: associatedModule_) + { + auto pred = [&n, this](const std::string &s) + { + auto &in = input_[s]; + auto it = std::find(in.begin(), in.end(), n.first); + + return (it != in.end()) or (s == n.second); + }; + auto it = std::find_if(program.rbegin(), program.rend(), pred); + if (it != program.rend()) + { + freeProg[program.rend() - it - 1].push_back(n.first); + } + } for (unsigned int i = 0; i < program.size(); ++i) { LOG(Message) << "Measurement step (" << i+1 << "/" << program.size() @@ -184,21 +226,9 @@ unsigned int Application::execute(const std::vector &program) { memPeak = env_.nProp(); } - for (auto &n: associatedModule_) + for (auto &n: freeProg[i]) { - bool canFree = true; - - for (unsigned int j = i + 1; j < program.size(); ++j) - { - auto &in = input_[program[j]]; - auto it = std::find(in.begin(), in.end(), n.first); - canFree = canFree and (it == in.end()); - } - if (canFree and env_.propExists(n.first)) - { - LOG(Message) << "freeing '" << n.first << "'" << std::endl; - env_.free(n.first); - } + env_.free(n); } } diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index b02382e4..a5e0e3c4 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -29,6 +29,7 @@ directory. #define Hadrons_Application_hpp_ #include +#include #include #include @@ -59,7 +60,8 @@ class GlobalPar: Serializable { public: GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, - ConfigPar, configs); + ConfigPar, configs, + std::string, seed); }; /****************************************************************************** @@ -88,11 +90,13 @@ private: std::string parameterFileName_; GlobalPar par_; Environment &env_; + FermionActionFactory &actionFactory_; ModuleFactory &modFactory_; std::map> module_; std::map associatedModule_; std::map> input_; std::vector program_; + std::vector> freeProg_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index 8283cb9d..537f157f 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -59,10 +59,6 @@ std::vector CMeson::getOutput(void) return output; } -// memory footprint //////////////////////////////////////////////////////////// -void CMeson::allocate(Environment &env) -{} - // execution /////////////////////////////////////////////////////////////////// void CMeson::execute(Environment &env) { diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index c834f1e0..8725d938 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -58,8 +58,6 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // allocation - virtual void allocate(Environment &env); // execution virtual void execute(Environment &env); private: diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index c78dec9a..ebd8d010 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -37,15 +37,13 @@ using namespace Hadrons; // constructor ///////////////////////////////////////////////////////////////// Environment::Environment(void) { - std::vector seed4d({1,2,3,4}); - grid4d_.reset(SpaceTimeGrid::makeFourDimGrid( GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), GridDefaultMpi())); gridRb4d_.reset(SpaceTimeGrid::makeFourDimRedBlackGrid(grid4d_.get())); rng4d_.reset(new GridParallelRNG(grid4d_.get())); - rng4d_->SeedFixedIntegers(seed4d); gauge_.reset(new LatticeGaugeField(grid4d_.get())); + loadUnitGauge(); } // dry run ///////////////////////////////////////////////////////////////////// @@ -54,27 +52,24 @@ void Environment::dryRun(const bool isDry) dryRun_ = isDry; } -bool Environment::isDryRun(void) +bool Environment::isDryRun(void) const { return dryRun_; } // grids /////////////////////////////////////////////////////////////////////// -GridCartesian * Environment::get4dGrid(void) -{ - return grid4d_.get(); -} - -GridRedBlackCartesian * Environment::getRb4dGrid(void) -{ - return gridRb4d_.get(); -} - -GridCartesian * Environment::get5dGrid(const unsigned int Ls) +GridCartesian * Environment::getGrid(const unsigned int Ls) const { try { - return grid5d_.at(Ls).get(); + if (Ls == 1) + { + return grid4d_.get(); + } + else + { + return grid5d_.at(Ls).get(); + } } catch(std::out_of_range &) { @@ -82,11 +77,18 @@ GridCartesian * Environment::get5dGrid(const unsigned int Ls) } } -GridRedBlackCartesian * Environment::getRb5dGrid(const unsigned int Ls) +GridRedBlackCartesian * Environment::getRbGrid(const unsigned int Ls) const { try { - return gridRb5d_.at(Ls).get(); + if (Ls == 1) + { + return gridRb4d_.get(); + } + else + { + return gridRb5d_.at(Ls).get(); + } } catch(std::out_of_range &) { @@ -94,6 +96,52 @@ GridRedBlackCartesian * Environment::getRb5dGrid(const unsigned int Ls) } } +// fermion actions ///////////////////////////////////////////////////////////// +void Environment::addFermionAction(FActionPt action) +{ + fAction_[action->getName()] = std::move(action); +} + +FermionAction * Environment::getFermionAction(const std::string name) const +{ + try + { + return fAction_.at(name).get(); + } + catch(std::out_of_range &) + { + try + { + return fAction_.at(solverAction_.at(name)).get(); + } + catch (std::out_of_range &) + { + HADRON_ERROR("no action with name '" << name << "'"); + } + } +} + +// solvers ///////////////////////////////////////////////////////////////////// +void Environment::addSolver(const std::string name, Solver s, + const std::string actionName) +{ + solver_[name] = s; + solverAction_[name] = actionName; +} + +void Environment::callSolver(const std::string name, LatticeFermion &sol, + const LatticeFermion &source) const +{ + try + { + solver_.at(name)(sol, source); + } + catch(std::out_of_range &) + { + HADRON_ERROR("no solver with name '" << name << "'"); + } +} + // quark propagators /////////////////////////////////////////////////////////// void Environment::addProp(const std::string name, const unsigned int Ls) { @@ -154,11 +202,46 @@ void Environment::freeProp(const std::string name) } } -LatticePropagator * Environment::getProp(const std::string name) +bool Environment::isProp5d(const std::string name) const { if (propExists(name)) { - return prop_[name].get(); + return (getProp(name)->_grid->GlobalDimensions().size() == Nd + 1); + } + else + { + HADRON_ERROR("propagator '" + name + "' unknown"); + + return false; + } +} + +unsigned int Environment::getPropLs(const std::string name) const +{ + if (propExists(name)) + { + if (isProp5d(name)) + { + return getProp(name)->_grid->GlobalDimensions()[0]; + } + else + { + return 1; + } + } + else + { + HADRON_ERROR("propagator '" + name + "' unknown"); + + return 0; + } +} + +LatticePropagator * Environment::getProp(const std::string name) const +{ + if (propExists(name)) + { + return prop_.at(name).get(); } else { @@ -168,21 +251,12 @@ LatticePropagator * Environment::getProp(const std::string name) } } -bool Environment::propExists(const std::string name) +bool Environment::propExists(const std::string name) const { - auto it = prop_.find(name); - - if (it == prop_.end()) - { - return false; - } - else - { - return true; - } + return (prop_.find(name) != prop_.end()); } -unsigned int Environment::nProp(void) +unsigned int Environment::nProp(void) const { unsigned int size = 0; @@ -195,7 +269,7 @@ unsigned int Environment::nProp(void) } // gauge configuration ///////////////////////////////////////////////////////// -LatticeGaugeField * Environment::getGauge(void) +LatticeGaugeField * Environment::getGauge(void) const { return gauge_.get(); } @@ -210,11 +284,23 @@ void Environment::loadRandomGauge(void) SU3::HotConfiguration(*rng4d_, *gauge_); } +// random number generator ///////////////////////////////////////////////////// +void Environment::setSeed(const std::vector &seed) +{ + rng4d_->SeedFixedIntegers(seed); +} + +GridParallelRNG * Environment::get4dRng(void) const +{ + return rng4d_.get(); +} + // general free //////////////////////////////////////////////////////////////// void Environment::free(const std::string name) { if (propExists(name)) { + LOG(Message) << "freeing '" << name << "'" << std::endl; freeProp(name); } } diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 12138d88..906c5aa1 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -29,6 +29,7 @@ directory. #define Hadrons_Environment_hpp_ #include +#include BEGIN_HADRONS_NAMESPACE @@ -39,31 +40,46 @@ class Environment { SINGLETON(Environment); public: - typedef std::unique_ptr GridPt; - typedef std::unique_ptr GridRbPt; - typedef std::unique_ptr RngPt; - typedef std::unique_ptr PropPt; - typedef std::unique_ptr GaugePt; + typedef std::function Solver; + typedef std::unique_ptr GridPt; + typedef std::unique_ptr GridRbPt; + typedef std::unique_ptr RngPt; + typedef std::unique_ptr FActionPt; + typedef std::unique_ptr PropPt; + typedef std::unique_ptr GaugePt; public: // dry run void dryRun(const bool isDry); - bool isDryRun(void); + bool isDryRun(void) const; // grids - GridCartesian * get4dGrid(void); - GridRedBlackCartesian * getRb4dGrid(void); - GridCartesian * get5dGrid(const unsigned int Ls); - GridRedBlackCartesian * getRb5dGrid(const unsigned int Ls); + GridCartesian * getGrid(const unsigned int Ls = 1) const; + GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; + // fermion actions + void addFermionAction(FActionPt action); + FermionAction * getFermionAction(const std::string name) const; + // solvers + void addSolver(const std::string name, Solver s, + const std::string actionName); + void callSolver(const std::string name, + LatticeFermion &sol, + const LatticeFermion &src) const; // quark propagators void addProp(const std::string name, const unsigned int Ls = 1); void freeProp(const std::string name); - LatticePropagator * getProp(const std::string name); - bool propExists(const std::string name); - unsigned int nProp(void); + bool isProp5d(const std::string name) const; + unsigned int getPropLs(const std::string name) const; + LatticePropagator * getProp(const std::string name) const; + bool propExists(const std::string name) const; + unsigned int nProp(void) const; // gauge configuration - LatticeGaugeField * getGauge(void); + LatticeGaugeField * getGauge(void) const; void loadUnitGauge(void); void loadRandomGauge(void); + // random number generator + void setSeed(const std::vector &seed); + GridParallelRNG * get4dRng(void) const; // general free void free(const std::string name); void freeAll(void); @@ -74,6 +90,9 @@ private: GridRbPt gridRb4d_; std::map gridRb5d_; RngPt rng4d_; + std::map fAction_; + std::map solver_; + std::map solverAction_; std::map prop_; std::map propSize_; GaugePt gauge_; diff --git a/programs/Hadrons/Factory.hpp b/programs/Hadrons/Factory.hpp new file mode 100644 index 00000000..2b219dcc --- /dev/null +++ b/programs/Hadrons/Factory.hpp @@ -0,0 +1,104 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Factory.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_Factory_hpp_ +#define Hadrons_Factory_hpp_ + +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * abstract factory class * + ******************************************************************************/ +template +class Factory +{ +public: + typedef std::function(const std::string)> Func; +public: + // constructor + Factory(void) = default; + // destructor + virtual ~Factory(void) = default; + // registration + void registerBuilder(const std::string type, const Func &f); + // get module list + std::vector getBuilderList(void) const; + // factory + std::unique_ptr create(const std::string type, + const std::string name) const; +private: + std::map builder_; +}; + +/****************************************************************************** + * template implementation * + ******************************************************************************/ +// registration //////////////////////////////////////////////////////////////// +template +void Factory::registerBuilder(const std::string type, const Func &f) +{ + builder_[type] = f; +} + +// get module list ///////////////////////////////////////////////////////////// +template +std::vector Factory::getBuilderList(void) const +{ + std::vector list; + + for (auto &b: builder_) + { + list.push_back(b.first); + } + + return list; +} + +// factory ///////////////////////////////////////////////////////////////////// +template +std::unique_ptr Factory::create(const std::string type, + const std::string name) const +{ + Func func; + + try + { + func = builder_.at(type); + } + catch (std::out_of_range) + { + HADRON_ERROR("object of type '" + type + "' unknown"); + } + + return func(name); +} + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Factory_hpp_ diff --git a/programs/Hadrons/ModuleFactory.cc b/programs/Hadrons/FermionAction.cc similarity index 55% rename from programs/Hadrons/ModuleFactory.cc rename to programs/Hadrons/FermionAction.cc index 6e59aa57..0857008b 100644 --- a/programs/Hadrons/ModuleFactory.cc +++ b/programs/Hadrons/FermionAction.cc @@ -1,9 +1,9 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/ModuleFactory.cc +Source file: programs/Hadrons/FermionAction.cc -Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -25,53 +25,36 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; /****************************************************************************** - * ModuleFactory implementation * + * FermionAction implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -ModuleFactory::ModuleFactory(void) +FermionAction::FermionAction(const std::string name) +: name_(name) +{} + +// access ////////////////////////////////////////////////////////////////////// +std::string FermionAction::getName(void) const { + return name_; } -// registration //////////////////////////////////////////////////////////////// -void ModuleFactory::registerModule(const std::string type, - const FactoryFunc &f) +unsigned int FermionAction::getLs(void) const { - factory_[type] = f; + return 1; } -// get module list ///////////////////////////////////////////////////////////// -std::vector ModuleFactory::getModuleList(void) const +void FermionAction::setFMat(FMat *fMat) { - std::vector list; - - for (auto &f: factory_) - { - list.push_back(f.first); - } - - return list; + fMat_.reset(fMat); } -// factory ///////////////////////////////////////////////////////////////////// -std::unique_ptr ModuleFactory::create(const std::string type, - const std::string name) const +FermionAction::FMat * FermionAction::getFMat(void) { - FactoryFunc func; - - try - { - func = factory_.at(type); - } - catch (std::out_of_range) - { - HADRON_ERROR("module type '" + type + "' unknown"); - } - - return func(name); + return fMat_.get(); } diff --git a/programs/Hadrons/FermionAction.hpp b/programs/Hadrons/FermionAction.hpp new file mode 100644 index 00000000..f3cd1cf7 --- /dev/null +++ b/programs/Hadrons/FermionAction.hpp @@ -0,0 +1,83 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/FermionAction.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_FermionAction_hpp_ +#define Hadrons_FermionAction_hpp_ + +#include + +BEGIN_HADRONS_NAMESPACE + +// action registration macro +#define ACTION_REGISTER(action)\ +class action##ActionRegistrar\ +{\ +public:\ + action##ActionRegistrar(void)\ + {\ + FermionActionFactory &actionFac = FermionActionFactory::getInstance();\ + actionFac.registerBuilder(#action, [&](const std::string name)\ + {\ + return std::unique_ptr(\ + new action(name));\ + });\ + }\ +};\ +static action##ActionRegistrar action##ActionRegistrarInstance; + +/****************************************************************************** + * FermionAction * + ******************************************************************************/ +class Environment; + +class FermionAction +{ +public: + typedef FermionOperator FMat; + typedef std::unique_ptr FMatPt; +public: + // constructor + FermionAction(const std::string name); + // destructor + virtual ~FermionAction(void) = default; + // access + std::string getName(void) const; + virtual unsigned int getLs(void) const; + void setFMat(FMat *fMat); + FMat * getFMat(void); + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name) = 0; + // create operator + virtual void create(Environment &env) = 0; +private: + std::string name_; + FMatPt fMat_; +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_FermionAction_hpp_ diff --git a/programs/Hadrons/FermionActionFactory.hpp b/programs/Hadrons/FermionActionFactory.hpp new file mode 100644 index 00000000..d9522c31 --- /dev/null +++ b/programs/Hadrons/FermionActionFactory.hpp @@ -0,0 +1,47 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/FermionActionFactory.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_FermionActionFactory_hpp_ +#define Hadrons_FermionActionFactory_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * FermionActionFactory * + ******************************************************************************/ +class FermionActionFactory: public Factory +{ + SINGLETON_DEFCTOR(FermionActionFactory) +}; + +END_HADRONS_NAMESPACE + +#endif // Hadrons_FermionActionFactory_hpp_ diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index f364452e..39758b7e 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -49,7 +49,8 @@ public: #define LOG(channel) std::cout << HadronsLog##channel #define HADRON_ERROR(msg)\ -LOG(Error) << msg << std::endl;\ +LOG(Error) << msg << " (" << __FUNCTION__ << " at " << __FILE__ << ":"\ + << __LINE__ << ")" << std::endl;\ abort(); #define DEBUG_VAR(var) LOG(Debug) << #var << "= " << (var) << std::endl; @@ -72,6 +73,18 @@ public:\ private:\ name(void); +#define SINGLETON_DEFCTOR(name)\ +public:\ + name(const name &e) = delete;\ + void operator=(const name &e) = delete;\ + static name & getInstance(void)\ + {\ + static name e;\ + return e;\ + }\ +private:\ + name(void) = default; + END_HADRONS_NAMESPACE #endif // Hadrons_Global_hpp_ diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index a39fa927..575914e4 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -47,7 +47,9 @@ void MQuark::parseParameters(XmlReader &reader, const std::string name) // dependency relation std::vector MQuark::getInput(void) { - return std::vector(); + std::vector in = {par_.source, par_.solver}; + + return in; } std::vector MQuark::getOutput(void) @@ -57,14 +59,20 @@ std::vector MQuark::getOutput(void) return out; } +// setup /////////////////////////////////////////////////////////////////////// +void MQuark::setup(Environment &env) +{ + Ls_ = env.getFermionAction(par_.solver)->getLs(); +} + // allocation ////////////////////////////////////////////////////////////////// void MQuark::allocate(Environment &env) { env.addProp(getName()); quark_ = env.getProp(getName()); - if (par_.Ls > 1) + if (Ls_ > 1) { - env.addProp(getName() + "_5d", par_.Ls); + env.addProp(getName() + "_5d", Ls_); quark5d_ = env.getProp(getName() + "_5d"); } } @@ -72,22 +80,53 @@ void MQuark::allocate(Environment &env) // execution void MQuark::execute(Environment &env) { + LatticePropagator *fullSource; + LatticeFermion source(env.getGrid(Ls_)), sol(env.getGrid(Ls_)); + LOG(Message) << "computing quark propagator '" << getName() << "'" << std::endl; + if (!env.isProp5d(par_.source)) + { + if (Ls_ == 1) + { + fullSource = env.getProp(par_.source); + } + else + { + HADRON_ERROR("MQuark not implemented with 5D actions"); + } + } + else + { + if (Ls_ == 1) + { + HADRON_ERROR("MQuark not implemented with 5D actions"); + } + else if (Ls_ != env.getPropLs(par_.source)) + { + HADRON_ERROR("MQuark not implemented with 5D actions"); + } + else + { + fullSource = env.getProp(par_.source); + } + } - GridCartesian *g4d = env.get4dGrid(), - *g5d = env.get5dGrid(par_.Ls); - GridRedBlackCartesian *gRb4d = env.getRb4dGrid(), - *gRb5d = env.getRb5dGrid(par_.Ls); - LatticeGaugeField &Umu = *env.getGauge(); - LatticeFermion src(g5d); src=zero; - LatticeFermion result(g5d); result=zero; - - RealD mass=0.1; - RealD M5=1.8; - DomainWallFermionR Ddwf(Umu, *g5d, *gRb5d, *g4d, *gRb4d, mass, M5); - - ConjugateGradient CG(1.0e-8,10000); - SchurRedBlackDiagMooeeSolve SchurSolver(CG); - SchurSolver(Ddwf,src,result); + LOG(Message) << "inverting using solver '" << par_.solver + << "' on source '" << par_.source << "'" << std::endl; + for (unsigned int s = 0; s < Ns; ++s) + for (unsigned int c = 0; c < Nc; ++c) + { + PropToFerm(source, *fullSource, s, c); + sol = zero; + env.callSolver(par_.solver, sol, source); + if (Ls_ == 1) + { + FermToProp(*quark_, sol, s, c); + } + else + { + HADRON_ERROR("MQuark not implemented with 5D actions"); + } + } } diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index da0933e4..90e5f0e4 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -43,7 +43,8 @@ public: class Par: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, unsigned int, Ls); + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string , source, + std::string , solver); }; public: // constructor @@ -55,13 +56,17 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); + // setup + virtual void setup(Environment &env); // allocation virtual void allocate(Environment &env); // execution virtual void execute(Environment &env); private: - Par par_; - LatticePropagator *quark_{nullptr}, *quark5d_{nullptr}; + Par par_; + unsigned int Ls_; + LatticePropagator *source_{nullptr}, *quark_{nullptr}, *quark5d_{nullptr}; + Environment::Solver *solver_{nullptr}; }; MODULE_REGISTER(MQuark); diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc index f9b7f9d1..79cc899f 100644 --- a/programs/Hadrons/MSource.cc +++ b/programs/Hadrons/MSource.cc @@ -1,9 +1,141 @@ -// -// MSource.cpp -// Grid -// -// Created by Antonin Portelli on 16/04/2016. -// -// +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid -#include "MSource.hpp" +Source file: programs/Hadrons/MSource.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +#define ERROR_SUF " (source '" << getName() << "')" +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* MSource implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +MSource::MSource(const std::string name) +: Module(name) +{} + +// parse parameters +void MSource::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependency relation +std::vector MSource::getInput(void) +{ + return std::vector(); +} + +std::vector MSource::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void MSource::allocate(Environment &env) +{ + switch (par_.sourceType) + { + // 4D sources + case Grid::SourceType::point: + case Grid::SourceType::z2Band: + env.addProp(getName()); + src_ = env.getProp(getName()); + break; + // error + default: + HADRON_ERROR("no allocation implemented for source type '" + << par_.sourceType << "'" << ERROR_SUF); + break; + } +} + +// execution +#define ARG_CHECK(n)\ +if (par_.arguments.size() != (n))\ +{\ + HADRON_ERROR("source type '" << par_.sourceType << "' expect "\ + << (n) << " arguments (got "\ + << par_.arguments.size() << ")" << ERROR_SUF);\ +} + +void MSource::execute(Environment &env) +{ + LOG(Message) << "generating source '" << getName() << "' of type '" + << par_.sourceType << "'" << std::endl; + switch (par_.sourceType) + { + // point source + case Grid::SourceType::point: + { + ARG_CHECK(1); + + std::vector origin = strToVec(par_.arguments[0]); + SpinColourMatrix id(1.); + + if (origin.size() != Nd) + { + HADRON_ERROR("point source origin dimension different from " + << Nd << ERROR_SUF); + } + *src_ = zero; + pokeSite(id, *src_, origin); + + break; + } + // z2Band source + case Grid::SourceType::z2Band: + { + ARG_CHECK(2); + + int ta = std::stoi(par_.arguments[0]); + int tb = std::stoi(par_.arguments[1]); + Lattice> t(env.getGrid()); + LatticeComplex eta(env.getGrid()); + LatticeFermion phi(env.getGrid()); + ComplexD shift(1., 1.); + + LatticeCoordinate(t, Tp); + bernoulli(*env.get4dRng(), eta); + eta = (2.*eta - shift)*(1./::sqrt(2.)); + *src_ = 1.; + *src_ = where((t >= ta) and (t <= tb), (*src_)*eta, (*src_)*0.); + + break; + } + // error + default: + { + HADRON_ERROR("no definition implemented for source type '" + << par_.sourceType << "'" << ERROR_SUF); + break; + } + } +} diff --git a/programs/Hadrons/MSource.hpp b/programs/Hadrons/MSource.hpp index 1ba667e8..3bc901ad 100644 --- a/programs/Hadrons/MSource.hpp +++ b/programs/Hadrons/MSource.hpp @@ -1,14 +1,103 @@ -// -// MSource.hpp -// Grid -// -// Created by Antonin Portelli on 16/04/2016. -// -// +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid -#ifndef MSource_hpp -#define MSource_hpp +Source file: programs/Hadrons/MSource.hpp -#include +Copyright (C) 2016 -#endif /* MSource_hpp */ +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +/************ + * Sources * + ************ + + Description of all source types. + Convention: the discrete Heavyside function verifies theta(0) = 1. + + point: Point source + ------------------- + * src(x) = delta_x,o + + * arguments: o + - o: origin, space-separated integer sequence (e.g. "0 1 1 0") + + z2Band: Z_2 stochastic source + ----------------------------- + * src(x) = eta_x * theta(x_0 - ta) * theta(tb - x_0) + + * arguments: ta tb + - ta: begin timeslice (integer) + - tb: end timesilce (integer) + + */ + + +#ifndef Hadrons_MSource_hpp_ +#define Hadrons_MSource_hpp_ + +#include +#include +#include + +namespace Grid{ + GRID_SERIALIZABLE_ENUM(SourceType, undef, + point, 1, + z2Band, 2); +} + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Source module * + ******************************************************************************/ +class MSource: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, SourceType, sourceType, + std::vector, arguments); + }; +public: + // constructor + MSource(const std::string name); + // destructor + virtual ~MSource(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + Par par_; + LatticePropagator *src_{nullptr}; +}; + +MODULE_REGISTER(MSource); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_MSource_hpp_ diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index b907f8c8..41da337e 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -1,19 +1,31 @@ AM_CXXFLAGS = -I$(top_srcdir)/programs -I$(top_srcdir)/lib -AM_LDFLAGS = -L$(top_builddir)/lib +AM_LDFLAGS = -L$(top_builddir)/lib bin_PROGRAMS = Hadrons +## general sources Hadrons_SOURCES = \ Application.cc \ Environment.cc \ + FermionAction.cc\ Global.cc \ Hadrons.cc \ - Module.cc \ - ModuleFactory.cc + Module.cc +## fermion actions Hadrons_SOURCES += \ - MQuark.cc + AWilson.cc +## general modules +Hadrons_SOURCES += \ + MQuark.cc \ + MSource.cc + +## solver modules +Hadrons_SOURCES += \ + SRBPrecCG.cc + +## contraction modules Hadrons_SOURCES += \ CMeson.cc diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index a588ce97..1437046e 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -46,6 +46,7 @@ std::string Module::getName(void) const void Module::operator()(Environment &env) { + setup(env); allocate(env); if (!env.isDryRun()) { diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 67a201bc..4153e77b 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -35,19 +35,19 @@ BEGIN_HADRONS_NAMESPACE // module registration macro #define MODULE_REGISTER(mod)\ -class mod##Registrar\ +class mod##ModuleRegistrar\ {\ public:\ - mod##Registrar(void)\ + mod##ModuleRegistrar(void)\ {\ ModuleFactory &modFac = ModuleFactory::getInstance();\ - modFac.registerModule(#mod, [&](const std::string name)\ + modFac.registerBuilder(#mod, [&](const std::string name)\ {\ return std::unique_ptr(new mod(name));\ });\ }\ };\ -static mod##Registrar mod##RegistrarInstance; +static mod##ModuleRegistrar mod##ModuleRegistrarInstance; /****************************************************************************** * Module * @@ -66,8 +66,10 @@ public: // dependency relation virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; + // setup + virtual void setup(Environment &env) {}; // allocation - virtual void allocate(Environment &env) = 0; + virtual void allocate(Environment &env) {}; // execution void operator()(Environment &env); virtual void execute(Environment &env) = 0; diff --git a/programs/Hadrons/ModuleFactory.hpp b/programs/Hadrons/ModuleFactory.hpp index a959847f..263a0828 100644 --- a/programs/Hadrons/ModuleFactory.hpp +++ b/programs/Hadrons/ModuleFactory.hpp @@ -29,6 +29,7 @@ directory. #define Hadrons_ModuleFactory_hpp_ #include +#include #include BEGIN_HADRONS_NAMESPACE @@ -36,22 +37,9 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * ModuleFactory * ******************************************************************************/ -class ModuleFactory +class ModuleFactory: public Factory { - SINGLETON(ModuleFactory) -public: - typedef std::function(const std::string )> - FactoryFunc; -public: - // registration - void registerModule(const std::string type, const FactoryFunc &f); - // get module list - std::vector getModuleList(void) const; - // factory - std::unique_ptr create(const std::string type, - const std::string name) const; -private: - std::map factory_; + SINGLETON_DEFCTOR(ModuleFactory) }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/SRBPrecCG.cc b/programs/Hadrons/SRBPrecCG.cc new file mode 100644 index 00000000..22206ed3 --- /dev/null +++ b/programs/Hadrons/SRBPrecCG.cc @@ -0,0 +1,74 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/SRBPrecCG.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* SRBPrecCG implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +SRBPrecCG::SRBPrecCG(const std::string name) +: Module(name) +{} + +// parse parameters +void SRBPrecCG::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependency relation +std::vector SRBPrecCG::getInput(void) +{ + return std::vector(); +} + +std::vector SRBPrecCG::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// execution /////////////////////////////////////////////////////////////////// +void SRBPrecCG::execute(Environment &env) +{ + auto &mat = *(env.getFermionAction(par_.action)->getFMat()); + auto solver = [&mat, this](LatticeFermion &sol, + const LatticeFermion &source) + { + ConjugateGradient cg(par_.residual, 10000); + SchurRedBlackDiagMooeeSolve schurSolver(cg); + + schurSolver(mat, source, sol); + }; + + env.addSolver(getName(), solver, par_.action); +} diff --git a/programs/Hadrons/SRBPrecCG.hpp b/programs/Hadrons/SRBPrecCG.hpp new file mode 100644 index 00000000..1b072c37 --- /dev/null +++ b/programs/Hadrons/SRBPrecCG.hpp @@ -0,0 +1,69 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/SRBPrecCG.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_SRBPrecCG_hpp_ +#define Hadrons_SRBPrecCG_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * SRBPrecCG * + ******************************************************************************/ +class SRBPrecCG: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, action, + double , residual); + }; +public: + // constructor + SRBPrecCG(const std::string name); + // destructor + virtual ~SRBPrecCG(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // execution + virtual void execute(Environment &env); +private: + Par par_; +}; + +MODULE_REGISTER(SRBPrecCG); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_SRBPrecCG_hpp_ From 5e4b58ac40aca56e52d81b9ef0d1d57fd07d56f7 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 12:49:26 -0700 Subject: [PATCH 021/807] Hadrons: Z2 source expression fix --- programs/Hadrons/MSource.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc index 79cc899f..87e93b2d 100644 --- a/programs/Hadrons/MSource.cc +++ b/programs/Hadrons/MSource.cc @@ -119,14 +119,17 @@ void MSource::execute(Environment &env) int tb = std::stoi(par_.arguments[1]); Lattice> t(env.getGrid()); LatticeComplex eta(env.getGrid()); + LatticeComplex z(env.getGrid()), shift(env.getGrid()); LatticeFermion phi(env.getGrid()); - ComplexD shift(1., 1.); LatticeCoordinate(t, Tp); bernoulli(*env.get4dRng(), eta); - eta = (2.*eta - shift)*(1./::sqrt(2.)); - *src_ = 1.; - *src_ = where((t >= ta) and (t <= tb), (*src_)*eta, (*src_)*0.); + shift = ComplexD(1., 1.); + z = zero; + eta = (2.*eta - shift)*(1./::sqrt(2.)); + eta = where((t >= ta) and (t <= tb), eta, z); + *src_ = 1.; + *src_ *= eta; break; } From 7905c5b8e59a1ab92e086a5f1e6e0bde5cea8b61 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 14:49:45 -0700 Subject: [PATCH 022/807] Hadrons: Z2 source code fix --- programs/Hadrons/MSource.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc index 87e93b2d..f09c0b1d 100644 --- a/programs/Hadrons/MSource.cc +++ b/programs/Hadrons/MSource.cc @@ -119,17 +119,15 @@ void MSource::execute(Environment &env) int tb = std::stoi(par_.arguments[1]); Lattice> t(env.getGrid()); LatticeComplex eta(env.getGrid()); - LatticeComplex z(env.getGrid()), shift(env.getGrid()); LatticeFermion phi(env.getGrid()); + Complex shift(1., 1.); LatticeCoordinate(t, Tp); bernoulli(*env.get4dRng(), eta); - shift = ComplexD(1., 1.); - z = zero; - eta = (2.*eta - shift)*(1./::sqrt(2.)); - eta = where((t >= ta) and (t <= tb), eta, z); - *src_ = 1.; - *src_ *= eta; + eta = (2.*eta - shift)*(1./::sqrt(2.)); + eta = where((t >= ta) and (t <= tb), eta, 0.*eta); + *src_ = 1.; + *src_ = (*src_)*eta; break; } From 63b730de80b5e099211ab7964918f3e707ef64a4 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 14:50:57 -0700 Subject: [PATCH 023/807] Hadrons: for the moment, test with unit gauge --- programs/Hadrons/Application.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index af12d227..5cdb6ed2 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -189,7 +189,7 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; - env_.loadRandomGauge(); + env_.loadUnitGauge(); execute(program_); env_.freeAll(); } From 48fcc34d724386134b38cf57d280722fd348bd9f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 18:31:40 -0700 Subject: [PATCH 024/807] CMeson: first implementation, still need proper output --- programs/Hadrons/CMeson.cc | 31 +++++++++++++++++++++++++++++++ programs/Hadrons/CMeson.hpp | 6 ++++++ 2 files changed, 37 insertions(+) diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index 537f157f..c171fb95 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -64,4 +64,35 @@ void CMeson::execute(Environment &env) { LOG(Message) << "computing meson contraction '" << getName() << "'" << std::endl; + + XmlWriter writer(par_.output); + LatticePropagator &q1 = *env.getProp(par_.q1); + LatticePropagator &q2 = *env.getProp(par_.q2); + LatticeComplex c(env.getGrid()); + SpinMatrix g[Ns*Ns], g5; + std::vector buf; + Result result; + unsigned int nt = env.getGrid()->GlobalDimensions()[Tp]; + + g5 = makeGammaProd(Ns*Ns - 1); + result.corr.resize(Ns*Ns); + for (unsigned int i = 0; i < Ns*Ns; ++i) + { + g[i] = makeGammaProd(i); + } + for (unsigned int iSink = 0; iSink < Ns*Ns; ++iSink) + { + result.corr[iSink].resize(Ns*Ns); + for (unsigned int iSrc = 0; iSrc < Ns*Ns; ++iSrc) + { + c = trace(g[iSink]*q1*g[iSrc]*g5*adj(q2)*g5); + sliceSum(c, buf, Tp); + result.corr[iSink][iSrc].resize(buf.size()); + for (unsigned int t = 0; t < buf.size(); ++t) + { + result.corr[iSink][iSrc][t] = TensorRemove(buf[t]); + } + } + } + write(writer, "meson", result); } diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index 8725d938..5e18cfbf 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -48,6 +48,12 @@ public: std::string, q2, std::string, output); }; + class Result: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Result, + std::vector>>, corr); + }; public: // constructor CMeson(const std::string name); From 6e83b6a20382cf07d7e87761b05d2b75aadb6e91 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 2 May 2016 19:31:21 -0700 Subject: [PATCH 025/807] Hadrons: namespace reorganisation, now everything is in Grid::Hadrons, the 'using Grid::operator<<' statement is used to prevent a very nasty compilation error with GCC. --- programs/Hadrons/AWilson.cc | 1 + programs/Hadrons/Application.cc | 1 + programs/Hadrons/CMeson.cc | 3 ++- programs/Hadrons/Factory.hpp | 4 ++-- programs/Hadrons/FermionAction.cc | 1 + programs/Hadrons/Global.cc | 1 + programs/Hadrons/Global.hpp | 13 +++++++++---- programs/Hadrons/Graph.hpp | 4 ++-- programs/Hadrons/Hadrons.cc | 2 ++ programs/Hadrons/MQuark.cc | 1 + programs/Hadrons/MSource.cc | 2 ++ programs/Hadrons/Module.cc | 1 + programs/Hadrons/SRBPrecCG.cc | 1 + 13 files changed, 26 insertions(+), 9 deletions(-) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index 2f8483f3..f9de0926 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -29,6 +29,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 5cdb6ed2..1a24f8b6 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -29,6 +29,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index c171fb95..a6e958f9 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -28,6 +28,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** @@ -85,7 +86,7 @@ void CMeson::execute(Environment &env) result.corr[iSink].resize(Ns*Ns); for (unsigned int iSrc = 0; iSrc < Ns*Ns; ++iSrc) { - c = trace(g[iSink]*q1*g[iSrc]*g5*adj(q2)*g5); + c = trace(g[iSink]*q1*g[iSrc]*g5*adj(q2)*g5); sliceSum(c, buf, Tp); result.corr[iSink][iSrc].resize(buf.size()); for (unsigned int t = 0; t < buf.size(); ++t) diff --git a/programs/Hadrons/Factory.hpp b/programs/Hadrons/Factory.hpp index 2b219dcc..e609949a 100644 --- a/programs/Hadrons/Factory.hpp +++ b/programs/Hadrons/Factory.hpp @@ -47,7 +47,7 @@ public: virtual ~Factory(void) = default; // registration void registerBuilder(const std::string type, const Func &f); - // get module list + // get builder list std::vector getBuilderList(void) const; // factory std::unique_ptr create(const std::string type, @@ -91,7 +91,7 @@ std::unique_ptr Factory::create(const std::string type, { func = builder_.at(type); } - catch (std::out_of_range) + catch (std::out_of_range &) { HADRON_ERROR("object of type '" + type + "' unknown"); } diff --git a/programs/Hadrons/FermionAction.cc b/programs/Hadrons/FermionAction.cc index 0857008b..fdd9530c 100644 --- a/programs/Hadrons/FermionAction.cc +++ b/programs/Hadrons/FermionAction.cc @@ -28,6 +28,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index 18c3028e..6b855cda 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -28,6 +28,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; HadronsLogger Hadrons::HadronsLogError(1,"Error"); diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 39758b7e..f5a5c144 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -28,15 +28,20 @@ directory. #ifndef Hadrons_Global_hpp_ #define Hadrons_Global_hpp_ -#include #include #include +#include #define BEGIN_HADRONS_NAMESPACE \ +namespace Grid {\ +using namespace QCD;\ namespace Hadrons {\ -using namespace Grid;\ -using namespace QCD; -#define END_HADRONS_NAMESPACE } +using Grid::operator<<; +#define END_HADRONS_NAMESPACE }} + +/* the 'using Grid::operator<<;' statement prevents a very nasty compilation + * error with GCC (clang compiles fine without it). + */ BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 8b8afcc6..c7591350 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -105,8 +105,8 @@ private: void depthFirstSearch(void); void depthFirstSearch(const T &root); private: - std::map isMarked_; - std::set edgeSet_; + std::map isMarked_; + std::set edgeSet_; }; // build depedency matrix from topological sorts diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index 73ac03f9..da5e02b1 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -27,6 +27,8 @@ directory. #include +using namespace Grid; +using namespace QCD; using namespace Hadrons; int main(int argc, char *argv[]) diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index 575914e4..04f9042d 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -28,6 +28,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc index f09c0b1d..3897db7c 100644 --- a/programs/Hadrons/MSource.cc +++ b/programs/Hadrons/MSource.cc @@ -28,7 +28,9 @@ directory. #include #define ERROR_SUF " (source '" << getName() << "')" + using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index 1437046e..a590b81a 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -28,6 +28,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** diff --git a/programs/Hadrons/SRBPrecCG.cc b/programs/Hadrons/SRBPrecCG.cc index 22206ed3..ff4a50d5 100644 --- a/programs/Hadrons/SRBPrecCG.cc +++ b/programs/Hadrons/SRBPrecCG.cc @@ -28,6 +28,7 @@ directory. #include using namespace Grid; +using namespace QCD; using namespace Hadrons; /****************************************************************************** From 02ec23cdad924f77622080f6b8eaa8d5c7a8ad97 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 3 May 2016 16:30:29 -0700 Subject: [PATCH 026/807] Hadrons: Fermion actions and gauge fields are modules now --- programs/Hadrons/AWilson.cc | 30 +++++-- programs/Hadrons/AWilson.hpp | 20 +++-- programs/Hadrons/Application.cc | 26 +----- programs/Hadrons/Application.hpp | 2 - programs/Hadrons/CMeson.cc | 2 +- programs/Hadrons/CMeson.hpp | 2 +- programs/Hadrons/Environment.cc | 75 ++++++++++++----- programs/Hadrons/Environment.hpp | 26 +++--- programs/Hadrons/FermionAction.hpp | 83 ------------------- .../Hadrons/{FermionAction.cc => GUnit.cc} | 36 ++++---- .../{FermionActionFactory.hpp => GUnit.hpp} | 33 ++++++-- programs/Hadrons/MQuark.cc | 21 +++-- programs/Hadrons/MQuark.hpp | 2 +- programs/Hadrons/MSource.cc | 6 +- programs/Hadrons/MSource.hpp | 2 +- programs/Hadrons/Makefile.am | 23 ++--- programs/Hadrons/Module.hpp | 4 +- programs/Hadrons/SRBPrecCG.cc | 10 ++- programs/Hadrons/SRBPrecCG.hpp | 4 +- 19 files changed, 191 insertions(+), 216 deletions(-) delete mode 100644 programs/Hadrons/FermionAction.hpp rename programs/Hadrons/{FermionAction.cc => GUnit.cc} (59%) rename programs/Hadrons/{FermionActionFactory.hpp => GUnit.hpp} (64%) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index f9de0926..ad5cae2a 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -26,18 +26,16 @@ directory. *******************************************************************************/ #include -#include using namespace Grid; -using namespace QCD; using namespace Hadrons; /****************************************************************************** -* AWilson implementation * +* AWilson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// AWilson::AWilson(const std::string name) -: FermionAction(name) +: Module(name) {} // parse parameters //////////////////////////////////////////////////////////// @@ -46,12 +44,28 @@ void AWilson::parseParameters(XmlReader &reader, const std::string name) read(reader, name, par_); } -// create operator ///////////////////////////////////////////////////////////// -void AWilson::create(Environment &env) +// dependencies/products /////////////////////////////////////////////////////// +std::vector AWilson::getInput(void) { - auto &U = *env.getGauge(); + std::vector in = {par_.gauge}; + + return in; +} + +std::vector AWilson::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// execution /////////////////////////////////////////////////////////////////// +void AWilson::execute(Environment &env) +{ + auto &U = *env.getGauge(par_.gauge); auto &grid = *env.getGrid(); auto &gridRb = *env.getRbGrid(); - setFMat(new WilsonFermionR(U, grid, gridRb, par_.mass)); + env.addFermionMatrix(getName(), + new WilsonFermionR(U, grid, gridRb, par_.mass)); } diff --git a/programs/Hadrons/AWilson.hpp b/programs/Hadrons/AWilson.hpp index aa40b99d..cf21eff3 100644 --- a/programs/Hadrons/AWilson.hpp +++ b/programs/Hadrons/AWilson.hpp @@ -29,21 +29,22 @@ directory. #define Hadrons_AWilson_hpp_ #include -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * Wilson fermions * + * Wilson quark action * ******************************************************************************/ -class AWilson: public FermionAction +class AWilson: public Module { public: class Par: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, double, mass); + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, gauge, + double , mass); }; public: // constructor @@ -52,13 +53,16 @@ public: virtual ~AWilson(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); - // create operator - virtual void create(Environment &env); + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // execution + virtual void execute(Environment &env); private: Par par_; }; -ACTION_REGISTER(AWilson); +MODULE_REGISTER(AWilson); END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 1a24f8b6..d8b0d0da 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -39,17 +39,10 @@ using namespace Hadrons; Application::Application(const std::string parameterFileName) : parameterFileName_(parameterFileName) , env_(Environment::getInstance()) -, actionFactory_(FermionActionFactory::getInstance()) , modFactory_(ModuleFactory::getInstance()) { - LOG(Message) << "Fermion actions available:" << std::endl; - auto list = actionFactory_.getBuilderList(); - for (auto &m: list) - { - LOG(Message) << " " << m << std::endl; - } LOG(Message) << "Modules available:" << std::endl; - list = modFactory_.getBuilderList(); + auto list = modFactory_.getBuilderList(); for (auto &m: list) { LOG(Message) << " " << m << std::endl; @@ -84,18 +77,6 @@ void Application::parseParameterFile(void) LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl; read(reader, "parameters", par_); - push(reader, "actions"); - push(reader, "action"); - do - { - read(reader, "id", id); - env_.addFermionAction(actionFactory_.create(id.type, id.name)); - auto &action = *env_.getFermionAction(id.name); - action.parseParameters(reader, "options"); - action.create(env_); - } while (reader.nextElement("action")); - pop(reader); - pop(reader); push(reader, "modules"); push(reader, "module"); do @@ -190,7 +171,6 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; - env_.loadUnitGauge(); execute(program_); env_.freeAll(); } @@ -219,8 +199,8 @@ unsigned int Application::execute(const std::vector &program) } for (unsigned int i = 0; i < program.size(); ++i) { - LOG(Message) << "Measurement step (" << i+1 << "/" << program.size() - << ")" << std::endl; + LOG(Message) << "Measurement step " << i+1 << "/" << program.size() + << " (module '" << program[i] << "')" << std::endl; (*module_[program[i]])(env_); LOG(Message) << "allocated propagators: " << env_.nProp() << std::endl; if (env_.nProp() > memPeak) diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index a5e0e3c4..de788956 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -29,7 +29,6 @@ directory. #define Hadrons_Application_hpp_ #include -#include #include #include @@ -90,7 +89,6 @@ private: std::string parameterFileName_; GlobalPar par_; Environment &env_; - FermionActionFactory &actionFactory_; ModuleFactory &modFactory_; std::map> module_; std::map associatedModule_; diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index a6e958f9..eb746061 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -45,7 +45,7 @@ void CMeson::parseParameters(XmlReader &reader, const std::string name) read(reader, name, par_); } -// dependency relation ///////////////////////////////////////////////////////// +// dependencies/products /////////////////////////////////////////////////////// std::vector CMeson::getInput(void) { std::vector input = {par_.q1, par_.q2}; diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index 5e18cfbf..29620726 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -61,7 +61,7 @@ public: virtual ~CMeson(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); - // dependency relation + // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); // execution diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index ebd8d010..c72e1fca 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -42,8 +42,6 @@ Environment::Environment(void) GridDefaultMpi())); gridRb4d_.reset(SpaceTimeGrid::makeFourDimRedBlackGrid(grid4d_.get())); rng4d_.reset(new GridParallelRNG(grid4d_.get())); - gauge_.reset(new LatticeGaugeField(grid4d_.get())); - loadUnitGauge(); } // dry run ///////////////////////////////////////////////////////////////////// @@ -97,22 +95,22 @@ GridRedBlackCartesian * Environment::getRbGrid(const unsigned int Ls) const } // fermion actions ///////////////////////////////////////////////////////////// -void Environment::addFermionAction(FActionPt action) +void Environment::addFermionMatrix(const std::string name, FMat *fMat) { - fAction_[action->getName()] = std::move(action); + fMat_[name].reset(fMat); } -FermionAction * Environment::getFermionAction(const std::string name) const +Environment::FMat * Environment::getFermionMatrix(const std::string name) const { try { - return fAction_.at(name).get(); + return fMat_.at(name).get(); } catch(std::out_of_range &) { try { - return fAction_.at(solverAction_.at(name)).get(); + return fMat_.at(solverAction_.at(name)).get(); } catch (std::out_of_range &) { @@ -143,9 +141,9 @@ void Environment::callSolver(const std::string name, LatticeFermion &sol, } // quark propagators /////////////////////////////////////////////////////////// -void Environment::addProp(const std::string name, const unsigned int Ls) +void Environment::createProp(const std::string name, const unsigned int Ls) { - GridCartesian *p4 = grid4d_.get(); + GridCartesian *g4 = getGrid(); if (propExists(name)) { @@ -153,21 +151,21 @@ void Environment::addProp(const std::string name, const unsigned int Ls) } if (Ls > 1) { - GridCartesian *p; + GridCartesian *g; try { - p = grid5d_.at(Ls).get(); + g = grid5d_.at(Ls).get(); } catch(std::out_of_range &) { - grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, p4)); - gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, p4)); - p = grid5d_[Ls].get(); + grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g4)); + gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g4)); + g = grid5d_[Ls].get(); } if (!isDryRun()) { - prop_[name].reset(new LatticePropagator(p)); + prop_[name].reset(new LatticePropagator(g)); } else { @@ -179,7 +177,7 @@ void Environment::addProp(const std::string name, const unsigned int Ls) { if (!isDryRun()) { - prop_[name].reset(new LatticePropagator(p4)); + prop_[name].reset(new LatticePropagator(g4)); } else { @@ -269,19 +267,44 @@ unsigned int Environment::nProp(void) const } // gauge configuration ///////////////////////////////////////////////////////// -LatticeGaugeField * Environment::getGauge(void) const +void Environment::createGauge(const std::string name) { - return gauge_.get(); + if (gaugeExists(name)) + { + HADRON_ERROR("gauge field '" + name + "' already exists"); + } + gauge_[name].reset(new LatticeGaugeField(getGrid())); } -void Environment::loadUnitGauge(void) +void Environment::freeGauge(const std::string name) { - SU3::ColdConfiguration(*rng4d_, *gauge_); + if (gaugeExists(name)) + { + gauge_.erase(name); + } + else + { + HADRON_ERROR("trying to free unknown gauge field '" + name + "'"); + } } -void Environment::loadRandomGauge(void) +LatticeGaugeField * Environment::getGauge(const std::string name) const { - SU3::HotConfiguration(*rng4d_, *gauge_); + if (gaugeExists(name)) + { + return gauge_.at(name).get(); + } + else + { + HADRON_ERROR("gauge field '" + name + "' unknown"); + + return nullptr; + } +} + +bool Environment::gaugeExists(const std::string name) const +{ + return (gauge_.find(name) != gauge_.end()); } // random number generator ///////////////////////////////////////////////////// @@ -300,13 +323,19 @@ void Environment::free(const std::string name) { if (propExists(name)) { - LOG(Message) << "freeing '" << name << "'" << std::endl; + LOG(Message) << "freeing propagator '" << name << "'" << std::endl; freeProp(name); } + else if (gaugeExists(name)) + { + LOG(Message) << "freeing gauge field '" << name << "'" << std::endl; + freeGauge(name); + } } void Environment::freeAll(void) { prop_.clear(); propSize_.clear(); + gauge_.clear(); } diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 906c5aa1..91f0ec23 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -29,7 +29,6 @@ directory. #define Hadrons_Environment_hpp_ #include -#include BEGIN_HADRONS_NAMESPACE @@ -40,12 +39,13 @@ class Environment { SINGLETON(Environment); public: + typedef FermionOperator FMat; typedef std::function Solver; typedef std::unique_ptr GridPt; typedef std::unique_ptr GridRbPt; typedef std::unique_ptr RngPt; - typedef std::unique_ptr FActionPt; + typedef std::unique_ptr FMatPt; typedef std::unique_ptr PropPt; typedef std::unique_ptr GaugePt; public: @@ -56,8 +56,8 @@ public: GridCartesian * getGrid(const unsigned int Ls = 1) const; GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; // fermion actions - void addFermionAction(FActionPt action); - FermionAction * getFermionAction(const std::string name) const; + void addFermionMatrix(const std::string name, FMat *mat); + FMat * getFermionMatrix(const std::string name) const; // solvers void addSolver(const std::string name, Solver s, const std::string actionName); @@ -65,18 +65,19 @@ public: LatticeFermion &sol, const LatticeFermion &src) const; // quark propagators - void addProp(const std::string name, - const unsigned int Ls = 1); + void createProp(const std::string name, + const unsigned int Ls = 1); void freeProp(const std::string name); bool isProp5d(const std::string name) const; unsigned int getPropLs(const std::string name) const; LatticePropagator * getProp(const std::string name) const; bool propExists(const std::string name) const; unsigned int nProp(void) const; - // gauge configuration - LatticeGaugeField * getGauge(void) const; - void loadUnitGauge(void); - void loadRandomGauge(void); + // gauge configurations + void createGauge(const std::string name); + void freeGauge(const std::string name); + LatticeGaugeField * getGauge(const std::string name) const; + bool gaugeExists(const std::string name) const; // random number generator void setSeed(const std::vector &seed); GridParallelRNG * get4dRng(void) const; @@ -90,13 +91,12 @@ private: GridRbPt gridRb4d_; std::map gridRb5d_; RngPt rng4d_; - std::map fAction_; + std::map fMat_; std::map solver_; std::map solverAction_; std::map prop_; std::map propSize_; - GaugePt gauge_; - + std::map gauge_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/FermionAction.hpp b/programs/Hadrons/FermionAction.hpp deleted file mode 100644 index f3cd1cf7..00000000 --- a/programs/Hadrons/FermionAction.hpp +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/FermionAction.hpp - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#ifndef Hadrons_FermionAction_hpp_ -#define Hadrons_FermionAction_hpp_ - -#include - -BEGIN_HADRONS_NAMESPACE - -// action registration macro -#define ACTION_REGISTER(action)\ -class action##ActionRegistrar\ -{\ -public:\ - action##ActionRegistrar(void)\ - {\ - FermionActionFactory &actionFac = FermionActionFactory::getInstance();\ - actionFac.registerBuilder(#action, [&](const std::string name)\ - {\ - return std::unique_ptr(\ - new action(name));\ - });\ - }\ -};\ -static action##ActionRegistrar action##ActionRegistrarInstance; - -/****************************************************************************** - * FermionAction * - ******************************************************************************/ -class Environment; - -class FermionAction -{ -public: - typedef FermionOperator FMat; - typedef std::unique_ptr FMatPt; -public: - // constructor - FermionAction(const std::string name); - // destructor - virtual ~FermionAction(void) = default; - // access - std::string getName(void) const; - virtual unsigned int getLs(void) const; - void setFMat(FMat *fMat); - FMat * getFMat(void); - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name) = 0; - // create operator - virtual void create(Environment &env) = 0; -private: - std::string name_; - FMatPt fMat_; -}; - -END_HADRONS_NAMESPACE - -#endif // Hadrons_FermionAction_hpp_ diff --git a/programs/Hadrons/FermionAction.cc b/programs/Hadrons/GUnit.cc similarity index 59% rename from programs/Hadrons/FermionAction.cc rename to programs/Hadrons/GUnit.cc index fdd9530c..ce406612 100644 --- a/programs/Hadrons/FermionAction.cc +++ b/programs/Hadrons/GUnit.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/FermionAction.cc +Source file: programs/Hadrons/GUnit.cc Copyright (C) 2016 @@ -25,37 +25,41 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; -using namespace QCD; using namespace Hadrons; /****************************************************************************** - * FermionAction implementation * - ******************************************************************************/ +* GUnit implementation * +******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -FermionAction::FermionAction(const std::string name) -: name_(name) +GUnit::GUnit(const std::string name) +: Module(name) {} -// access ////////////////////////////////////////////////////////////////////// -std::string FermionAction::getName(void) const +// dependencies/products /////////////////////////////////////////////////////// +std::vector GUnit::getInput(void) { - return name_; + return std::vector(); } -unsigned int FermionAction::getLs(void) const +std::vector GUnit::getOutput(void) { - return 1; + std::vector out = {getName()}; + + return out; } -void FermionAction::setFMat(FMat *fMat) +// allocation ////////////////////////////////////////////////////////////////// +void GUnit::allocate(Environment &env) { - fMat_.reset(fMat); + env.createGauge(getName()); + gauge_ = env.getGauge(getName()); } -FermionAction::FMat * FermionAction::getFMat(void) +// execution /////////////////////////////////////////////////////////////////// +void GUnit::execute(Environment &env) { - return fMat_.get(); + SU3::ColdConfiguration(*env.get4dRng(), *gauge_); } diff --git a/programs/Hadrons/FermionActionFactory.hpp b/programs/Hadrons/GUnit.hpp similarity index 64% rename from programs/Hadrons/FermionActionFactory.hpp rename to programs/Hadrons/GUnit.hpp index d9522c31..21e9a15f 100644 --- a/programs/Hadrons/FermionActionFactory.hpp +++ b/programs/Hadrons/GUnit.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/FermionActionFactory.hpp +Source file: programs/Hadrons/GUnit.hpp Copyright (C) 2016 @@ -25,23 +25,38 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_FermionActionFactory_hpp_ -#define Hadrons_FermionActionFactory_hpp_ +#ifndef Hadrons_GUnit_hpp_ +#define Hadrons_GUnit_hpp_ #include -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * FermionActionFactory * + * Unit gauge * ******************************************************************************/ -class FermionActionFactory: public Factory +class GUnit: public Module { - SINGLETON_DEFCTOR(FermionActionFactory) +public: + // constructor + GUnit(const std::string name); + // destructor + virtual ~GUnit(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + LatticeGaugeField *gauge_ = nullptr; }; +MODULE_REGISTER(GUnit); + END_HADRONS_NAMESPACE -#endif // Hadrons_FermionActionFactory_hpp_ +#endif // Hadrons_GUnit_hpp_ diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index 04f9042d..b95493e7 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -39,13 +39,13 @@ MQuark::MQuark(const std::string name) : Module(name) {} -// parse parameters +// parse parameters //////////////////////////////////////////////////////////// void MQuark::parseParameters(XmlReader &reader, const std::string name) { read(reader, name, par_); } -// dependency relation +// dependencies/products /////////////////////////////////////////////////////// std::vector MQuark::getInput(void) { std::vector in = {par_.source, par_.solver}; @@ -63,22 +63,31 @@ std::vector MQuark::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void MQuark::setup(Environment &env) { - Ls_ = env.getFermionAction(par_.solver)->getLs(); + auto dim = env.getFermionMatrix(par_.solver)->Grid()->GlobalDimensions(); + + if (dim.size() == Nd) + { + Ls_ = 1; + } + else + { + Ls_ = dim[0]; + } } // allocation ////////////////////////////////////////////////////////////////// void MQuark::allocate(Environment &env) { - env.addProp(getName()); + env.createProp(getName()); quark_ = env.getProp(getName()); if (Ls_ > 1) { - env.addProp(getName() + "_5d", Ls_); + env.createProp(getName() + "_5d", Ls_); quark5d_ = env.getProp(getName() + "_5d"); } } -// execution +// execution /////////////////////////////////////////////////////////////////// void MQuark::execute(Environment &env) { LatticePropagator *fullSource; diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index 90e5f0e4..5b14d0aa 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -53,7 +53,7 @@ public: virtual ~MQuark(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); - // dependency relation + // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); // setup diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc index 3897db7c..923d5e94 100644 --- a/programs/Hadrons/MSource.cc +++ b/programs/Hadrons/MSource.cc @@ -41,13 +41,13 @@ MSource::MSource(const std::string name) : Module(name) {} -// parse parameters +// parse parameters //////////////////////////////////////////////////////////// void MSource::parseParameters(XmlReader &reader, const std::string name) { read(reader, name, par_); } -// dependency relation +// dependencies/products /////////////////////////////////////////////////////// std::vector MSource::getInput(void) { return std::vector(); @@ -68,7 +68,7 @@ void MSource::allocate(Environment &env) // 4D sources case Grid::SourceType::point: case Grid::SourceType::z2Band: - env.addProp(getName()); + env.createProp(getName()); src_ = env.getProp(getName()); break; // error diff --git a/programs/Hadrons/MSource.hpp b/programs/Hadrons/MSource.hpp index 3bc901ad..490be342 100644 --- a/programs/Hadrons/MSource.hpp +++ b/programs/Hadrons/MSource.hpp @@ -84,7 +84,7 @@ public: virtual ~MSource(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); - // dependency relation + // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 41da337e..499122ac 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -3,30 +3,33 @@ AM_LDFLAGS = -L$(top_builddir)/lib bin_PROGRAMS = Hadrons -## general sources +# general sources Hadrons_SOURCES = \ Application.cc \ Environment.cc \ - FermionAction.cc\ Global.cc \ Hadrons.cc \ Module.cc -## fermion actions -Hadrons_SOURCES += \ - AWilson.cc - -## general modules +# general modules Hadrons_SOURCES += \ MQuark.cc \ MSource.cc -## solver modules +# fermion actions Hadrons_SOURCES += \ - SRBPrecCG.cc + AWilson.cc -## contraction modules +# contraction modules Hadrons_SOURCES += \ CMeson.cc +# gauge modules +Hadrons_SOURCES += \ + GUnit.cc + +# solver modules +Hadrons_SOURCES += \ + SRBPrecCG.cc + Hadrons_LDADD = -lGrid diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 4153e77b..1f529944 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -62,8 +62,8 @@ public: // access std::string getName(void) const; // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name) = 0; - // dependency relation + virtual void parseParameters(XmlReader &reader, const std::string name) {}; + // dependencies/products virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; // setup diff --git a/programs/Hadrons/SRBPrecCG.cc b/programs/Hadrons/SRBPrecCG.cc index ff4a50d5..42ee332f 100644 --- a/programs/Hadrons/SRBPrecCG.cc +++ b/programs/Hadrons/SRBPrecCG.cc @@ -39,16 +39,18 @@ SRBPrecCG::SRBPrecCG(const std::string name) : Module(name) {} -// parse parameters +// parse parameters //////////////////////////////////////////////////////////// void SRBPrecCG::parseParameters(XmlReader &reader, const std::string name) { read(reader, name, par_); } -// dependency relation +// dependencies/products /////////////////////////////////////////////////////// std::vector SRBPrecCG::getInput(void) { - return std::vector(); + std::vector in = {par_.action}; + + return in; } std::vector SRBPrecCG::getOutput(void) @@ -61,7 +63,7 @@ std::vector SRBPrecCG::getOutput(void) // execution /////////////////////////////////////////////////////////////////// void SRBPrecCG::execute(Environment &env) { - auto &mat = *(env.getFermionAction(par_.action)->getFMat()); + auto &mat = *(env.getFermionMatrix(par_.action)); auto solver = [&mat, this](LatticeFermion &sol, const LatticeFermion &source) { diff --git a/programs/Hadrons/SRBPrecCG.hpp b/programs/Hadrons/SRBPrecCG.hpp index 1b072c37..f657bd50 100644 --- a/programs/Hadrons/SRBPrecCG.hpp +++ b/programs/Hadrons/SRBPrecCG.hpp @@ -35,7 +35,7 @@ directory. BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * SRBPrecCG * + * Schur red-black preconditioned CG * ******************************************************************************/ class SRBPrecCG: public Module { @@ -53,7 +53,7 @@ public: virtual ~SRBPrecCG(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); - // dependency relation + // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); // execution From 8b313a35ac76d0fe03460e4974bf64dc13ea7615 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 3 May 2016 17:07:00 -0700 Subject: [PATCH 027/807] Hadrons: random and NERSC gauge configurations --- programs/Hadrons/Application.cc | 1 + programs/Hadrons/Environment.cc | 11 +++++ programs/Hadrons/Environment.hpp | 4 ++ programs/Hadrons/GLoad.cc | 77 ++++++++++++++++++++++++++++++++ programs/Hadrons/GLoad.hpp | 71 +++++++++++++++++++++++++++++ programs/Hadrons/GRandom.cc | 65 +++++++++++++++++++++++++++ programs/Hadrons/GRandom.hpp | 62 +++++++++++++++++++++++++ programs/Hadrons/Makefile.am | 2 + 8 files changed, 293 insertions(+) create mode 100644 programs/Hadrons/GLoad.cc create mode 100644 programs/Hadrons/GLoad.hpp create mode 100644 programs/Hadrons/GRandom.cc create mode 100644 programs/Hadrons/GRandom.hpp diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index d8b0d0da..980a4cf5 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -171,6 +171,7 @@ void Application::configLoop(void) { LOG(Message) << "Starting measurement for trajectory " << t << std::endl; + env_.setTrajectory(t); execute(program_); env_.freeAll(); } diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index c72e1fca..9f572f17 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -55,6 +55,17 @@ bool Environment::isDryRun(void) const return dryRun_; } +// trajectory number /////////////////////////////////////////////////////////// +void Environment::setTrajectory(const unsigned int traj) +{ + traj_ = traj; +} + +unsigned int Environment::getTrajectory(void) const +{ + return traj_; +} + // grids /////////////////////////////////////////////////////////////////////// GridCartesian * Environment::getGrid(const unsigned int Ls) const { diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 91f0ec23..5a4c1e3f 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -52,6 +52,9 @@ public: // dry run void dryRun(const bool isDry); bool isDryRun(void) const; + // trajectory number + void setTrajectory(const unsigned int traj); + unsigned int getTrajectory(void) const; // grids GridCartesian * getGrid(const unsigned int Ls = 1) const; GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; @@ -86,6 +89,7 @@ public: void freeAll(void); private: bool dryRun_{false}; + unsigned int traj_; GridPt grid4d_; std::map grid5d_; GridRbPt gridRb4d_; diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/GLoad.cc new file mode 100644 index 00000000..2add8a11 --- /dev/null +++ b/programs/Hadrons/GLoad.cc @@ -0,0 +1,77 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GLoad.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* GLoad implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +GLoad::GLoad(const std::string name) +: Module(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void GLoad::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector GLoad::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector GLoad::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void GLoad::allocate(Environment &env) +{ + env.createGauge(getName()); + gauge_ = env.getGauge(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void GLoad::execute(Environment &env) +{ + NerscField header; + std::string fileName = par_.file + "." + + std::to_string(env.getTrajectory()); + + NerscIO::readConfiguration(*gauge_, header, fileName); +} diff --git a/programs/Hadrons/GLoad.hpp b/programs/Hadrons/GLoad.hpp new file mode 100644 index 00000000..a40ed2c2 --- /dev/null +++ b/programs/Hadrons/GLoad.hpp @@ -0,0 +1,71 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GLoad.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_GLoad_hpp_ +#define Hadrons_GLoad_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Load a NERSC configuration * + ******************************************************************************/ +class GLoad: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, file); + }; +public: + // constructor + GLoad(const std::string name); + // destructor + virtual ~GLoad(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + Par par_; + LatticeGaugeField *gauge_ = nullptr; +}; + +MODULE_REGISTER(GLoad); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_GLoad_hpp_ diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/GRandom.cc new file mode 100644 index 00000000..d39769a9 --- /dev/null +++ b/programs/Hadrons/GRandom.cc @@ -0,0 +1,65 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GRandom.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* GRandom implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +GRandom::GRandom(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector GRandom::getInput(void) +{ + return std::vector(); +} + +std::vector GRandom::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void GRandom::allocate(Environment &env) +{ + env.createGauge(getName()); + gauge_ = env.getGauge(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void GRandom::execute(Environment &env) +{ + SU3::HotConfiguration(*env.get4dRng(), *gauge_); +} diff --git a/programs/Hadrons/GRandom.hpp b/programs/Hadrons/GRandom.hpp new file mode 100644 index 00000000..18660bf9 --- /dev/null +++ b/programs/Hadrons/GRandom.hpp @@ -0,0 +1,62 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GRandom.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_GRandom_hpp_ +#define Hadrons_GRandom_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Random gauge * + ******************************************************************************/ +class GRandom: public Module +{ +public: + // constructor + GRandom(const std::string name); + // destructor + virtual ~GRandom(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + LatticeGaugeField *gauge_ = nullptr; +}; + +MODULE_REGISTER(GRandom); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_GRandom_hpp_ diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 499122ac..72f04612 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -26,6 +26,8 @@ Hadrons_SOURCES += \ # gauge modules Hadrons_SOURCES += \ + GLoad.cc \ + GRandom.cc \ GUnit.cc # solver modules From b865dd9da8bcb7d63649cffa1de2cb675dd4f163 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 3 May 2016 18:16:57 -0700 Subject: [PATCH 028/807] Hadrons: solver renaming --- programs/Hadrons/Makefile.am | 2 +- .../Hadrons/{SRBPrecCG.cc => SolRBPrecCG.cc} | 19 +++++++++++-------- .../{SRBPrecCG.hpp => SolRBPrecCG.hpp} | 16 ++++++++-------- 3 files changed, 20 insertions(+), 17 deletions(-) rename programs/Hadrons/{SRBPrecCG.cc => SolRBPrecCG.cc} (78%) rename programs/Hadrons/{SRBPrecCG.hpp => SolRBPrecCG.hpp} (87%) diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 72f04612..1c97305a 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -32,6 +32,6 @@ Hadrons_SOURCES += \ # solver modules Hadrons_SOURCES += \ - SRBPrecCG.cc + SolRBPrecCG.cc Hadrons_LDADD = -lGrid diff --git a/programs/Hadrons/SRBPrecCG.cc b/programs/Hadrons/SolRBPrecCG.cc similarity index 78% rename from programs/Hadrons/SRBPrecCG.cc rename to programs/Hadrons/SolRBPrecCG.cc index 42ee332f..250c81e6 100644 --- a/programs/Hadrons/SRBPrecCG.cc +++ b/programs/Hadrons/SolRBPrecCG.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SRBPrecCG.cc +Source file: programs/Hadrons/SolRBPrecCG.cc Copyright (C) 2016 @@ -25,35 +25,35 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; using namespace Hadrons; /****************************************************************************** -* SRBPrecCG implementation * +* SolRBPrecCG implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -SRBPrecCG::SRBPrecCG(const std::string name) +SolRBPrecCG::SolRBPrecCG(const std::string name) : Module(name) {} // parse parameters //////////////////////////////////////////////////////////// -void SRBPrecCG::parseParameters(XmlReader &reader, const std::string name) +void SolRBPrecCG::parseParameters(XmlReader &reader, const std::string name) { read(reader, name, par_); } // dependencies/products /////////////////////////////////////////////////////// -std::vector SRBPrecCG::getInput(void) +std::vector SolRBPrecCG::getInput(void) { std::vector in = {par_.action}; return in; } -std::vector SRBPrecCG::getOutput(void) +std::vector SolRBPrecCG::getOutput(void) { std::vector out = {getName()}; @@ -61,7 +61,7 @@ std::vector SRBPrecCG::getOutput(void) } // execution /////////////////////////////////////////////////////////////////// -void SRBPrecCG::execute(Environment &env) +void SolRBPrecCG::execute(Environment &env) { auto &mat = *(env.getFermionMatrix(par_.action)); auto solver = [&mat, this](LatticeFermion &sol, @@ -73,5 +73,8 @@ void SRBPrecCG::execute(Environment &env) schurSolver(mat, source, sol); }; + LOG(Message) << "setting up Schur red-black preconditioned CG for" + << " action '" << par_.action << "' with residual " + << par_.residual << std::endl; env.addSolver(getName(), solver, par_.action); } diff --git a/programs/Hadrons/SRBPrecCG.hpp b/programs/Hadrons/SolRBPrecCG.hpp similarity index 87% rename from programs/Hadrons/SRBPrecCG.hpp rename to programs/Hadrons/SolRBPrecCG.hpp index f657bd50..ca046efa 100644 --- a/programs/Hadrons/SRBPrecCG.hpp +++ b/programs/Hadrons/SolRBPrecCG.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SRBPrecCG.hpp +Source file: programs/Hadrons/SolRBPrecCG.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_SRBPrecCG_hpp_ -#define Hadrons_SRBPrecCG_hpp_ +#ifndef Hadrons_SolRBPrecCG_hpp_ +#define Hadrons_SolRBPrecCG_hpp_ #include #include @@ -37,7 +37,7 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Schur red-black preconditioned CG * ******************************************************************************/ -class SRBPrecCG: public Module +class SolRBPrecCG: public Module { public: class Par: Serializable @@ -48,9 +48,9 @@ public: }; public: // constructor - SRBPrecCG(const std::string name); + SolRBPrecCG(const std::string name); // destructor - virtual ~SRBPrecCG(void) = default; + virtual ~SolRBPrecCG(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); // dependencies/products @@ -62,8 +62,8 @@ private: Par par_; }; -MODULE_REGISTER(SRBPrecCG); +MODULE_REGISTER(SolRBPrecCG); END_HADRONS_NAMESPACE -#endif // Hadrons_SRBPrecCG_hpp_ +#endif // Hadrons_SolRBPrecCG_hpp_ From ba878724ce068cd8ed21acadea72312035307efe Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 3 May 2016 18:17:28 -0700 Subject: [PATCH 029/807] Hadrons: sources are now independent modules --- programs/Hadrons/MSource.cc | 144 ------------------ programs/Hadrons/Makefile.am | 8 +- programs/Hadrons/SrcPoint.cc | 80 ++++++++++ .../Hadrons/{MSource.hpp => SrcPoint.hpp} | 65 +++----- programs/Hadrons/SrcZ2.cc | 93 +++++++++++ programs/Hadrons/SrcZ2.hpp | 84 ++++++++++ 6 files changed, 285 insertions(+), 189 deletions(-) delete mode 100644 programs/Hadrons/MSource.cc create mode 100644 programs/Hadrons/SrcPoint.cc rename programs/Hadrons/{MSource.hpp => SrcPoint.hpp} (61%) create mode 100644 programs/Hadrons/SrcZ2.cc create mode 100644 programs/Hadrons/SrcZ2.hpp diff --git a/programs/Hadrons/MSource.cc b/programs/Hadrons/MSource.cc deleted file mode 100644 index 923d5e94..00000000 --- a/programs/Hadrons/MSource.cc +++ /dev/null @@ -1,144 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/MSource.cc - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -#define ERROR_SUF " (source '" << getName() << "')" - -using namespace Grid; -using namespace QCD; -using namespace Hadrons; - -/****************************************************************************** -* MSource implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -MSource::MSource(const std::string name) -: Module(name) -{} - -// parse parameters //////////////////////////////////////////////////////////// -void MSource::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector MSource::getInput(void) -{ - return std::vector(); -} - -std::vector MSource::getOutput(void) -{ - std::vector out = {getName()}; - - return out; -} - -// allocation ////////////////////////////////////////////////////////////////// -void MSource::allocate(Environment &env) -{ - switch (par_.sourceType) - { - // 4D sources - case Grid::SourceType::point: - case Grid::SourceType::z2Band: - env.createProp(getName()); - src_ = env.getProp(getName()); - break; - // error - default: - HADRON_ERROR("no allocation implemented for source type '" - << par_.sourceType << "'" << ERROR_SUF); - break; - } -} - -// execution -#define ARG_CHECK(n)\ -if (par_.arguments.size() != (n))\ -{\ - HADRON_ERROR("source type '" << par_.sourceType << "' expect "\ - << (n) << " arguments (got "\ - << par_.arguments.size() << ")" << ERROR_SUF);\ -} - -void MSource::execute(Environment &env) -{ - LOG(Message) << "generating source '" << getName() << "' of type '" - << par_.sourceType << "'" << std::endl; - switch (par_.sourceType) - { - // point source - case Grid::SourceType::point: - { - ARG_CHECK(1); - - std::vector origin = strToVec(par_.arguments[0]); - SpinColourMatrix id(1.); - - if (origin.size() != Nd) - { - HADRON_ERROR("point source origin dimension different from " - << Nd << ERROR_SUF); - } - *src_ = zero; - pokeSite(id, *src_, origin); - - break; - } - // z2Band source - case Grid::SourceType::z2Band: - { - ARG_CHECK(2); - - int ta = std::stoi(par_.arguments[0]); - int tb = std::stoi(par_.arguments[1]); - Lattice> t(env.getGrid()); - LatticeComplex eta(env.getGrid()); - LatticeFermion phi(env.getGrid()); - Complex shift(1., 1.); - - LatticeCoordinate(t, Tp); - bernoulli(*env.get4dRng(), eta); - eta = (2.*eta - shift)*(1./::sqrt(2.)); - eta = where((t >= ta) and (t <= tb), eta, 0.*eta); - *src_ = 1.; - *src_ = (*src_)*eta; - - break; - } - // error - default: - { - HADRON_ERROR("no definition implemented for source type '" - << par_.sourceType << "'" << ERROR_SUF); - break; - } - } -} diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 1c97305a..2d1b5980 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -13,8 +13,7 @@ Hadrons_SOURCES = \ # general modules Hadrons_SOURCES += \ - MQuark.cc \ - MSource.cc + MQuark.cc # fermion actions Hadrons_SOURCES += \ @@ -34,4 +33,9 @@ Hadrons_SOURCES += \ Hadrons_SOURCES += \ SolRBPrecCG.cc +# source modules +Hadrons_SOURCES += \ + SrcPoint.cc \ + SrcZ2.cc + Hadrons_LDADD = -lGrid diff --git a/programs/Hadrons/SrcPoint.cc b/programs/Hadrons/SrcPoint.cc new file mode 100644 index 00000000..b5329091 --- /dev/null +++ b/programs/Hadrons/SrcPoint.cc @@ -0,0 +1,80 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/SrcPoint.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* SrcPoint implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +SrcPoint::SrcPoint(const std::string name) +: Module(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void SrcPoint::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector SrcPoint::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector SrcPoint::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void SrcPoint::allocate(Environment &env) +{ + env.createProp(getName()); + src_ = env.getProp(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void SrcPoint::execute(Environment &env) +{ + std::vector position = strToVec(par_.position); + SpinColourMatrix id; + + LOG(Message) << "creating point source at position [" << par_.position + << "]" << std::endl; + id = 1.; + *src_ = zero; + pokeSite(id, *src_, position); +} diff --git a/programs/Hadrons/MSource.hpp b/programs/Hadrons/SrcPoint.hpp similarity index 61% rename from programs/Hadrons/MSource.hpp rename to programs/Hadrons/SrcPoint.hpp index 490be342..5cde676e 100644 --- a/programs/Hadrons/MSource.hpp +++ b/programs/Hadrons/SrcPoint.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/MSource.hpp +Source file: programs/Hadrons/SrcPoint.hpp Copyright (C) 2016 @@ -25,66 +25,45 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -/************ - * Sources * - ************ - - Description of all source types. - Convention: the discrete Heavyside function verifies theta(0) = 1. - - point: Point source - ------------------- - * src(x) = delta_x,o - - * arguments: o - - o: origin, space-separated integer sequence (e.g. "0 1 1 0") - - z2Band: Z_2 stochastic source - ----------------------------- - * src(x) = eta_x * theta(x_0 - ta) * theta(tb - x_0) - - * arguments: ta tb - - ta: begin timeslice (integer) - - tb: end timesilce (integer) - - */ - - -#ifndef Hadrons_MSource_hpp_ -#define Hadrons_MSource_hpp_ +#ifndef Hadrons_SrcPoint_hpp_ +#define Hadrons_SrcPoint_hpp_ #include #include #include -namespace Grid{ - GRID_SERIALIZABLE_ENUM(SourceType, undef, - point, 1, - z2Band, 2); -} - BEGIN_HADRONS_NAMESPACE +/* + + Point source + ------------ + * src_x = delta_x,o + + * options: o + - position: space-separated integer sequence (e.g. "0 1 1 0") + + */ + /****************************************************************************** - * Source module * + * SrcPoint * ******************************************************************************/ -class MSource: public Module +class SrcPoint: public Module { public: class Par: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, SourceType, sourceType, - std::vector, arguments); + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, position); }; public: // constructor - MSource(const std::string name); + SrcPoint(const std::string name); // destructor - virtual ~MSource(void) = default; + virtual ~SrcPoint(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); - // dependencies/products + // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation @@ -96,8 +75,8 @@ private: LatticePropagator *src_{nullptr}; }; -MODULE_REGISTER(MSource); +MODULE_REGISTER(SrcPoint); END_HADRONS_NAMESPACE -#endif // Hadrons_MSource_hpp_ +#endif // Hadrons_SrcPoint_hpp_ diff --git a/programs/Hadrons/SrcZ2.cc b/programs/Hadrons/SrcZ2.cc new file mode 100644 index 00000000..e050d6c4 --- /dev/null +++ b/programs/Hadrons/SrcZ2.cc @@ -0,0 +1,93 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/SrcZ2.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* SrcZ2 implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +SrcZ2::SrcZ2(const std::string name) +: Module(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void SrcZ2::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector SrcZ2::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector SrcZ2::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// allocation ////////////////////////////////////////////////////////////////// +void SrcZ2::allocate(Environment &env) +{ + env.createProp(getName()); + src_ = env.getProp(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void SrcZ2::execute(Environment &env) +{ + Lattice> t(env.getGrid()); + LatticeComplex eta(env.getGrid()); + LatticeFermion phi(env.getGrid()); + Complex shift(1., 1.); + + if (par_.tA == par_.tB) + { + LOG(Message) << "generating Z_2 wall source at t= " << par_.tA + << std::endl; + } + else + { + LOG(Message) << "generating Z_2 band for " << par_.tA << " <= t <= " + << par_.tB << std::endl; + } + LatticeCoordinate(t, Tp); + bernoulli(*env.get4dRng(), eta); + eta = (2.*eta - shift)*(1./::sqrt(2.)); + eta = where((t >= par_.tA) and (t <= par_.tB), eta, 0.*eta); + *src_ = 1.; + *src_ = (*src_)*eta; +} diff --git a/programs/Hadrons/SrcZ2.hpp b/programs/Hadrons/SrcZ2.hpp new file mode 100644 index 00000000..09248e66 --- /dev/null +++ b/programs/Hadrons/SrcZ2.hpp @@ -0,0 +1,84 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/SrcZ2.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_SrcZ2_hpp_ +#define Hadrons_SrcZ2_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/* + + Z_2 stochastic source + ----------------------------- + * src_x = eta_x * theta(x_3 - ta) * theta(tb - x_3) + + * options: + - tA: begin timeslice (integer) + - tB: end timesilce (integer) + + */ + +/****************************************************************************** + * SrcZ2 * + ******************************************************************************/ +class SrcZ2: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, unsigned int, tA, + unsigned int, tB); + }; +public: + // constructor + SrcZ2(const std::string name); + // destructor + virtual ~SrcZ2(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // allocation + virtual void allocate(Environment &env); + // execution + virtual void execute(Environment &env); +private: + Par par_; + LatticePropagator *src_; +}; + +MODULE_REGISTER(SrcZ2); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_SrcZ2_hpp_ From 798d8f7340b3d2050fc1066c2938480668217165 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 3 May 2016 18:17:58 -0700 Subject: [PATCH 030/807] Hadrons: Modules: better log messages --- programs/Hadrons/AWilson.cc | 2 ++ programs/Hadrons/CMeson.cc | 3 ++- programs/Hadrons/GLoad.cc | 2 ++ programs/Hadrons/GRandom.cc | 1 + programs/Hadrons/GUnit.cc | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index ad5cae2a..c9ecc701 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -66,6 +66,8 @@ void AWilson::execute(Environment &env) auto &grid = *env.getGrid(); auto &gridRb = *env.getRbGrid(); + LOG(Message) << "setting up Wilson fermion matrix with m= " << par_.mass + << " using gauge field '" << par_.gauge << "'" << std::endl; env.addFermionMatrix(getName(), new WilsonFermionR(U, grid, gridRb, par_.mass)); } diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index eb746061..3683d8e8 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -63,7 +63,8 @@ std::vector CMeson::getOutput(void) // execution /////////////////////////////////////////////////////////////////// void CMeson::execute(Environment &env) { - LOG(Message) << "computing meson contraction '" << getName() << "'" + LOG(Message) << "computing meson contraction '" << getName() << "' using" + << " quarks '" << par_.q1 << " and '" << par_.q2 << "'" << std::endl; XmlWriter writer(par_.output); diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/GLoad.cc index 2add8a11..756c4f29 100644 --- a/programs/Hadrons/GLoad.cc +++ b/programs/Hadrons/GLoad.cc @@ -73,5 +73,7 @@ void GLoad::execute(Environment &env) std::string fileName = par_.file + "." + std::to_string(env.getTrajectory()); + LOG(Message) << "loading NERSC configuration from file '" << fileName + << "'" << std::endl; NerscIO::readConfiguration(*gauge_, header, fileName); } diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/GRandom.cc index d39769a9..d6bb381f 100644 --- a/programs/Hadrons/GRandom.cc +++ b/programs/Hadrons/GRandom.cc @@ -61,5 +61,6 @@ void GRandom::allocate(Environment &env) // execution /////////////////////////////////////////////////////////////////// void GRandom::execute(Environment &env) { + LOG(Message) << "generating random gauge configuration" << std::endl; SU3::HotConfiguration(*env.get4dRng(), *gauge_); } diff --git a/programs/Hadrons/GUnit.cc b/programs/Hadrons/GUnit.cc index ce406612..330b09e4 100644 --- a/programs/Hadrons/GUnit.cc +++ b/programs/Hadrons/GUnit.cc @@ -61,5 +61,6 @@ void GUnit::allocate(Environment &env) // execution /////////////////////////////////////////////////////////////////// void GUnit::execute(Environment &env) { + LOG(Message) << "creating unit gauge configuration" << std::endl; SU3::ColdConfiguration(*env.get4dRng(), *gauge_); } From 3aa6463ede21b9f74429653c9261de400d02b113 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 4 May 2016 12:17:27 -0700 Subject: [PATCH 031/807] Hadrons: general lattice store & a lot of code cleaning --- programs/Hadrons/AWilson.cc | 5 +- programs/Hadrons/Application.cc | 60 ++++++- programs/Hadrons/Application.hpp | 3 + programs/Hadrons/CMeson.cc | 6 +- programs/Hadrons/Environment.cc | 262 ++++++++++--------------------- programs/Hadrons/Environment.hpp | 104 +++++++++--- programs/Hadrons/GLoad.cc | 8 +- programs/Hadrons/GRandom.cc | 6 +- programs/Hadrons/GUnit.cc | 6 +- programs/Hadrons/MQuark.cc | 20 +-- programs/Hadrons/SrcPoint.cc | 6 +- programs/Hadrons/SrcZ2.cc | 8 +- 12 files changed, 256 insertions(+), 238 deletions(-) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index c9ecc701..f4fb3dc9 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -62,12 +62,13 @@ std::vector AWilson::getOutput(void) // execution /////////////////////////////////////////////////////////////////// void AWilson::execute(Environment &env) { - auto &U = *env.getGauge(par_.gauge); + auto &U = *env.get(par_.gauge); auto &grid = *env.getGrid(); auto &gridRb = *env.getRbGrid(); - LOG(Message) << "setting up Wilson fermion matrix with m= " << par_.mass + LOG(Message) << "Setting up Wilson fermion matrix with m= " << par_.mass << " using gauge field '" << par_.gauge << "'" << std::endl; env.addFermionMatrix(getName(), new WilsonFermionR(U, grid, gridRb, par_.mass)); + LOG(Message) << sizeof(*env.getFermionMatrix(getName())) << std::endl; } diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 980a4cf5..531ad875 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -47,6 +47,16 @@ Application::Application(const std::string parameterFileName) { LOG(Message) << " " << m << std::endl; } + auto dim = GridDefaultLatt(), mpi = GridDefaultMpi(), loc(dim); + locVol_ = 1; + for (unsigned int d = 0; d < dim.size(); ++d) + { + loc[d] /= mpi[d]; + locVol_ *= loc[d]; + } + LOG(Message) << "Global lattice: " << dim << std::endl; + LOG(Message) << "MPI partition : " << mpi << std::endl; + LOG(Message) << "Local lattice : " << loc << std::endl; } // destructor ////////////////////////////////////////////////////////////////// @@ -169,8 +179,8 @@ void Application::configLoop(void) for (unsigned int t = range.start; t < range.end; t += range.step) { - LOG(Message) << "Starting measurement for trajectory " << t - << std::endl; + LOG(Message) << "========== Starting measurement for trajectory " << t + << " ==========" << std::endl; env_.setTrajectory(t); execute(program_); env_.freeAll(); @@ -179,7 +189,7 @@ void Application::configLoop(void) unsigned int Application::execute(const std::vector &program) { - unsigned int memPeak = 0; + unsigned int memPeak = 0, size; std::vector> freeProg; freeProg.resize(program.size()); @@ -200,19 +210,53 @@ unsigned int Application::execute(const std::vector &program) } for (unsigned int i = 0; i < program.size(); ++i) { - LOG(Message) << "Measurement step " << i+1 << "/" << program.size() - << " (module '" << program[i] << "')" << std::endl; + LOG(Message) << "---------- Measurement step " << i+1 << "/" + << program.size() << " (module '" << program[i] << "')" + << " ----------" << std::endl; (*module_[program[i]])(env_); - LOG(Message) << "allocated propagators: " << env_.nProp() << std::endl; - if (env_.nProp() > memPeak) + size = env_.getTotalSize(); + LOG(Message) << "Allocated objects: " << sizeString(size*locVol_) + << " (" << sizeString(size) << "/site)" << std::endl; + if (size > memPeak) { - memPeak = env_.nProp(); + memPeak = size; } + LOG(Message) << "Garbage collection..." << std::endl; for (auto &n: freeProg[i]) { env_.free(n); } + size = env_.getTotalSize(); + LOG(Message) << "Allocated objects: " << sizeString(size*locVol_) + << " (" << sizeString(size) << "/site)" << std::endl; } return memPeak; } + +// pretty size formatting ////////////////////////////////////////////////////// +std::string Application::sizeString(long unsigned int bytes) + +{ + constexpr unsigned int bufSize = 256; + const char *suffixes[7] = {"", "K", "M", "G", "T", "P", "E"}; + char buf[256]; + long unsigned int s = 0; + double count = bytes; + + while (count >= 1024 && s < 7) + { + s++; + count /= 1024; + } + if (count - floor(count) == 0.0) + { + snprintf(buf, bufSize, "%d %sB", (int)count, suffixes[s]); + } + else + { + snprintf(buf, bufSize, "%.1f %sB", count, suffixes[s]); + } + + return std::string(buf); +} diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index de788956..518b29ca 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -85,7 +85,10 @@ private: // program execution void configLoop(void); unsigned int execute(const std::vector &program); + // pretty size formatting + std::string sizeString(long unsigned int bytes); private: + long unsigned int locVol_; std::string parameterFileName_; GlobalPar par_; Environment &env_; diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index 3683d8e8..194da413 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -63,13 +63,13 @@ std::vector CMeson::getOutput(void) // execution /////////////////////////////////////////////////////////////////// void CMeson::execute(Environment &env) { - LOG(Message) << "computing meson contraction '" << getName() << "' using" + LOG(Message) << "Computing meson contraction '" << getName() << "' using" << " quarks '" << par_.q1 << " and '" << par_.q2 << "'" << std::endl; XmlWriter writer(par_.output); - LatticePropagator &q1 = *env.getProp(par_.q1); - LatticePropagator &q2 = *env.getProp(par_.q2); + LatticePropagator &q1 = *env.get(par_.q1); + LatticePropagator &q2 = *env.get(par_.q2); LatticeComplex c(env.getGrid()); SpinMatrix g[Ns*Ns], g5; std::vector buf; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 9f572f17..a82e4c80 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -151,173 +151,6 @@ void Environment::callSolver(const std::string name, LatticeFermion &sol, } } -// quark propagators /////////////////////////////////////////////////////////// -void Environment::createProp(const std::string name, const unsigned int Ls) -{ - GridCartesian *g4 = getGrid(); - - if (propExists(name)) - { - HADRON_ERROR("propagator '" + name + "' already exists"); - } - if (Ls > 1) - { - GridCartesian *g; - - try - { - g = grid5d_.at(Ls).get(); - } - catch(std::out_of_range &) - { - grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g4)); - gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g4)); - g = grid5d_[Ls].get(); - } - if (!isDryRun()) - { - prop_[name].reset(new LatticePropagator(g)); - } - else - { - prop_[name].reset(nullptr); - } - propSize_[name] = Ls; - } - else - { - if (!isDryRun()) - { - prop_[name].reset(new LatticePropagator(g4)); - } - else - { - prop_[name].reset(nullptr); - } - propSize_[name] = 1; - } -} - -void Environment::freeProp(const std::string name) -{ - if (propExists(name)) - { - prop_.erase(name); - propSize_.erase(name); - } - else - { - HADRON_ERROR("trying to free unknown propagator '" + name + "'"); - } -} - -bool Environment::isProp5d(const std::string name) const -{ - if (propExists(name)) - { - return (getProp(name)->_grid->GlobalDimensions().size() == Nd + 1); - } - else - { - HADRON_ERROR("propagator '" + name + "' unknown"); - - return false; - } -} - -unsigned int Environment::getPropLs(const std::string name) const -{ - if (propExists(name)) - { - if (isProp5d(name)) - { - return getProp(name)->_grid->GlobalDimensions()[0]; - } - else - { - return 1; - } - } - else - { - HADRON_ERROR("propagator '" + name + "' unknown"); - - return 0; - } -} - -LatticePropagator * Environment::getProp(const std::string name) const -{ - if (propExists(name)) - { - return prop_.at(name).get(); - } - else - { - HADRON_ERROR("propagator '" + name + "' unknown"); - - return nullptr; - } -} - -bool Environment::propExists(const std::string name) const -{ - return (prop_.find(name) != prop_.end()); -} - -unsigned int Environment::nProp(void) const -{ - unsigned int size = 0; - - for (auto &s: propSize_) - { - size += s.second; - } - - return size; -} - -// gauge configuration ///////////////////////////////////////////////////////// -void Environment::createGauge(const std::string name) -{ - if (gaugeExists(name)) - { - HADRON_ERROR("gauge field '" + name + "' already exists"); - } - gauge_[name].reset(new LatticeGaugeField(getGrid())); -} - -void Environment::freeGauge(const std::string name) -{ - if (gaugeExists(name)) - { - gauge_.erase(name); - } - else - { - HADRON_ERROR("trying to free unknown gauge field '" + name + "'"); - } -} - -LatticeGaugeField * Environment::getGauge(const std::string name) const -{ - if (gaugeExists(name)) - { - return gauge_.at(name).get(); - } - else - { - HADRON_ERROR("gauge field '" + name + "' unknown"); - - return nullptr; - } -} - -bool Environment::gaugeExists(const std::string name) const -{ - return (gauge_.find(name) != gauge_.end()); -} - // random number generator ///////////////////////////////////////////////////// void Environment::setSeed(const std::vector &seed) { @@ -329,24 +162,95 @@ GridParallelRNG * Environment::get4dRng(void) const return rng4d_.get(); } -// general free //////////////////////////////////////////////////////////////// +// data store ////////////////////////////////////////////////////////////////// +void Environment::freeLattice(const std::string name) +{ + if (hasLattice(name)) + { + LOG(Message) << "freeing lattice '" << name << "'" << std::endl; + lattice_.erase(name); + objectSize_.erase(name); + } + else + { + HADRON_ERROR("trying to free undefined lattice '" + name + "'"); + } +} + +bool Environment::hasLattice(const std::string name) const +{ + return (lattice_.find(name) != lattice_.end()); +} + + +bool Environment::isLattice5d(const std::string name) const +{ + if (hasLattice(name)) + { + return (lattice_.at(name)->_grid->GlobalDimensions().size() == Nd + 1); + } + else + { + HADRON_ERROR("object '" + name + "' undefined"); + + return false; + } +} + +unsigned int Environment::getLatticeLs(const std::string name) const +{ + if (isLattice5d(name)) + { + return lattice_.at(name)->_grid->GlobalDimensions()[0]; + } + else + { + return 1; + } +} + +// general memory management /////////////////////////////////////////////////// void Environment::free(const std::string name) { - if (propExists(name)) + if (hasLattice(name)) { - LOG(Message) << "freeing propagator '" << name << "'" << std::endl; - freeProp(name); - } - else if (gaugeExists(name)) - { - LOG(Message) << "freeing gauge field '" << name << "'" << std::endl; - freeGauge(name); + freeLattice(name); } } void Environment::freeAll(void) { - prop_.clear(); - propSize_.clear(); - gauge_.clear(); + lattice_.clear(); + objectSize_.clear(); +} + +void Environment::addSize(const std::string name, const unsigned int size) +{ + objectSize_[name] = size; +} + +unsigned int Environment::getSize(const std::string name) const +{ + if (hasLattice(name)) + { + return objectSize_.at(name); + } + else + { + HADRON_ERROR("object '" + name + "' undefined"); + + return 0; + } +} + +long unsigned int Environment::getTotalSize(void) const +{ + long unsigned int size = 0; + + for (auto &s: objectSize_) + { + size += s.second; + } + + return size; } diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 5a4c1e3f..628d9831 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -46,8 +46,7 @@ public: typedef std::unique_ptr GridRbPt; typedef std::unique_ptr RngPt; typedef std::unique_ptr FMatPt; - typedef std::unique_ptr PropPt; - typedef std::unique_ptr GaugePt; + typedef std::unique_ptr LatticePt; public: // dry run void dryRun(const bool isDry); @@ -67,26 +66,27 @@ public: void callSolver(const std::string name, LatticeFermion &sol, const LatticeFermion &src) const; - // quark propagators - void createProp(const std::string name, - const unsigned int Ls = 1); - void freeProp(const std::string name); - bool isProp5d(const std::string name) const; - unsigned int getPropLs(const std::string name) const; - LatticePropagator * getProp(const std::string name) const; - bool propExists(const std::string name) const; - unsigned int nProp(void) const; - // gauge configurations - void createGauge(const std::string name); - void freeGauge(const std::string name); - LatticeGaugeField * getGauge(const std::string name) const; - bool gaugeExists(const std::string name) const; // random number generator void setSeed(const std::vector &seed); GridParallelRNG * get4dRng(void) const; - // general free + // lattice store + template + void create(const std::string name, + const unsigned int Ls = 1); + template + T * get(const std::string name) const; + void freeLattice(const std::string name); + bool hasLattice(const std::string name) const; + + bool isLattice5d(const std::string name) const; + unsigned int getLatticeLs(const std::string name) const; + // general memory management void free(const std::string name); void freeAll(void); + void addSize(const std::string name, + const unsigned int size); + unsigned int getSize(const std::string name) const; + long unsigned int getTotalSize(void) const; private: bool dryRun_{false}; unsigned int traj_; @@ -98,11 +98,75 @@ private: std::map fMat_; std::map solver_; std::map solverAction_; - std::map prop_; - std::map propSize_; - std::map gauge_; + std::map lattice_; + std::map objectSize_; }; +/****************************************************************************** + * template implementation * + ******************************************************************************/ +template +void Environment::create(const std::string name, const unsigned int Ls) +{ + GridCartesian *g4 = getGrid(); + GridCartesian *g; + + if (hasLattice(name)) + { + HADRON_ERROR("object '" + name + "' already exists"); + } + if (Ls > 1) + { + try + { + g = grid5d_.at(Ls).get(); + } + catch(std::out_of_range &) + { + grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g4)); + gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g4)); + g = grid5d_[Ls].get(); + } + } + else + { + g = g4; + } + if (!isDryRun()) + { + lattice_[name].reset(new T(g)); + } + else + { + lattice_[name].reset(nullptr); + } + objectSize_[name] = sizeof(typename T::vector_object)/g->Nsimd()*Ls; +} + +template +T * Environment::get(const std::string name) const +{ + if (hasLattice(name)) + { + try + { + return dynamic_cast(lattice_.at(name).get()); + } + catch (std::bad_cast &) + { + HADRON_ERROR("object '" + name + "' does not have type " + + typeid(T *).name() + "(object type: " + + typeid(lattice_.at(name).get()).name() + ")"); + } + } + else + { + HADRON_ERROR("object '" + name + "' undefined"); + + return nullptr; + } +} + END_HADRONS_NAMESPACE #endif // Hadrons_Environment_hpp_ diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/GLoad.cc index 756c4f29..f35fef54 100644 --- a/programs/Hadrons/GLoad.cc +++ b/programs/Hadrons/GLoad.cc @@ -62,8 +62,8 @@ std::vector GLoad::getOutput(void) // allocation ////////////////////////////////////////////////////////////////// void GLoad::allocate(Environment &env) { - env.createGauge(getName()); - gauge_ = env.getGauge(getName()); + env.create(getName()); + gauge_ = env.get(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -73,7 +73,9 @@ void GLoad::execute(Environment &env) std::string fileName = par_.file + "." + std::to_string(env.getTrajectory()); - LOG(Message) << "loading NERSC configuration from file '" << fileName + LOG(Message) << "Loading NERSC configuration from file '" << fileName << "'" << std::endl; NerscIO::readConfiguration(*gauge_, header, fileName); + LOG(Message) << "NERSC header:" << std::endl; + dump_nersc_header(header, LOG(Message)); } diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/GRandom.cc index d6bb381f..0490d3e7 100644 --- a/programs/Hadrons/GRandom.cc +++ b/programs/Hadrons/GRandom.cc @@ -54,13 +54,13 @@ std::vector GRandom::getOutput(void) // allocation ////////////////////////////////////////////////////////////////// void GRandom::allocate(Environment &env) { - env.createGauge(getName()); - gauge_ = env.getGauge(getName()); + env.create(getName()); + gauge_ = env.get(getName()); } // execution /////////////////////////////////////////////////////////////////// void GRandom::execute(Environment &env) { - LOG(Message) << "generating random gauge configuration" << std::endl; + LOG(Message) << "Generating random gauge configuration" << std::endl; SU3::HotConfiguration(*env.get4dRng(), *gauge_); } diff --git a/programs/Hadrons/GUnit.cc b/programs/Hadrons/GUnit.cc index 330b09e4..5c19a259 100644 --- a/programs/Hadrons/GUnit.cc +++ b/programs/Hadrons/GUnit.cc @@ -54,13 +54,13 @@ std::vector GUnit::getOutput(void) // allocation ////////////////////////////////////////////////////////////////// void GUnit::allocate(Environment &env) { - env.createGauge(getName()); - gauge_ = env.getGauge(getName()); + env.create(getName()); + gauge_ = env.get(getName()); } // execution /////////////////////////////////////////////////////////////////// void GUnit::execute(Environment &env) { - LOG(Message) << "creating unit gauge configuration" << std::endl; + LOG(Message) << "Creating unit gauge configuration" << std::endl; SU3::ColdConfiguration(*env.get4dRng(), *gauge_); } diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index b95493e7..2ec3d4a6 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -78,12 +78,12 @@ void MQuark::setup(Environment &env) // allocation ////////////////////////////////////////////////////////////////// void MQuark::allocate(Environment &env) { - env.createProp(getName()); - quark_ = env.getProp(getName()); + env.create(getName()); + quark_ = env.get(getName()); if (Ls_ > 1) { - env.createProp(getName() + "_5d", Ls_); - quark5d_ = env.getProp(getName() + "_5d"); + env.create(getName() + "_5d", Ls_); + quark5d_ = env.get(getName() + "_5d"); } } @@ -93,13 +93,13 @@ void MQuark::execute(Environment &env) LatticePropagator *fullSource; LatticeFermion source(env.getGrid(Ls_)), sol(env.getGrid(Ls_)); - LOG(Message) << "computing quark propagator '" << getName() << "'" + LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; - if (!env.isProp5d(par_.source)) + if (!env.isLattice5d(par_.source)) { if (Ls_ == 1) { - fullSource = env.getProp(par_.source); + fullSource = env.get(par_.source); } else { @@ -112,17 +112,17 @@ void MQuark::execute(Environment &env) { HADRON_ERROR("MQuark not implemented with 5D actions"); } - else if (Ls_ != env.getPropLs(par_.source)) + else if (Ls_ != env.getLatticeLs(par_.source)) { HADRON_ERROR("MQuark not implemented with 5D actions"); } else { - fullSource = env.getProp(par_.source); + fullSource = env.get(par_.source); } } - LOG(Message) << "inverting using solver '" << par_.solver + LOG(Message) << "Inverting using solver '" << par_.solver << "' on source '" << par_.source << "'" << std::endl; for (unsigned int s = 0; s < Ns; ++s) for (unsigned int c = 0; c < Nc; ++c) diff --git a/programs/Hadrons/SrcPoint.cc b/programs/Hadrons/SrcPoint.cc index b5329091..4360385c 100644 --- a/programs/Hadrons/SrcPoint.cc +++ b/programs/Hadrons/SrcPoint.cc @@ -62,8 +62,8 @@ std::vector SrcPoint::getOutput(void) // allocation ////////////////////////////////////////////////////////////////// void SrcPoint::allocate(Environment &env) { - env.createProp(getName()); - src_ = env.getProp(getName()); + env.create(getName()); + src_ = env.get(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -72,7 +72,7 @@ void SrcPoint::execute(Environment &env) std::vector position = strToVec(par_.position); SpinColourMatrix id; - LOG(Message) << "creating point source at position [" << par_.position + LOG(Message) << "Creating point source at position [" << par_.position << "]" << std::endl; id = 1.; *src_ = zero; diff --git a/programs/Hadrons/SrcZ2.cc b/programs/Hadrons/SrcZ2.cc index e050d6c4..56a4ea6e 100644 --- a/programs/Hadrons/SrcZ2.cc +++ b/programs/Hadrons/SrcZ2.cc @@ -62,8 +62,8 @@ std::vector SrcZ2::getOutput(void) // allocation ////////////////////////////////////////////////////////////////// void SrcZ2::allocate(Environment &env) { - env.createProp(getName()); - src_ = env.getProp(getName()); + env.create(getName()); + src_ = env.get(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -76,12 +76,12 @@ void SrcZ2::execute(Environment &env) if (par_.tA == par_.tB) { - LOG(Message) << "generating Z_2 wall source at t= " << par_.tA + LOG(Message) << "Generating Z_2 wall source at t= " << par_.tA << std::endl; } else { - LOG(Message) << "generating Z_2 band for " << par_.tA << " <= t <= " + LOG(Message) << "Generating Z_2 band for " << par_.tA << " <= t <= " << par_.tB << std::endl; } LatticeCoordinate(t, Tp); From cbe52b065948ff16b20abad3146d205a97d3976c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 4 May 2016 12:19:58 -0700 Subject: [PATCH 032/807] Hadrons: debug message removed --- programs/Hadrons/AWilson.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index f4fb3dc9..5e08ae12 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -70,5 +70,4 @@ void AWilson::execute(Environment &env) << " using gauge field '" << par_.gauge << "'" << std::endl; env.addFermionMatrix(getName(), new WilsonFermionR(U, grid, gridRb, par_.mass)); - LOG(Message) << sizeof(*env.getFermionMatrix(getName())) << std::endl; } From 75cd72a4211b8cccc4ac3b207de546d2d163f898 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 4 May 2016 19:11:03 -0700 Subject: [PATCH 033/807] Hadrons: memory management for fermion matrices, dynamic ownership in garbage collector --- programs/Hadrons/AWilson.cc | 14 ++-- programs/Hadrons/AWilson.hpp | 2 +- programs/Hadrons/Application.cc | 41 ++++++++++-- programs/Hadrons/CMeson.cc | 10 +-- programs/Hadrons/CMeson.hpp | 2 +- programs/Hadrons/Environment.cc | 107 ++++++++++++++++++++++++++----- programs/Hadrons/Environment.hpp | 29 +++++++-- programs/Hadrons/GLoad.cc | 10 +-- programs/Hadrons/GLoad.hpp | 4 +- programs/Hadrons/GRandom.cc | 10 +-- programs/Hadrons/GRandom.hpp | 4 +- programs/Hadrons/GUnit.cc | 10 +-- programs/Hadrons/GUnit.hpp | 4 +- programs/Hadrons/MQuark.cc | 29 ++++----- programs/Hadrons/MQuark.hpp | 10 +-- programs/Hadrons/Module.cc | 17 +++-- programs/Hadrons/Module.hpp | 10 +-- programs/Hadrons/SolRBPrecCG.cc | 15 +++-- programs/Hadrons/SolRBPrecCG.hpp | 4 +- programs/Hadrons/SrcPoint.cc | 8 +-- programs/Hadrons/SrcPoint.hpp | 4 +- programs/Hadrons/SrcZ2.cc | 16 ++--- programs/Hadrons/SrcZ2.hpp | 4 +- 23 files changed, 253 insertions(+), 111 deletions(-) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index 5e08ae12..0be43ee7 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -60,14 +60,16 @@ std::vector AWilson::getOutput(void) } // execution /////////////////////////////////////////////////////////////////// -void AWilson::execute(Environment &env) +void AWilson::execute() { - auto &U = *env.get(par_.gauge); - auto &grid = *env.getGrid(); - auto &gridRb = *env.getRbGrid(); + auto &U = *env().get(par_.gauge); + auto &grid = *env().getGrid(); + auto &gridRb = *env().getRbGrid(); + auto fMatPt = new WilsonFermionR(U, grid, gridRb, par_.mass); + unsigned int size; LOG(Message) << "Setting up Wilson fermion matrix with m= " << par_.mass << " using gauge field '" << par_.gauge << "'" << std::endl; - env.addFermionMatrix(getName(), - new WilsonFermionR(U, grid, gridRb, par_.mass)); + size = 3*env().lattice4dSize(); + env().addFermionMatrix(getName(), fMatPt, size); } diff --git a/programs/Hadrons/AWilson.hpp b/programs/Hadrons/AWilson.hpp index cf21eff3..df2d6f41 100644 --- a/programs/Hadrons/AWilson.hpp +++ b/programs/Hadrons/AWilson.hpp @@ -57,7 +57,7 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; }; diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 531ad875..7fb69ab1 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -189,9 +189,11 @@ void Application::configLoop(void) unsigned int Application::execute(const std::vector &program) { - unsigned int memPeak = 0, size; - std::vector> freeProg; + unsigned int memPeak = 0, size; + std::vector> freeProg; + bool continueCollect; + // build garbage collection schedule freeProg.resize(program.size()); for (auto &n: associatedModule_) { @@ -205,27 +207,54 @@ unsigned int Application::execute(const std::vector &program) auto it = std::find_if(program.rbegin(), program.rend(), pred); if (it != program.rend()) { - freeProg[program.rend() - it - 1].push_back(n.first); + freeProg[program.rend() - it - 1].insert(n.first); } } + // program execution for (unsigned int i = 0; i < program.size(); ++i) { + // execute module LOG(Message) << "---------- Measurement step " << i+1 << "/" << program.size() << " (module '" << program[i] << "')" << " ----------" << std::endl; - (*module_[program[i]])(env_); + (*module_[program[i]])(); size = env_.getTotalSize(); + // print used memory after execution LOG(Message) << "Allocated objects: " << sizeString(size*locVol_) << " (" << sizeString(size) << "/site)" << std::endl; if (size > memPeak) { memPeak = size; } + // garbage collection for step i LOG(Message) << "Garbage collection..." << std::endl; - for (auto &n: freeProg[i]) + do { - env_.free(n); + continueCollect = false; + auto toFree = freeProg[i]; + for (auto &n: toFree) + { + // continue garbage collection while there are still + // objects without owners + continueCollect = continueCollect or !env_.hasOwners(n); + if(env_.free(n)) + { + // if an object has been freed, remove it from + // the garbage collection schedule + freeProg[i].erase(n); + } + } + } while (continueCollect); + // any remaining objects in step i garbage collection schedule + // is scheduled for step i + 1 + if (i + 1 < program.size()) + { + for (auto &n: freeProg[i]) + { + freeProg[i + 1].insert(n); + } } + // print used memory after garbage collection size = env_.getTotalSize(); LOG(Message) << "Allocated objects: " << sizeString(size*locVol_) << " (" << sizeString(size) << "/site)" << std::endl; diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index 194da413..4e3e6b68 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -61,20 +61,20 @@ std::vector CMeson::getOutput(void) } // execution /////////////////////////////////////////////////////////////////// -void CMeson::execute(Environment &env) +void CMeson::execute(void) { LOG(Message) << "Computing meson contraction '" << getName() << "' using" << " quarks '" << par_.q1 << " and '" << par_.q2 << "'" << std::endl; XmlWriter writer(par_.output); - LatticePropagator &q1 = *env.get(par_.q1); - LatticePropagator &q2 = *env.get(par_.q2); - LatticeComplex c(env.getGrid()); + LatticePropagator &q1 = *env().get(par_.q1); + LatticePropagator &q2 = *env().get(par_.q2); + LatticeComplex c(env().getGrid()); SpinMatrix g[Ns*Ns], g5; std::vector buf; Result result; - unsigned int nt = env.getGrid()->GlobalDimensions()[Tp]; + unsigned int nt = env().getGrid()->GlobalDimensions()[Tp]; g5 = makeGammaProd(Ns*Ns - 1); result.corr.resize(Ns*Ns); diff --git a/programs/Hadrons/CMeson.hpp b/programs/Hadrons/CMeson.hpp index 29620726..bc9f3177 100644 --- a/programs/Hadrons/CMeson.hpp +++ b/programs/Hadrons/CMeson.hpp @@ -65,7 +65,7 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; }; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index a82e4c80..ec61c40d 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -106,18 +106,20 @@ GridRedBlackCartesian * Environment::getRbGrid(const unsigned int Ls) const } // fermion actions ///////////////////////////////////////////////////////////// -void Environment::addFermionMatrix(const std::string name, FMat *fMat) +void Environment::addFermionMatrix(const std::string name, FMat *fMat, + const unsigned int size) { fMat_[name].reset(fMat); + addSize(name, size); } Environment::FMat * Environment::getFermionMatrix(const std::string name) const { - try + if (hasFermionMatrix(name)) { return fMat_.at(name).get(); } - catch(std::out_of_range &) + else { try { @@ -130,6 +132,25 @@ Environment::FMat * Environment::getFermionMatrix(const std::string name) const } } +void Environment::freeFermionMatrix(const std::string name) +{ + if (hasFermionMatrix(name)) + { + LOG(Message) << "freeing fermion matrix '" << name << "'" << std::endl; + fMat_.erase(name); + objectSize_.erase(name); + } + else + { + HADRON_ERROR("trying to free undefined fermion matrix '" + name + "'"); + } +} + +bool Environment::hasFermionMatrix(const std::string name) const +{ + return (fMat_.find(name) != fMat_.end()); +} + // solvers ///////////////////////////////////////////////////////////////////// void Environment::addSolver(const std::string name, Solver s, const std::string actionName) @@ -138,14 +159,31 @@ void Environment::addSolver(const std::string name, Solver s, solverAction_[name] = actionName; } +bool Environment::hasSolver(const std::string name) const +{ + return (solver_.find(name) != solver_.end()); +} + +std::string Environment::getSolverAction(const std::string name) const +{ + if (hasSolver(name)) + { + return solverAction_.at(name); + } + else + { + HADRON_ERROR("no solver with name '" << name << "'"); + } +} + void Environment::callSolver(const std::string name, LatticeFermion &sol, const LatticeFermion &source) const { - try + if (hasSolver(name)) { solver_.at(name)(sol, source); } - catch(std::out_of_range &) + else { HADRON_ERROR("no solver with name '" << name << "'"); } @@ -162,7 +200,7 @@ GridParallelRNG * Environment::get4dRng(void) const return rng4d_.get(); } -// data store ////////////////////////////////////////////////////////////////// +// lattice store /////////////////////////////////////////////////////////////// void Environment::freeLattice(const std::string name) { if (hasLattice(name)) @@ -210,28 +248,62 @@ unsigned int Environment::getLatticeLs(const std::string name) const } // general memory management /////////////////////////////////////////////////// -void Environment::free(const std::string name) +void Environment::addOwnership(const std::string owner, + const std::string property) { - if (hasLattice(name)) + owners_[property].insert(owner); + properties_[owner].insert(property); +} + +bool Environment::hasOwners(const std::string name) const +{ + try { - freeLattice(name); + return (!owners_.at(name).empty()); + } + catch (std::out_of_range &) + { + return false; + } +} + +bool Environment::free(const std::string name) +{ + if (!hasOwners(name)) + { + for (auto &p: properties_[name]) + { + owners_[p].erase(name); + } + properties_[name].clear(); + if (hasLattice(name)) + { + freeLattice(name); + } + else if (hasFermionMatrix(name)) + { + freeFermionMatrix(name); + } + + return true; + } + else + { + return false; } } void Environment::freeAll(void) { lattice_.clear(); + fMat_.clear(); + solver_.clear(); objectSize_.clear(); } -void Environment::addSize(const std::string name, const unsigned int size) -{ - objectSize_[name] = size; -} - unsigned int Environment::getSize(const std::string name) const { - if (hasLattice(name)) + if (hasLattice(name) or hasFermionMatrix(name)) { return objectSize_.at(name); } @@ -254,3 +326,8 @@ long unsigned int Environment::getTotalSize(void) const return size; } + +void Environment::addSize(const std::string name, const unsigned int size) +{ + objectSize_[name] = size; +} diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 628d9831..f5265181 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -58,11 +58,16 @@ public: GridCartesian * getGrid(const unsigned int Ls = 1) const; GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; // fermion actions - void addFermionMatrix(const std::string name, FMat *mat); + void addFermionMatrix(const std::string name, FMat *mat, + const unsigned int size); FMat * getFermionMatrix(const std::string name) const; + void freeFermionMatrix(const std::string name); + bool hasFermionMatrix(const std::string name) const; // solvers void addSolver(const std::string name, Solver s, const std::string actionName); + bool hasSolver(const std::string name) const; + std::string getSolverAction(const std::string name) const; void callSolver(const std::string name, LatticeFermion &sol, const LatticeFermion &src) const; @@ -71,22 +76,26 @@ public: GridParallelRNG * get4dRng(void) const; // lattice store template + unsigned int lattice4dSize(void) const; + template void create(const std::string name, const unsigned int Ls = 1); template T * get(const std::string name) const; void freeLattice(const std::string name); bool hasLattice(const std::string name) const; - bool isLattice5d(const std::string name) const; unsigned int getLatticeLs(const std::string name) const; // general memory management - void free(const std::string name); + void addOwnership(const std::string owner, + const std::string property); + bool hasOwners(const std::string name) const; + bool free(const std::string name); void freeAll(void); - void addSize(const std::string name, - const unsigned int size); unsigned int getSize(const std::string name) const; long unsigned int getTotalSize(void) const; +private: + void addSize(const std::string name, const unsigned int size); private: bool dryRun_{false}; unsigned int traj_; @@ -100,11 +109,19 @@ private: std::map solverAction_; std::map lattice_; std::map objectSize_; + std::map> owners_; + std::map> properties_; }; /****************************************************************************** * template implementation * ******************************************************************************/ +template +unsigned int Environment::lattice4dSize(void) const +{ + return sizeof(typename T::vector_object)/getGrid()->Nsimd(); +} + template void Environment::create(const std::string name, const unsigned int Ls) { @@ -140,7 +157,7 @@ void Environment::create(const std::string name, const unsigned int Ls) { lattice_[name].reset(nullptr); } - objectSize_[name] = sizeof(typename T::vector_object)/g->Nsimd()*Ls; + addSize(name, lattice4dSize()*Ls); } template diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/GLoad.cc index f35fef54..55715fbb 100644 --- a/programs/Hadrons/GLoad.cc +++ b/programs/Hadrons/GLoad.cc @@ -60,18 +60,18 @@ std::vector GLoad::getOutput(void) } // allocation ////////////////////////////////////////////////////////////////// -void GLoad::allocate(Environment &env) +void GLoad::allocate(void) { - env.create(getName()); - gauge_ = env.get(getName()); + env().create(getName()); + gauge_ = env().get(getName()); } // execution /////////////////////////////////////////////////////////////////// -void GLoad::execute(Environment &env) +void GLoad::execute(void) { NerscField header; std::string fileName = par_.file + "." - + std::to_string(env.getTrajectory()); + + std::to_string(env().getTrajectory()); LOG(Message) << "Loading NERSC configuration from file '" << fileName << "'" << std::endl; diff --git a/programs/Hadrons/GLoad.hpp b/programs/Hadrons/GLoad.hpp index a40ed2c2..4527c33c 100644 --- a/programs/Hadrons/GLoad.hpp +++ b/programs/Hadrons/GLoad.hpp @@ -56,9 +56,9 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation - virtual void allocate(Environment &env); + virtual void allocate(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; LatticeGaugeField *gauge_ = nullptr; diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/GRandom.cc index 0490d3e7..53007045 100644 --- a/programs/Hadrons/GRandom.cc +++ b/programs/Hadrons/GRandom.cc @@ -52,15 +52,15 @@ std::vector GRandom::getOutput(void) } // allocation ////////////////////////////////////////////////////////////////// -void GRandom::allocate(Environment &env) +void GRandom::allocate(void) { - env.create(getName()); - gauge_ = env.get(getName()); + env().create(getName()); + gauge_ = env().get(getName()); } // execution /////////////////////////////////////////////////////////////////// -void GRandom::execute(Environment &env) +void GRandom::execute(void) { LOG(Message) << "Generating random gauge configuration" << std::endl; - SU3::HotConfiguration(*env.get4dRng(), *gauge_); + SU3::HotConfiguration(*env().get4dRng(), *gauge_); } diff --git a/programs/Hadrons/GRandom.hpp b/programs/Hadrons/GRandom.hpp index 18660bf9..12d5be5f 100644 --- a/programs/Hadrons/GRandom.hpp +++ b/programs/Hadrons/GRandom.hpp @@ -48,9 +48,9 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation - virtual void allocate(Environment &env); + virtual void allocate(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: LatticeGaugeField *gauge_ = nullptr; }; diff --git a/programs/Hadrons/GUnit.cc b/programs/Hadrons/GUnit.cc index 5c19a259..5a86aa00 100644 --- a/programs/Hadrons/GUnit.cc +++ b/programs/Hadrons/GUnit.cc @@ -52,15 +52,15 @@ std::vector GUnit::getOutput(void) } // allocation ////////////////////////////////////////////////////////////////// -void GUnit::allocate(Environment &env) +void GUnit::allocate(void) { - env.create(getName()); - gauge_ = env.get(getName()); + env().create(getName()); + gauge_ = env().get(getName()); } // execution /////////////////////////////////////////////////////////////////// -void GUnit::execute(Environment &env) +void GUnit::execute(void) { LOG(Message) << "Creating unit gauge configuration" << std::endl; - SU3::ColdConfiguration(*env.get4dRng(), *gauge_); + SU3::ColdConfiguration(*env().get4dRng(), *gauge_); } diff --git a/programs/Hadrons/GUnit.hpp b/programs/Hadrons/GUnit.hpp index 21e9a15f..4dfc268d 100644 --- a/programs/Hadrons/GUnit.hpp +++ b/programs/Hadrons/GUnit.hpp @@ -48,9 +48,9 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation - virtual void allocate(Environment &env); + virtual void allocate(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: LatticeGaugeField *gauge_ = nullptr; }; diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index 2ec3d4a6..d27a545e 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -61,9 +61,9 @@ std::vector MQuark::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void MQuark::setup(Environment &env) +void MQuark::setup(void) { - auto dim = env.getFermionMatrix(par_.solver)->Grid()->GlobalDimensions(); + auto dim = env().getFermionMatrix(par_.solver)->Grid()->GlobalDimensions(); if (dim.size() == Nd) { @@ -76,30 +76,30 @@ void MQuark::setup(Environment &env) } // allocation ////////////////////////////////////////////////////////////////// -void MQuark::allocate(Environment &env) +void MQuark::allocate(void) { - env.create(getName()); - quark_ = env.get(getName()); + env().create(getName()); + quark_ = env().get(getName()); if (Ls_ > 1) { - env.create(getName() + "_5d", Ls_); - quark5d_ = env.get(getName() + "_5d"); + env().create(getName() + "_5d", Ls_); + quark5d_ = env().get(getName() + "_5d"); } } // execution /////////////////////////////////////////////////////////////////// -void MQuark::execute(Environment &env) +void MQuark::execute(void) { LatticePropagator *fullSource; - LatticeFermion source(env.getGrid(Ls_)), sol(env.getGrid(Ls_)); + LatticeFermion source(env().getGrid(Ls_)), sol(env().getGrid(Ls_)); LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; - if (!env.isLattice5d(par_.source)) + if (!env().isLattice5d(par_.source)) { if (Ls_ == 1) { - fullSource = env.get(par_.source); + fullSource = env().get(par_.source); } else { @@ -112,16 +112,15 @@ void MQuark::execute(Environment &env) { HADRON_ERROR("MQuark not implemented with 5D actions"); } - else if (Ls_ != env.getLatticeLs(par_.source)) + else if (Ls_ != env().getLatticeLs(par_.source)) { HADRON_ERROR("MQuark not implemented with 5D actions"); } else { - fullSource = env.get(par_.source); + fullSource = env().get(par_.source); } } - LOG(Message) << "Inverting using solver '" << par_.solver << "' on source '" << par_.source << "'" << std::endl; for (unsigned int s = 0; s < Ns; ++s) @@ -129,7 +128,7 @@ void MQuark::execute(Environment &env) { PropToFerm(source, *fullSource, s, c); sol = zero; - env.callSolver(par_.solver, sol, source); + env().callSolver(par_.solver, sol, source); if (Ls_ == 1) { FermToProp(*quark_, sol, s, c); diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index 5b14d0aa..aaa3864e 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -43,8 +43,8 @@ public: class Par: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string , source, - std::string , solver); + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, source, + std::string, solver); }; public: // constructor @@ -57,11 +57,11 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // setup - virtual void setup(Environment &env); + virtual void setup(void); // allocation - virtual void allocate(Environment &env); + virtual void allocate(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; unsigned int Ls_; diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index a590b81a..3233c210 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -37,6 +37,7 @@ using namespace Hadrons; // constructor ///////////////////////////////////////////////////////////////// Module::Module(const std::string name) : name_(name) +, env_(Environment::getInstance()) {} // access ////////////////////////////////////////////////////////////////////// @@ -45,12 +46,18 @@ std::string Module::getName(void) const return name_; } -void Module::operator()(Environment &env) +Environment & Module::env(void) const { - setup(env); - allocate(env); - if (!env.isDryRun()) + return env_; +} + +// execution /////////////////////////////////////////////////////////////////// +void Module::operator()(void) +{ + setup(); + allocate(); + if (!env().isDryRun()) { - execute(env); + execute(); } } diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 1f529944..605aec06 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -61,20 +61,22 @@ public: virtual ~Module(void) = default; // access std::string getName(void) const; + Environment &env(void) const; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name) {}; // dependencies/products virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; // setup - virtual void setup(Environment &env) {}; + virtual void setup(void) {}; // allocation - virtual void allocate(Environment &env) {}; + virtual void allocate(void) {}; // execution - void operator()(Environment &env); - virtual void execute(Environment &env) = 0; + void operator()(void); + virtual void execute(void) = 0; private: std::string name_; + Environment &env_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/SolRBPrecCG.cc b/programs/Hadrons/SolRBPrecCG.cc index 250c81e6..3984ea35 100644 --- a/programs/Hadrons/SolRBPrecCG.cc +++ b/programs/Hadrons/SolRBPrecCG.cc @@ -60,10 +60,17 @@ std::vector SolRBPrecCG::getOutput(void) return out; } -// execution /////////////////////////////////////////////////////////////////// -void SolRBPrecCG::execute(Environment &env) +// setup /////////////////////////////////////////////////////////////////////// +void SolRBPrecCG::setup(void) { - auto &mat = *(env.getFermionMatrix(par_.action)); + env().addOwnership(getName(), par_.action); +} + +// execution /////////////////////////////////////////////////////////////////// +void SolRBPrecCG::execute(void) +{ + auto &mat = *(env().getFermionMatrix(par_.action)); + auto solver = [&mat, this](LatticeFermion &sol, const LatticeFermion &source) { @@ -76,5 +83,5 @@ void SolRBPrecCG::execute(Environment &env) LOG(Message) << "setting up Schur red-black preconditioned CG for" << " action '" << par_.action << "' with residual " << par_.residual << std::endl; - env.addSolver(getName(), solver, par_.action); + env().addSolver(getName(), solver, par_.action); } diff --git a/programs/Hadrons/SolRBPrecCG.hpp b/programs/Hadrons/SolRBPrecCG.hpp index ca046efa..82784666 100644 --- a/programs/Hadrons/SolRBPrecCG.hpp +++ b/programs/Hadrons/SolRBPrecCG.hpp @@ -56,8 +56,10 @@ public: // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); + // setup + virtual void setup(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; }; diff --git a/programs/Hadrons/SrcPoint.cc b/programs/Hadrons/SrcPoint.cc index 4360385c..40046cd0 100644 --- a/programs/Hadrons/SrcPoint.cc +++ b/programs/Hadrons/SrcPoint.cc @@ -60,14 +60,14 @@ std::vector SrcPoint::getOutput(void) } // allocation ////////////////////////////////////////////////////////////////// -void SrcPoint::allocate(Environment &env) +void SrcPoint::allocate(void) { - env.create(getName()); - src_ = env.get(getName()); + env().create(getName()); + src_ = env().get(getName()); } // execution /////////////////////////////////////////////////////////////////// -void SrcPoint::execute(Environment &env) +void SrcPoint::execute(void) { std::vector position = strToVec(par_.position); SpinColourMatrix id; diff --git a/programs/Hadrons/SrcPoint.hpp b/programs/Hadrons/SrcPoint.hpp index 5cde676e..75cd9aa6 100644 --- a/programs/Hadrons/SrcPoint.hpp +++ b/programs/Hadrons/SrcPoint.hpp @@ -67,9 +67,9 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation - virtual void allocate(Environment &env); + virtual void allocate(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; LatticePropagator *src_{nullptr}; diff --git a/programs/Hadrons/SrcZ2.cc b/programs/Hadrons/SrcZ2.cc index 56a4ea6e..42d5dbb2 100644 --- a/programs/Hadrons/SrcZ2.cc +++ b/programs/Hadrons/SrcZ2.cc @@ -60,18 +60,18 @@ std::vector SrcZ2::getOutput(void) } // allocation ////////////////////////////////////////////////////////////////// -void SrcZ2::allocate(Environment &env) +void SrcZ2::allocate(void) { - env.create(getName()); - src_ = env.get(getName()); + env().create(getName()); + src_ = env().get(getName()); } // execution /////////////////////////////////////////////////////////////////// -void SrcZ2::execute(Environment &env) +void SrcZ2::execute(void) { - Lattice> t(env.getGrid()); - LatticeComplex eta(env.getGrid()); - LatticeFermion phi(env.getGrid()); + Lattice> t(env().getGrid()); + LatticeComplex eta(env().getGrid()); + LatticeFermion phi(env().getGrid()); Complex shift(1., 1.); if (par_.tA == par_.tB) @@ -85,7 +85,7 @@ void SrcZ2::execute(Environment &env) << par_.tB << std::endl; } LatticeCoordinate(t, Tp); - bernoulli(*env.get4dRng(), eta); + bernoulli(*env().get4dRng(), eta); eta = (2.*eta - shift)*(1./::sqrt(2.)); eta = where((t >= par_.tA) and (t <= par_.tB), eta, 0.*eta); *src_ = 1.; diff --git a/programs/Hadrons/SrcZ2.hpp b/programs/Hadrons/SrcZ2.hpp index 09248e66..dc4c35c6 100644 --- a/programs/Hadrons/SrcZ2.hpp +++ b/programs/Hadrons/SrcZ2.hpp @@ -69,9 +69,9 @@ public: virtual std::vector getInput(void); virtual std::vector getOutput(void); // allocation - virtual void allocate(Environment &env); + virtual void allocate(void); // execution - virtual void execute(Environment &env); + virtual void execute(void); private: Par par_; LatticePropagator *src_; From ea0cea668e42ced2443dfe230600b9bf98225cb5 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 5 May 2016 16:13:14 -0700 Subject: [PATCH 034/807] Hadrons: minor code cleaning --- programs/Hadrons/Environment.cc | 8 +++++--- programs/Hadrons/SolRBPrecCG.cc | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index ec61c40d..0f870ba2 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -121,13 +121,13 @@ Environment::FMat * Environment::getFermionMatrix(const std::string name) const } else { - try + if (hasSolver(name)) { return fMat_.at(solverAction_.at(name)).get(); } - catch (std::out_of_range &) + else { - HADRON_ERROR("no action with name '" << name << "'"); + HADRON_ERROR("no action/solver with name '" << name << "'"); } } } @@ -299,6 +299,8 @@ void Environment::freeAll(void) fMat_.clear(); solver_.clear(); objectSize_.clear(); + owners_.clear(); + properties_.clear(); } unsigned int Environment::getSize(const std::string name) const diff --git a/programs/Hadrons/SolRBPrecCG.cc b/programs/Hadrons/SolRBPrecCG.cc index 3984ea35..8487991e 100644 --- a/programs/Hadrons/SolRBPrecCG.cc +++ b/programs/Hadrons/SolRBPrecCG.cc @@ -70,7 +70,6 @@ void SolRBPrecCG::setup(void) void SolRBPrecCG::execute(void) { auto &mat = *(env().getFermionMatrix(par_.action)); - auto solver = [&mat, this](LatticeFermion &sol, const LatticeFermion &source) { From 2c226753ab56ab3f2d66686ff689f89c79f458b4 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Fri, 6 May 2016 06:35:11 -0700 Subject: [PATCH 035/807] Hadrons: comments on graph theory algorithm complexity --- programs/Hadrons/Graph.hpp | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index c7591350..e43f98d1 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -116,14 +116,20 @@ makeDependencyMatrix(const std::vector> &topSort); /****************************************************************************** * template implementation * - ******************************************************************************/ + ****************************************************************************** + * in all the following V is the number of vertex and E is the number of edge + * in the worst case E = V^2 + */ + // access ////////////////////////////////////////////////////////////////////// +// complexity: log(V) template void Graph::addVertex(const T &value) { isMarked_[value] = false; } +// complexity: O(log(V)) template void Graph::addEdge(const Edge &e) { @@ -132,12 +138,14 @@ void Graph::addEdge(const Edge &e) edgeSet_.insert(e); } +// complexity: O(log(V)) template void Graph::addEdge(const T &start, const T &end) { addEdge(Edge(start, end)); } +// complexity: O(V*log(V)) template void Graph::removeVertex(const T &value) { @@ -167,6 +175,7 @@ void Graph::removeVertex(const T &value) } } +// complexity: O(log(V)) template void Graph::removeEdge(const Edge &e) { @@ -182,12 +191,14 @@ void Graph::removeEdge(const Edge &e) } } +// complexity: O(log(V)) template void Graph::removeEdge(const T &start, const T &end) { removeEdge(Edge(start, end)); } +// complexity: O(1) template unsigned int Graph::size(void) const { @@ -195,6 +206,7 @@ unsigned int Graph::size(void) const } // tests /////////////////////////////////////////////////////////////////////// +// complexity: O(log(V)) template bool Graph::gotValue(const T &value) const { @@ -211,6 +223,7 @@ bool Graph::gotValue(const T &value) const } // vertex marking ////////////////////////////////////////////////////////////// +// complexity: O(log(V)) template void Graph::mark(const T &value, const bool doMark) { @@ -224,6 +237,7 @@ void Graph::mark(const T &value, const bool doMark) } } +// complexity: O(V*log(V)) template void Graph::markAll(const bool doMark) { @@ -233,18 +247,21 @@ void Graph::markAll(const bool doMark) } } +// complexity: O(log(V)) template void Graph::unmark(const T &value) { mark(value, false); } +// complexity: O(V*log(V)) template void Graph::unmarkAll(void) { markAll(false); } +// complexity: O(log(V)) template bool Graph::isMarked(const T &value) const { @@ -260,6 +277,7 @@ bool Graph::isMarked(const T &value) const } } +// complexity: O(log(V)) template const T * Graph::getFirstMarked(const bool isMarked) const { @@ -279,6 +297,7 @@ const T * Graph::getFirstMarked(const bool isMarked) const } } +// complexity: O(log(V)) template const T * Graph::getFirstUnmarked(void) const { @@ -286,6 +305,7 @@ const T * Graph::getFirstUnmarked(void) const } // prune marked/unmarked vertices ////////////////////////////////////////////// +// complexity: O(V^2*log(V)) template void Graph::removeMarked(const bool isMarked) { @@ -300,6 +320,7 @@ void Graph::removeMarked(const bool isMarked) } } +// complexity: O(V^2*log(V)) template void Graph::removeUnmarked(void) { @@ -307,12 +328,14 @@ void Graph::removeUnmarked(void) } // depth-first search marking ////////////////////////////////////////////////// +// complexity: O(V*log(V)) template void Graph::depthFirstSearch(void) { depthFirstSearch(isMarked_.begin()->first); } +// complexity: O(V*log(V)) template void Graph::depthFirstSearch(const T &root) { @@ -330,6 +353,7 @@ void Graph::depthFirstSearch(const T &root) } // graph topological manipulations ///////////////////////////////////////////// +// complexity: O(V*log(V)) template std::vector Graph::getAdjacentVertices(const T &value) const { @@ -357,6 +381,7 @@ std::vector Graph::getAdjacentVertices(const T &value) const return adjacentVertex; } +// complexity: O(V*log(V)) template std::vector Graph::getChildren(const T &value) const { @@ -377,6 +402,7 @@ std::vector Graph::getChildren(const T &value) const return child; } +// complexity: O(V*log(V)) template std::vector Graph::getParents(const T &value) const { @@ -397,6 +423,7 @@ std::vector Graph::getParents(const T &value) const return parent; } +// complexity: O(V^2*log(V)) template std::vector Graph::getRoots(void) const { @@ -415,6 +442,7 @@ std::vector Graph::getRoots(void) const return root; } +// complexity: O(V^2*log(V)) template std::vector> Graph::getConnectedComponents(void) const { @@ -435,6 +463,7 @@ std::vector> Graph::getConnectedComponents(void) const } // topological sort using Tarjan's algorithm +// complexity: O(V*log(V)) template std::vector Graph::topoSort(void) { @@ -493,6 +522,7 @@ std::vector Graph::topoSort(void) // generate all possible topological sorts // Y. L. Varol & D. Rotem, Comput. J. 24(1), pp. 83–84, 1981 // http://comjnl.oupjournals.org/cgi/doi/10.1093/comjnl/24.1.83 +// complexity: O(V*log(V)) template std::vector> Graph::allTopoSort(void) { @@ -570,6 +600,7 @@ std::vector> Graph::allTopoSort(void) } // build depedency matrix from topological sorts /////////////////////////////// +// complexity: can be V! template std::map> makeDependencyMatrix(const std::vector> &topSort) From bb580ae077493b656e8ef3e5caf08016d6edb987 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sat, 7 May 2016 13:19:38 -0700 Subject: [PATCH 036/807] Hadrons: significant overhaul of the object registration system, previous version didn't allow dry runs --- programs/Hadrons/AWilson.cc | 12 +- programs/Hadrons/AWilson.hpp | 2 + programs/Hadrons/Application.cc | 38 ++++-- programs/Hadrons/Environment.cc | 204 +++++++++++++++++++------------ programs/Hadrons/Environment.hpp | 113 ++++++++--------- programs/Hadrons/GLoad.cc | 10 +- programs/Hadrons/GLoad.hpp | 7 +- programs/Hadrons/GRandom.cc | 10 +- programs/Hadrons/GRandom.hpp | 6 +- programs/Hadrons/GUnit.cc | 10 +- programs/Hadrons/GUnit.hpp | 6 +- programs/Hadrons/Graph.hpp | 95 ++++++++++++-- programs/Hadrons/MQuark.cc | 46 +++---- programs/Hadrons/MQuark.hpp | 3 - programs/Hadrons/Module.cc | 1 - programs/Hadrons/Module.hpp | 2 - programs/Hadrons/SolRBPrecCG.cc | 4 +- programs/Hadrons/SrcPoint.cc | 14 +-- programs/Hadrons/SrcPoint.hpp | 7 +- programs/Hadrons/SrcZ2.cc | 16 +-- programs/Hadrons/SrcZ2.hpp | 7 +- 21 files changed, 364 insertions(+), 249 deletions(-) diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/AWilson.cc index 0be43ee7..5a75a257 100644 --- a/programs/Hadrons/AWilson.cc +++ b/programs/Hadrons/AWilson.cc @@ -59,6 +59,15 @@ std::vector AWilson::getOutput(void) return out; } +// setup /////////////////////////////////////////////////////////////////////// +void AWilson::setup(void) +{ + unsigned int size; + + size = 3*env().lattice4dSize(); + env().registerObject(getName(), size); +} + // execution /////////////////////////////////////////////////////////////////// void AWilson::execute() { @@ -70,6 +79,5 @@ void AWilson::execute() LOG(Message) << "Setting up Wilson fermion matrix with m= " << par_.mass << " using gauge field '" << par_.gauge << "'" << std::endl; - size = 3*env().lattice4dSize(); - env().addFermionMatrix(getName(), fMatPt, size); + env().addFermionMatrix(getName(), fMatPt); } diff --git a/programs/Hadrons/AWilson.hpp b/programs/Hadrons/AWilson.hpp index df2d6f41..1eaf0a36 100644 --- a/programs/Hadrons/AWilson.hpp +++ b/programs/Hadrons/AWilson.hpp @@ -56,6 +56,8 @@ public: // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); + // setup + virtual void setup(void); // execution virtual void execute(void); private: diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 7fb69ab1..aa7e66bc 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -107,9 +107,33 @@ void Application::parseParameterFile(void) } // schedule computation //////////////////////////////////////////////////////// +#define MEM_MSG(size)\ +sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" + void Application::schedule(void) { - Graph moduleGraph; + // memory peak and invers memory peak functions + auto memPeak = [this](const std::vector &program) + { + unsigned int memPeak; + bool msg; + + msg = HadronsLogMessage.isActive(); + HadronsLogMessage.Active(false); + env_.dryRun(true); + memPeak = execute(program); + env_.dryRun(false); + env_.freeAll(); + HadronsLogMessage.Active(true); + + return memPeak; + }; + auto invMemPeak = [&memPeak](const std::vector &program) + { + return 1./memPeak(program); + }; + + Graph moduleGraph; LOG(Message) << "Scheduling computation..." << std::endl; @@ -161,7 +185,8 @@ void Application::schedule(void) // } // env_.dryRun(false); std::vector t = con[i].topoSort(); - LOG(Message) << "Program " << i + 1 << ":" << std::endl; + LOG(Message) << "Program " << i + 1 << " (memory peak: " + << MEM_MSG(memPeak(t)) << "):" << std::endl; for (unsigned int j = 0; j < t.size(); ++j) { program_.push_back(t[j]); @@ -210,6 +235,7 @@ unsigned int Application::execute(const std::vector &program) freeProg[program.rend() - it - 1].insert(n.first); } } + // program execution for (unsigned int i = 0; i < program.size(); ++i) { @@ -220,8 +246,7 @@ unsigned int Application::execute(const std::vector &program) (*module_[program[i]])(); size = env_.getTotalSize(); // print used memory after execution - LOG(Message) << "Allocated objects: " << sizeString(size*locVol_) - << " (" << sizeString(size) << "/site)" << std::endl; + LOG(Message) << "Allocated objects: " << MEM_MSG(size) << std::endl; if (size > memPeak) { memPeak = size; @@ -237,7 +262,7 @@ unsigned int Application::execute(const std::vector &program) // continue garbage collection while there are still // objects without owners continueCollect = continueCollect or !env_.hasOwners(n); - if(env_.free(n)) + if(env_.freeObject(n)) { // if an object has been freed, remove it from // the garbage collection schedule @@ -256,8 +281,7 @@ unsigned int Application::execute(const std::vector &program) } // print used memory after garbage collection size = env_.getTotalSize(); - LOG(Message) << "Allocated objects: " << sizeString(size*locVol_) - << " (" << sizeString(size) << "/site)" << std::endl; + LOG(Message) << "Allocated objects: " << MEM_MSG(size) << std::endl; } return memPeak; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 0f870ba2..ee0b842d 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -67,6 +67,14 @@ unsigned int Environment::getTrajectory(void) const } // grids /////////////////////////////////////////////////////////////////////// +void Environment::createGrid(const unsigned int Ls) +{ + auto g = getGrid(); + + grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g)); + gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g)); +} + GridCartesian * Environment::getGrid(const unsigned int Ls) const { try @@ -82,7 +90,7 @@ GridCartesian * Environment::getGrid(const unsigned int Ls) const } catch(std::out_of_range &) { - HADRON_ERROR("no 5D grid with Ls= " << Ls); + HADRON_ERROR("no grid with Ls= " << Ls); } } @@ -106,11 +114,16 @@ GridRedBlackCartesian * Environment::getRbGrid(const unsigned int Ls) const } // fermion actions ///////////////////////////////////////////////////////////// -void Environment::addFermionMatrix(const std::string name, FMat *fMat, - const unsigned int size) +void Environment::addFermionMatrix(const std::string name, FMat *fMat) { - fMat_[name].reset(fMat); - addSize(name, size); + if (hasObject(name)) + { + fMat_[name].reset(fMat); + } + else + { + HADRON_ERROR("no object named '" << name << "'"); + } } Environment::FMat * Environment::getFermionMatrix(const std::string name) const @@ -138,41 +151,66 @@ void Environment::freeFermionMatrix(const std::string name) { LOG(Message) << "freeing fermion matrix '" << name << "'" << std::endl; fMat_.erase(name); - objectSize_.erase(name); + object_.erase(name); } else { - HADRON_ERROR("trying to free undefined fermion matrix '" + name + "'"); + HADRON_ERROR("trying to free unknown fermion matrix '" + name + "'"); } } bool Environment::hasFermionMatrix(const std::string name) const { - return (fMat_.find(name) != fMat_.end()); + return (hasObject(name) and (fMat_.find(name) != fMat_.end())); } // solvers ///////////////////////////////////////////////////////////////////// -void Environment::addSolver(const std::string name, Solver s, - const std::string actionName) +void Environment::addSolver(const std::string name, Solver s) { - solver_[name] = s; - solverAction_[name] = actionName; + if (hasObject(name)) + { + solver_[name] = s; + } + else + { + HADRON_ERROR("no object named '" << name << "'"); + } } bool Environment::hasSolver(const std::string name) const { - return (solver_.find(name) != solver_.end()); + return (hasObject(name) and (solver_.find(name) != solver_.end())); +} + +void Environment::setSolverAction(const std::string name, + const std::string actionName) +{ + if (hasObject(name)) + { + solverAction_[name] = actionName; + } + else + { + HADRON_ERROR("no object named '" << name << "'"); + } } std::string Environment::getSolverAction(const std::string name) const { - if (hasSolver(name)) + if (hasObject(name)) { - return solverAction_.at(name); + try + { + return solverAction_.at(name); + } + catch (std::out_of_range &) + { + HADRON_ERROR("no action registered for solver '" << name << "'") + } } else { - HADRON_ERROR("no solver with name '" << name << "'"); + HADRON_ERROR("no object with name '" << name << "'"); } } @@ -207,47 +245,81 @@ void Environment::freeLattice(const std::string name) { LOG(Message) << "freeing lattice '" << name << "'" << std::endl; lattice_.erase(name); - objectSize_.erase(name); + object_.erase(name); } else { - HADRON_ERROR("trying to free undefined lattice '" + name + "'"); + HADRON_ERROR("trying to free unknown lattice '" + name + "'"); } } bool Environment::hasLattice(const std::string name) const { - return (lattice_.find(name) != lattice_.end()); -} - - -bool Environment::isLattice5d(const std::string name) const -{ - if (hasLattice(name)) - { - return (lattice_.at(name)->_grid->GlobalDimensions().size() == Nd + 1); - } - else - { - HADRON_ERROR("object '" + name + "' undefined"); - - return false; - } -} - -unsigned int Environment::getLatticeLs(const std::string name) const -{ - if (isLattice5d(name)) - { - return lattice_.at(name)->_grid->GlobalDimensions()[0]; - } - else - { - return 1; - } + return (hasObject(name) and (lattice_.find(name) != lattice_.end())); } // general memory management /////////////////////////////////////////////////// +bool Environment::hasObject(const std::string name) const +{ + return (object_.find(name) != object_.end()); +} + +void Environment::registerObject(const std::string name, + const unsigned int size, const unsigned int Ls) +{ + if (!hasObject(name)) + { + ObjInfo info{size, Ls}; + + object_[name] = info; + } + else + { + HADRON_ERROR("object '" + name + "' already exists"); + } +} + +unsigned int Environment::getObjectSize(const std::string name) const +{ + if (hasObject(name)) + { + return object_.at(name).size; + } + else + { + HADRON_ERROR("no object named '" + name + "'"); + } +} + +long unsigned int Environment::getTotalSize(void) const +{ + long unsigned int size = 0; + + for (auto &s: object_) + { + size += s.second.size; + } + + return size; +} + +unsigned int Environment::getObjectLs(const std::string name) const +{ + if (hasObject(name)) + { + return object_.at(name).Ls; + } + else + { + HADRON_ERROR("no object named '" + name + "'"); + } +} + +bool Environment::isObject5d(const std::string name) const +{ + return (getObjectLs(name) > 1); +} + void Environment::addOwnership(const std::string owner, const std::string property) { @@ -267,7 +339,7 @@ bool Environment::hasOwners(const std::string name) const } } -bool Environment::free(const std::string name) +bool Environment::freeObject(const std::string name) { if (!hasOwners(name)) { @@ -284,6 +356,10 @@ bool Environment::free(const std::string name) { freeFermionMatrix(name); } + else if (hasObject(name)) + { + object_.erase(name); + } return true; } @@ -295,41 +371,11 @@ bool Environment::free(const std::string name) void Environment::freeAll(void) { + object_.clear(); lattice_.clear(); fMat_.clear(); solver_.clear(); - objectSize_.clear(); + solverAction_.clear(); owners_.clear(); properties_.clear(); } - -unsigned int Environment::getSize(const std::string name) const -{ - if (hasLattice(name) or hasFermionMatrix(name)) - { - return objectSize_.at(name); - } - else - { - HADRON_ERROR("object '" + name + "' undefined"); - - return 0; - } -} - -long unsigned int Environment::getTotalSize(void) const -{ - long unsigned int size = 0; - - for (auto &s: objectSize_) - { - size += s.second; - } - - return size; -} - -void Environment::addSize(const std::string name, const unsigned int size) -{ - objectSize_[name] = size; -} diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index f5265181..7f55308a 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -47,6 +47,11 @@ public: typedef std::unique_ptr RngPt; typedef std::unique_ptr FMatPt; typedef std::unique_ptr LatticePt; +private: + struct ObjInfo + { + unsigned int size, Ls; + }; public: // dry run void dryRun(const bool isDry); @@ -55,18 +60,19 @@ public: void setTrajectory(const unsigned int traj); unsigned int getTrajectory(void) const; // grids + void createGrid(const unsigned int Ls); GridCartesian * getGrid(const unsigned int Ls = 1) const; GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; // fermion actions - void addFermionMatrix(const std::string name, FMat *mat, - const unsigned int size); + void addFermionMatrix(const std::string name, FMat *mat); FMat * getFermionMatrix(const std::string name) const; void freeFermionMatrix(const std::string name); bool hasFermionMatrix(const std::string name) const; // solvers - void addSolver(const std::string name, Solver s, - const std::string actionName); + void addSolver(const std::string name, Solver s); bool hasSolver(const std::string name) const; + void setSolverAction(const std::string name, + const std::string actionName); std::string getSolverAction(const std::string name) const; void callSolver(const std::string name, LatticeFermion &sol, @@ -76,39 +82,45 @@ public: GridParallelRNG * get4dRng(void) const; // lattice store template - unsigned int lattice4dSize(void) const; - template - void create(const std::string name, - const unsigned int Ls = 1); + T * create(const std::string name); template T * get(const std::string name) const; - void freeLattice(const std::string name); bool hasLattice(const std::string name) const; - bool isLattice5d(const std::string name) const; - unsigned int getLatticeLs(const std::string name) const; + void freeLattice(const std::string name); + template + unsigned int lattice4dSize(void) const; // general memory management + bool hasObject(const std::string name) const; + void registerObject(const std::string name, + const unsigned int size, + const unsigned int Ls = 1); + template + void registerLattice(const std::string name, + const unsigned int Ls = 1); + unsigned int getObjectSize(const std::string name) const; + long unsigned int getTotalSize(void) const; + unsigned int getObjectLs(const std::string name) const; + bool isObject5d(const std::string name) const; void addOwnership(const std::string owner, const std::string property); bool hasOwners(const std::string name) const; - bool free(const std::string name); + bool freeObject(const std::string name); void freeAll(void); - unsigned int getSize(const std::string name) const; - long unsigned int getTotalSize(void) const; private: - void addSize(const std::string name, const unsigned int size); + private: - bool dryRun_{false}; - unsigned int traj_; - GridPt grid4d_; - std::map grid5d_; - GridRbPt gridRb4d_; - std::map gridRb5d_; - RngPt rng4d_; - std::map fMat_; - std::map solver_; - std::map solverAction_; - std::map lattice_; - std::map objectSize_; + bool dryRun_{false}; + unsigned int traj_; + GridPt grid4d_; + std::map grid5d_; + GridRbPt gridRb4d_; + std::map gridRb5d_; + RngPt rng4d_; + std::map object_; + std::map lattice_; + std::map fMat_; + std::map solver_; + std::map solverAction_; std::map> owners_; std::map> properties_; }; @@ -123,41 +135,13 @@ unsigned int Environment::lattice4dSize(void) const } template -void Environment::create(const std::string name, const unsigned int Ls) +T * Environment::create(const std::string name) { - GridCartesian *g4 = getGrid(); - GridCartesian *g; + GridCartesian *g = getGrid(getObjectLs(name)); - if (hasLattice(name)) - { - HADRON_ERROR("object '" + name + "' already exists"); - } - if (Ls > 1) - { - try - { - g = grid5d_.at(Ls).get(); - } - catch(std::out_of_range &) - { - grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g4)); - gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g4)); - g = grid5d_[Ls].get(); - } - } - else - { - g = g4; - } - if (!isDryRun()) - { - lattice_[name].reset(new T(g)); - } - else - { - lattice_[name].reset(nullptr); - } - addSize(name, lattice4dSize()*Ls); + lattice_[name].reset(new T(g)); + + return dynamic_cast(lattice_[name].get()); } template @@ -178,12 +162,19 @@ T * Environment::get(const std::string name) const } else { - HADRON_ERROR("object '" + name + "' undefined"); + HADRON_ERROR("no lattice name '" + name + "'"); return nullptr; } } +template +void Environment::registerLattice(const std::string name, const unsigned int Ls) +{ + createGrid(Ls); + registerObject(name, Ls*lattice4dSize()); +} + END_HADRONS_NAMESPACE #endif // Hadrons_Environment_hpp_ diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/GLoad.cc index 55715fbb..cff9f3ed 100644 --- a/programs/Hadrons/GLoad.cc +++ b/programs/Hadrons/GLoad.cc @@ -59,11 +59,10 @@ std::vector GLoad::getOutput(void) return out; } -// allocation ////////////////////////////////////////////////////////////////// -void GLoad::allocate(void) +// setup /////////////////////////////////////////////////////////////////////// +void GLoad::setup(void) { - env().create(getName()); - gauge_ = env().get(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -75,7 +74,8 @@ void GLoad::execute(void) LOG(Message) << "Loading NERSC configuration from file '" << fileName << "'" << std::endl; - NerscIO::readConfiguration(*gauge_, header, fileName); + LatticeGaugeField &U = *env().create(getName()); + NerscIO::readConfiguration(U, header, fileName); LOG(Message) << "NERSC header:" << std::endl; dump_nersc_header(header, LOG(Message)); } diff --git a/programs/Hadrons/GLoad.hpp b/programs/Hadrons/GLoad.hpp index 4527c33c..cb076bb5 100644 --- a/programs/Hadrons/GLoad.hpp +++ b/programs/Hadrons/GLoad.hpp @@ -55,13 +55,12 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // allocation - virtual void allocate(void); + // setup + virtual void setup(void); // execution virtual void execute(void); private: - Par par_; - LatticeGaugeField *gauge_ = nullptr; + Par par_; }; MODULE_REGISTER(GLoad); diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/GRandom.cc index 53007045..7f81624c 100644 --- a/programs/Hadrons/GRandom.cc +++ b/programs/Hadrons/GRandom.cc @@ -51,16 +51,16 @@ std::vector GRandom::getOutput(void) return out; } -// allocation ////////////////////////////////////////////////////////////////// -void GRandom::allocate(void) +// setup /////////////////////////////////////////////////////////////////////// +void GRandom::setup(void) { - env().create(getName()); - gauge_ = env().get(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// void GRandom::execute(void) { LOG(Message) << "Generating random gauge configuration" << std::endl; - SU3::HotConfiguration(*env().get4dRng(), *gauge_); + LatticeGaugeField &U = *env().create(getName()); + SU3::HotConfiguration(*env().get4dRng(), U); } diff --git a/programs/Hadrons/GRandom.hpp b/programs/Hadrons/GRandom.hpp index 12d5be5f..5d0f4197 100644 --- a/programs/Hadrons/GRandom.hpp +++ b/programs/Hadrons/GRandom.hpp @@ -47,12 +47,10 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // allocation - virtual void allocate(void); + // setup + virtual void setup(void); // execution virtual void execute(void); -private: - LatticeGaugeField *gauge_ = nullptr; }; MODULE_REGISTER(GRandom); diff --git a/programs/Hadrons/GUnit.cc b/programs/Hadrons/GUnit.cc index 5a86aa00..75bdc597 100644 --- a/programs/Hadrons/GUnit.cc +++ b/programs/Hadrons/GUnit.cc @@ -51,16 +51,16 @@ std::vector GUnit::getOutput(void) return out; } -// allocation ////////////////////////////////////////////////////////////////// -void GUnit::allocate(void) +// setup /////////////////////////////////////////////////////////////////////// +void GUnit::setup(void) { - env().create(getName()); - gauge_ = env().get(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// void GUnit::execute(void) { LOG(Message) << "Creating unit gauge configuration" << std::endl; - SU3::ColdConfiguration(*env().get4dRng(), *gauge_); + LatticeGaugeField &U = *env().create(getName()); + SU3::ColdConfiguration(*env().get4dRng(), U); } diff --git a/programs/Hadrons/GUnit.hpp b/programs/Hadrons/GUnit.hpp index 4dfc268d..3c72bd07 100644 --- a/programs/Hadrons/GUnit.hpp +++ b/programs/Hadrons/GUnit.hpp @@ -47,12 +47,10 @@ public: // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); - // allocation - virtual void allocate(void); + // setup + virtual void setup(void); // execution virtual void execute(void); -private: - LatticeGaugeField *gauge_ = nullptr; }; MODULE_REGISTER(GUnit); diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index e43f98d1..6022dd3a 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -52,7 +52,7 @@ public: typedef std::pair Edge; public: // constructor - Graph(void) = default; + Graph(void); // destructor virtual ~Graph(void) = default; // access @@ -71,7 +71,7 @@ public: std::vector getParents(const T &value) const; std::vector getRoots(void) const; std::vector> getConnectedComponents(void) const; - std::vector topoSort(void); + std::vector topoSort(const bool randomize = false); std::vector> allTopoSort(void); // I/O friend std::ostream & operator<<(std::ostream &out, const Graph &g) @@ -97,7 +97,9 @@ private: void unmarkAll(void); bool isMarked(const T &value) const; const T * getFirstMarked(const bool isMarked = true) const; + const T * getRandomMarked(const bool isMarked = true); const T * getFirstUnmarked(void) const; + const T * getRandomUnmarked(void); // prune marked/unmarked vertices void removeMarked(const bool isMarked = true); void removeUnmarked(void); @@ -105,8 +107,9 @@ private: void depthFirstSearch(void); void depthFirstSearch(const T &root); private: - std::map isMarked_; - std::set edgeSet_; + std::map isMarked_; + std::set edgeSet_; + std::mt19937 gen_; }; // build depedency matrix from topological sorts @@ -121,6 +124,15 @@ makeDependencyMatrix(const std::vector> &topSort); * in the worst case E = V^2 */ +// constructor ///////////////////////////////////////////////////////////////// +template +Graph::Graph(void) +{ + std::random_device rd; + + gen_.seed(rd()); +} + // access ////////////////////////////////////////////////////////////////////// // complexity: log(V) template @@ -297,6 +309,37 @@ const T * Graph::getFirstMarked(const bool isMarked) const } } +// complexity: O(log(V)) +template +const T * Graph::getRandomMarked(const bool isMarked) +{ + auto pred = [&isMarked](const std::pair &v) + { + return (v.second == isMarked); + }; + std::uniform_int_distribution dis(0, size() - 1); + auto rIt = isMarked_.begin(); + + std::advance(rIt, dis(gen_)); + auto vIt = std::find_if(rIt, isMarked_.end(), pred); + if (vIt != isMarked_.end()) + { + return &(vIt->first); + } + else + { + vIt = std::find_if(isMarked_.begin(), rIt, pred); + if (vIt != rIt) + { + return &(vIt->first); + } + else + { + return nullptr; + } + } +} + // complexity: O(log(V)) template const T * Graph::getFirstUnmarked(void) const @@ -304,6 +347,13 @@ const T * Graph::getFirstUnmarked(void) const return getFirstMarked(false); } +// complexity: O(log(V)) +template +const T * Graph::getRandomUnmarked(void) +{ + return getRandomMarked(false); +} + // prune marked/unmarked vertices ////////////////////////////////////////////// // complexity: O(V^2*log(V)) template @@ -462,10 +512,10 @@ std::vector> Graph::getConnectedComponents(void) const return res; } -// topological sort using Tarjan's algorithm +// topological sort using a directed DFS algorithm // complexity: O(V*log(V)) template -std::vector Graph::topoSort(void) +std::vector Graph::topoSort(const bool randomize) { std::stack buf; std::vector res; @@ -479,16 +529,20 @@ std::vector Graph::topoSort(void) { HADRON_ERROR("cannot topologically sort a cyclic graph"); } - if (!this->isMarked(v)) + if (!isMarked(v)) { - std::vector child = this->getChildren(v); - + std::vector child = getChildren(v); + tmpMarked[v] = true; + if (randomize) + { + std::shuffle(child.begin(), child.end(), gen_); + } for (auto &c: child) { visit(c); } - this->mark(v); + mark(v); tmpMarked[v] = false; buf.push(v); } @@ -501,11 +555,26 @@ std::vector Graph::topoSort(void) } // loop on unmarked vertices - vPt = getFirstUnmarked(); + unmarkAll(); + if (randomize) + { + vPt = getRandomUnmarked(); + } + else + { + vPt = getFirstUnmarked(); + } while (vPt) { visit(*vPt); - vPt = getFirstUnmarked(); + if (randomize) + { + vPt = getRandomUnmarked(); + } + else + { + vPt = getFirstUnmarked(); + } } unmarkAll(); @@ -522,7 +591,7 @@ std::vector Graph::topoSort(void) // generate all possible topological sorts // Y. L. Varol & D. Rotem, Comput. J. 24(1), pp. 83–84, 1981 // http://comjnl.oupjournals.org/cgi/doi/10.1093/comjnl/24.1.83 -// complexity: O(V*log(V)) +// complexity: O(V*log(V)) (from the paper, but really ?) template std::vector> Graph::allTopoSort(void) { diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/MQuark.cc index d27a545e..c6af53f4 100644 --- a/programs/Hadrons/MQuark.cc +++ b/programs/Hadrons/MQuark.cc @@ -63,27 +63,11 @@ std::vector MQuark::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void MQuark::setup(void) { - auto dim = env().getFermionMatrix(par_.solver)->Grid()->GlobalDimensions(); - - if (dim.size() == Nd) - { - Ls_ = 1; - } - else - { - Ls_ = dim[0]; - } -} - -// allocation ////////////////////////////////////////////////////////////////// -void MQuark::allocate(void) -{ - env().create(getName()); - quark_ = env().get(getName()); + Ls_ = env().getObjectLs(env().getSolverAction(par_.solver)); + env().registerLattice(getName()); if (Ls_ > 1) { - env().create(getName() + "_5d", Ls_); - quark5d_ = env().get(getName() + "_5d"); + env().registerLattice(getName() + "_5d", Ls_); } } @@ -92,10 +76,13 @@ void MQuark::execute(void) { LatticePropagator *fullSource; LatticeFermion source(env().getGrid(Ls_)), sol(env().getGrid(Ls_)); + std::string propName = (Ls_ == 1) ? getName() : (getName() + "_5d"); LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; - if (!env().isLattice5d(par_.source)) + LatticePropagator &prop = *env().create(propName); + // source conversion for 4D sources + if (!env().isObject5d(par_.source)) { if (Ls_ == 1) { @@ -106,15 +93,16 @@ void MQuark::execute(void) HADRON_ERROR("MQuark not implemented with 5D actions"); } } + // source conversion for 5D sources else { if (Ls_ == 1) { HADRON_ERROR("MQuark not implemented with 5D actions"); } - else if (Ls_ != env().getLatticeLs(par_.source)) + else if (Ls_ != env().getObjectLs(par_.source)) { - HADRON_ERROR("MQuark not implemented with 5D actions"); + HADRON_ERROR("Ls mismatch between quark action and source"); } else { @@ -129,13 +117,11 @@ void MQuark::execute(void) PropToFerm(source, *fullSource, s, c); sol = zero; env().callSolver(par_.solver, sol, source); - if (Ls_ == 1) - { - FermToProp(*quark_, sol, s, c); - } - else - { - HADRON_ERROR("MQuark not implemented with 5D actions"); - } + FermToProp(prop, sol, s, c); + } + // create 4D propagators from 5D one if necessary + if (Ls_ > 1) + { + HADRON_ERROR("MQuark not implemented with 5D actions"); } } diff --git a/programs/Hadrons/MQuark.hpp b/programs/Hadrons/MQuark.hpp index aaa3864e..14ced177 100644 --- a/programs/Hadrons/MQuark.hpp +++ b/programs/Hadrons/MQuark.hpp @@ -58,14 +58,11 @@ public: virtual std::vector getOutput(void); // setup virtual void setup(void); - // allocation - virtual void allocate(void); // execution virtual void execute(void); private: Par par_; unsigned int Ls_; - LatticePropagator *source_{nullptr}, *quark_{nullptr}, *quark5d_{nullptr}; Environment::Solver *solver_{nullptr}; }; diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index 3233c210..a2dedb52 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -55,7 +55,6 @@ Environment & Module::env(void) const void Module::operator()(void) { setup(); - allocate(); if (!env().isDryRun()) { execute(); diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 605aec06..2b4bfabe 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -69,8 +69,6 @@ public: virtual std::vector getOutput(void) = 0; // setup virtual void setup(void) {}; - // allocation - virtual void allocate(void) {}; // execution void operator()(void); virtual void execute(void) = 0; diff --git a/programs/Hadrons/SolRBPrecCG.cc b/programs/Hadrons/SolRBPrecCG.cc index 8487991e..fc1d00aa 100644 --- a/programs/Hadrons/SolRBPrecCG.cc +++ b/programs/Hadrons/SolRBPrecCG.cc @@ -63,7 +63,9 @@ std::vector SolRBPrecCG::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void SolRBPrecCG::setup(void) { + env().registerObject(getName(), 0); env().addOwnership(getName(), par_.action); + env().setSolverAction(getName(), par_.action); } // execution /////////////////////////////////////////////////////////////////// @@ -82,5 +84,5 @@ void SolRBPrecCG::execute(void) LOG(Message) << "setting up Schur red-black preconditioned CG for" << " action '" << par_.action << "' with residual " << par_.residual << std::endl; - env().addSolver(getName(), solver, par_.action); + env().addSolver(getName(), solver); } diff --git a/programs/Hadrons/SrcPoint.cc b/programs/Hadrons/SrcPoint.cc index 40046cd0..559e56d3 100644 --- a/programs/Hadrons/SrcPoint.cc +++ b/programs/Hadrons/SrcPoint.cc @@ -59,11 +59,10 @@ std::vector SrcPoint::getOutput(void) return out; } -// allocation ////////////////////////////////////////////////////////////////// -void SrcPoint::allocate(void) +// setup /////////////////////////////////////////////////////////////////////// +void SrcPoint::setup(void) { - env().create(getName()); - src_ = env().get(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -74,7 +73,8 @@ void SrcPoint::execute(void) LOG(Message) << "Creating point source at position [" << par_.position << "]" << std::endl; - id = 1.; - *src_ = zero; - pokeSite(id, *src_, position); + LatticePropagator &src = *env().create(getName()); + id = 1.; + src = zero; + pokeSite(id, src, position); } diff --git a/programs/Hadrons/SrcPoint.hpp b/programs/Hadrons/SrcPoint.hpp index 75cd9aa6..8cfa89c9 100644 --- a/programs/Hadrons/SrcPoint.hpp +++ b/programs/Hadrons/SrcPoint.hpp @@ -66,13 +66,12 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // allocation - virtual void allocate(void); + // setup + virtual void setup(void); // execution virtual void execute(void); private: - Par par_; - LatticePropagator *src_{nullptr}; + Par par_; }; MODULE_REGISTER(SrcPoint); diff --git a/programs/Hadrons/SrcZ2.cc b/programs/Hadrons/SrcZ2.cc index 42d5dbb2..0ed6227d 100644 --- a/programs/Hadrons/SrcZ2.cc +++ b/programs/Hadrons/SrcZ2.cc @@ -59,11 +59,10 @@ std::vector SrcZ2::getOutput(void) return out; } -// allocation ////////////////////////////////////////////////////////////////// -void SrcZ2::allocate(void) +// setup /////////////////////////////////////////////////////////////////////// +void SrcZ2::setup(void) { - env().create(getName()); - src_ = env().get(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -84,10 +83,11 @@ void SrcZ2::execute(void) LOG(Message) << "Generating Z_2 band for " << par_.tA << " <= t <= " << par_.tB << std::endl; } + LatticePropagator &src = *env().create(getName()); LatticeCoordinate(t, Tp); bernoulli(*env().get4dRng(), eta); - eta = (2.*eta - shift)*(1./::sqrt(2.)); - eta = where((t >= par_.tA) and (t <= par_.tB), eta, 0.*eta); - *src_ = 1.; - *src_ = (*src_)*eta; + eta = (2.*eta - shift)*(1./::sqrt(2.)); + eta = where((t >= par_.tA) and (t <= par_.tB), eta, 0.*eta); + src = 1.; + src = src*eta; } diff --git a/programs/Hadrons/SrcZ2.hpp b/programs/Hadrons/SrcZ2.hpp index dc4c35c6..a1458693 100644 --- a/programs/Hadrons/SrcZ2.hpp +++ b/programs/Hadrons/SrcZ2.hpp @@ -68,13 +68,12 @@ public: // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); - // allocation - virtual void allocate(void); + // setup + virtual void setup(void); // execution virtual void execute(void); private: - Par par_; - LatticePropagator *src_; + Par par_; }; MODULE_REGISTER(SrcZ2); From df3fbc477ef15410f9b42f2bd88804e5b85ffaf3 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sat, 7 May 2016 13:26:56 -0700 Subject: [PATCH 037/807] Hadrons: code cleaning --- programs/Hadrons/Application.cc | 13 ++++++++----- programs/Hadrons/Application.hpp | 2 +- programs/Hadrons/Environment.cc | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index aa7e66bc..3b1564c0 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -32,6 +32,9 @@ using namespace Grid; using namespace QCD; using namespace Hadrons; +#define BIG_SEP "===============" +#define SEP "---------------" + /****************************************************************************** * Application implementation * ******************************************************************************/ @@ -204,8 +207,8 @@ void Application::configLoop(void) for (unsigned int t = range.start; t < range.end; t += range.step) { - LOG(Message) << "========== Starting measurement for trajectory " << t - << " ==========" << std::endl; + LOG(Message) << BIG_SEP << " Starting measurement for trajectory " << t + << " " << BIG_SEP << std::endl; env_.setTrajectory(t); execute(program_); env_.freeAll(); @@ -240,9 +243,9 @@ unsigned int Application::execute(const std::vector &program) for (unsigned int i = 0; i < program.size(); ++i) { // execute module - LOG(Message) << "---------- Measurement step " << i+1 << "/" - << program.size() << " (module '" << program[i] << "')" - << " ----------" << std::endl; + LOG(Message) << SEP << " Measurement step " << i+1 << "/" + << program.size() << " (module '" << program[i] << "') " + << SEP << std::endl; (*module_[program[i]])(); size = env_.getTotalSize(); // print used memory after execution diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 518b29ca..6b7e54c5 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -86,7 +86,7 @@ private: void configLoop(void); unsigned int execute(const std::vector &program); // pretty size formatting - std::string sizeString(long unsigned int bytes); + static std::string sizeString(long unsigned int bytes); private: long unsigned int locVol_; std::string parameterFileName_; diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index ee0b842d..3390893d 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -149,7 +149,7 @@ void Environment::freeFermionMatrix(const std::string name) { if (hasFermionMatrix(name)) { - LOG(Message) << "freeing fermion matrix '" << name << "'" << std::endl; + LOG(Message) << "Freeing fermion matrix '" << name << "'" << std::endl; fMat_.erase(name); object_.erase(name); } @@ -243,7 +243,7 @@ void Environment::freeLattice(const std::string name) { if (hasLattice(name)) { - LOG(Message) << "freeing lattice '" << name << "'" << std::endl; + LOG(Message) << "Freeing lattice '" << name << "'" << std::endl; lattice_.erase(name); object_.erase(name); } From 9e986654e695ecf131a5ce200678255e3558f38f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 9 May 2016 14:49:06 +0100 Subject: [PATCH 038/807] Hadrons: first version of the genetic scheduler --- programs/Hadrons/Application.cc | 111 ++++++------ programs/Hadrons/CMeson.cc | 2 +- programs/Hadrons/Environment.cc | 20 ++- programs/Hadrons/GeneticScheduler.hpp | 233 ++++++++++++++++++++++++++ programs/Hadrons/Global.cc | 1 + programs/Hadrons/Global.hpp | 1 + programs/Hadrons/Graph.hpp | 131 +++++++++++---- programs/Hadrons/Hadrons.cc | 1 + 8 files changed, 407 insertions(+), 93 deletions(-) create mode 100644 programs/Hadrons/GeneticScheduler.hpp diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 3b1564c0..7bcc9959 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -26,7 +26,7 @@ directory. *******************************************************************************/ #include -#include +#include using namespace Grid; using namespace QCD; @@ -115,7 +115,7 @@ sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" void Application::schedule(void) { - // memory peak and invers memory peak functions + // memory peak function auto memPeak = [this](const std::vector &program) { unsigned int memPeak; @@ -131,16 +131,11 @@ void Application::schedule(void) return memPeak; }; - auto invMemPeak = [&memPeak](const std::vector &program) - { - return 1./memPeak(program); - }; - - Graph moduleGraph; - - LOG(Message) << "Scheduling computation..." << std::endl; // create dependency graph + Graph moduleGraph; + + LOG(Message) << "Scheduling computation..." << std::endl; for (auto &m: module_) { std::vector input = m.second->getInput(); @@ -157,39 +152,47 @@ void Application::schedule(void) } } - // topological sort - unsigned int k = 0; - + // constrained topological sort using a genetic algorithm + constexpr unsigned int maxGen = 200, maxCstGen = 50; + unsigned int k = 0, gen, prevPeak, nCstPeak = 0; std::vector> con = moduleGraph.getConnectedComponents(); - + GeneticScheduler::Parameters par; + std::random_device rd; + + par.popSize = 20; + par.mutationRate = .1; + par.seed = rd(); + CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed)); for (unsigned int i = 0; i < con.size(); ++i) { -// std::vector> t = con[i].allTopoSort(); -// int memPeak, minMemPeak = -1; -// unsigned int bestInd; -// bool msg; -// -// LOG(Message) << "analyzing " << t.size() << " possible programs..." -// << std::endl; -// env_.dryRun(true); -// for (unsigned int p = 0; p < t.size(); ++p) -// { -// msg = HadronsLogMessage.isActive(); -// HadronsLogMessage.Active(false); -// -// memPeak = execute(t[p]); -// if ((memPeak < minMemPeak) or (minMemPeak < 0)) -// { -// minMemPeak = memPeak; -// bestInd = p; -// } -// HadronsLogMessage.Active(msg); -// env_.freeAll(); -// } -// env_.dryRun(false); - std::vector t = con[i].topoSort(); + GeneticScheduler scheduler(con[i], memPeak, par); + + gen = 0; + do + { + scheduler.nextGeneration(); + if (gen != 0) + { + if (prevPeak == scheduler.getMinValue()) + { + nCstPeak++; + } + else + { + nCstPeak = 0; + } + } + prevPeak = scheduler.getMinValue(); + if (gen % 10 == 0) + { + LOG(Iterative) << "Generation " << gen << ": " + << MEM_MSG(scheduler.getMinValue()) << std::endl; + } + gen++; + } while ((gen < maxGen) and (nCstPeak < maxCstGen)); + auto &t = scheduler.getMinSchedule(); LOG(Message) << "Program " << i + 1 << " (memory peak: " - << MEM_MSG(memPeak(t)) << "):" << std::endl; + << MEM_MSG(scheduler.getMinValue()) << "):" << std::endl; for (unsigned int j = 0; j < t.size(); ++j) { program_.push_back(t[j]); @@ -213,13 +216,14 @@ void Application::configLoop(void) execute(program_); env_.freeAll(); } + LOG(Message) << BIG_SEP << " End of measurement " << BIG_SEP << std::endl; } unsigned int Application::execute(const std::vector &program) { - unsigned int memPeak = 0, size; + unsigned int memPeak = 0, sizeBefore, sizeAfter; std::vector> freeProg; - bool continueCollect; + bool continueCollect, nothingFreed; // build garbage collection schedule freeProg.resize(program.size()); @@ -247,15 +251,17 @@ unsigned int Application::execute(const std::vector &program) << program.size() << " (module '" << program[i] << "') " << SEP << std::endl; (*module_[program[i]])(); - size = env_.getTotalSize(); + sizeBefore = env_.getTotalSize(); // print used memory after execution - LOG(Message) << "Allocated objects: " << MEM_MSG(size) << std::endl; - if (size > memPeak) + LOG(Message) << "Allocated objects: " << MEM_MSG(sizeBefore) + << std::endl; + if (sizeBefore > memPeak) { - memPeak = size; + memPeak = sizeBefore; } // garbage collection for step i LOG(Message) << "Garbage collection..." << std::endl; + nothingFreed = true; do { continueCollect = false; @@ -270,6 +276,7 @@ unsigned int Application::execute(const std::vector &program) // if an object has been freed, remove it from // the garbage collection schedule freeProg[i].erase(n); + nothingFreed = false; } } } while (continueCollect); @@ -282,9 +289,17 @@ unsigned int Application::execute(const std::vector &program) freeProg[i + 1].insert(n); } } - // print used memory after garbage collection - size = env_.getTotalSize(); - LOG(Message) << "Allocated objects: " << MEM_MSG(size) << std::endl; + // print used memory after garbage collection if necessary + sizeAfter = env_.getTotalSize(); + if (sizeBefore != sizeAfter) + { + LOG(Message) << "Allocated objects: " << MEM_MSG(sizeAfter) + << std::endl; + } + else + { + LOG(Message) << "Nothing to free" << std::endl; + } } return memPeak; diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/CMeson.cc index 4e3e6b68..6cd627bd 100644 --- a/programs/Hadrons/CMeson.cc +++ b/programs/Hadrons/CMeson.cc @@ -64,7 +64,7 @@ std::vector CMeson::getOutput(void) void CMeson::execute(void) { LOG(Message) << "Computing meson contraction '" << getName() << "' using" - << " quarks '" << par_.q1 << " and '" << par_.q2 << "'" + << " quarks '" << par_.q1 << "' and '" << par_.q2 << "'" << std::endl; XmlWriter writer(par_.output); diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 3390893d..bdb8d0d2 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -69,10 +69,13 @@ unsigned int Environment::getTrajectory(void) const // grids /////////////////////////////////////////////////////////////////////// void Environment::createGrid(const unsigned int Ls) { - auto g = getGrid(); - - grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g)); - gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g)); + if (grid5d_.find(Ls) == grid5d_.end()) + { + auto g = getGrid(); + + grid5d_[Ls].reset(SpaceTimeGrid::makeFiveDimGrid(Ls, g)); + gridRb5d_[Ls].reset(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls, g)); + } } GridCartesian * Environment::getGrid(const unsigned int Ls) const @@ -329,11 +332,14 @@ void Environment::addOwnership(const std::string owner, bool Environment::hasOwners(const std::string name) const { - try + + auto it = owners_.find(name); + + if (it != owners_.end()) { - return (!owners_.at(name).empty()); + return (!it->second.empty()); } - catch (std::out_of_range &) + else { return false; } diff --git a/programs/Hadrons/GeneticScheduler.hpp b/programs/Hadrons/GeneticScheduler.hpp new file mode 100644 index 00000000..8d9bbf40 --- /dev/null +++ b/programs/Hadrons/GeneticScheduler.hpp @@ -0,0 +1,233 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/GeneticScheduler.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_GeneticScheduler_hpp_ +#define Hadrons_GeneticScheduler_hpp_ + +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Scheduler based on a genetic algorithm * + ******************************************************************************/ +template +class GeneticScheduler +{ +public: + typedef std::function &)> ObjFunc; + struct Parameters + { + double mutationRate; + unsigned int popSize, seed; + }; +public: + // constructor + GeneticScheduler(Graph &graph, const ObjFunc &func, + const Parameters &par); + // destructor + virtual ~GeneticScheduler(void) = default; + // access + const std::vector & getMinSchedule(void); + int getMinValue(void); + // breed a new generation + void nextGeneration(void); + // print population + friend std::ostream & operator<<(std::ostream &out, + const GeneticScheduler &s) + { + for (auto &p: s.population_) + { + out << p.second << ": " << p.first << std::endl; + } + + return out; + } +private: + // randomly initialize population + void initPopulation(void); + // genetic operators + const std::vector & selection(void); + void crossover(const std::vector &c1, + const std::vector &c2); + void mutation(std::vector &c); +private: + Graph &graph_; + const ObjFunc &func_; + const Parameters par_; + std::multimap> population_; + std::mt19937 gen_; +}; + +/****************************************************************************** + * template implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +GeneticScheduler::GeneticScheduler(Graph &graph, const ObjFunc &func, + const Parameters &par) +: graph_(graph) +, func_(func) +, par_(par) +{ + gen_.seed(par_.seed); +} + +// access ////////////////////////////////////////////////////////////////////// +template +const std::vector & GeneticScheduler::getMinSchedule(void) +{ + return population_.begin()->second; +} + +template +int GeneticScheduler::getMinValue(void) +{ + return population_.begin()->first; +} + +// breed a new generation ////////////////////////////////////////////////////// +template +void GeneticScheduler::nextGeneration(void) +{ + std::uniform_real_distribution dis(0., 1.); + + // random initialization of the population if necessary + if (population_.size() != par_.popSize) + { + initPopulation(); + } + + // mating + for (unsigned int i = 0; i < par_.popSize/2; ++i) + { + auto &p1 = selection(), &p2 = selection(); + crossover(p1, p2); + } + + // random mutations + auto buf = population_; + population_.clear(); + for (auto &c: buf) + { + if (dis(gen_) < par_.mutationRate) + { + mutation(c.second); + } + population_.emplace(func_(c.second), c.second); + } + + // grim reaper + auto it = population_.begin(); + + std::advance(it, par_.popSize); + population_.erase(it, population_.end()); +} + +// randomly initialize population ////////////////////////////////////////////// +template +void GeneticScheduler::initPopulation(void) +{ + population_.clear(); + for (unsigned int i = 0; i < par_.popSize; ++i) + { + auto p = graph_.topoSort(gen_); + + population_.emplace(func_(p), p); + } +} + +// genetic operators /////////////////////////////////////////////////////////// +template +const std::vector & GeneticScheduler::selection(void) +{ + std::vector prob; + + for (auto &c: population_) + { + prob.push_back(1./c.first); + } + std::discrete_distribution dis(prob.begin(), prob.end()); + auto rIt = population_.begin(); + std::advance(rIt, dis(gen_)); + + return rIt->second; +} + +template +void GeneticScheduler::crossover(const std::vector &p1, + const std::vector &p2) +{ + std::uniform_int_distribution dis(1, p1.size() - 2); + unsigned int cut = dis(gen_); + std::vector c1, c2, buf; + + auto cross = [&buf, cut](std::vector &c, const std::vector &p1, + const std::vector &p2) + { + buf = p2; + for (unsigned int i = 0; i < cut; ++i) + { + c.push_back(p1[i]); + buf.erase(std::find(buf.begin(), buf.end(), p1[i])); + } + for (unsigned int i = 0; i < buf.size(); ++i) + { + c.push_back(buf[i]); + } + }; + + cross(c1, p1, p2); + cross(c2, p2, p1); + population_.emplace(func_(c1), c1); + population_.emplace(func_(c2), c2); +} + +template +void GeneticScheduler::mutation(std::vector &c) +{ + std::uniform_int_distribution dis(1, c.size() - 2); + unsigned int cut = dis(gen_); + Graph g = graph_; + std::vector buf; + + for (unsigned int i = cut; i < c.size(); ++i) + { + g.removeVertex(c[i]); + } + buf = g.topoSort(gen_); + for (unsigned int i = cut; i < c.size(); ++i) + { + buf.push_back(c[i]); + } + c = buf; +} + +END_HADRONS_NAMESPACE + +#endif // Hadrons_GeneticScheduler_hpp_ diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index 6b855cda..ec5e8f51 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -34,4 +34,5 @@ using namespace Hadrons; HadronsLogger Hadrons::HadronsLogError(1,"Error"); HadronsLogger Hadrons::HadronsLogWarning(1,"Warning"); HadronsLogger Hadrons::HadronsLogMessage(1,"Message"); +HadronsLogger Hadrons::HadronsLogIterative(1,"Iterative"); HadronsLogger Hadrons::HadronsLogDebug(1,"Debug"); diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index f5a5c144..38bdcc0f 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -63,6 +63,7 @@ abort(); extern HadronsLogger HadronsLogError; extern HadronsLogger HadronsLogWarning; extern HadronsLogger HadronsLogMessage; +extern HadronsLogger HadronsLogIterative; extern HadronsLogger HadronsLogDebug; // singleton pattern diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 6022dd3a..5f71f31b 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -56,13 +56,14 @@ public: // destructor virtual ~Graph(void) = default; // access - void addVertex(const T &value); - void addEdge(const Edge &e); - void addEdge(const T &start, const T &end); - void removeVertex(const T &value); - void removeEdge(const Edge &e); - void removeEdge(const T &start, const T &end); - unsigned int size(void) const; + void addVertex(const T &value); + void addEdge(const Edge &e); + void addEdge(const T &start, const T &end); + std::vector getVertices(void) const; + void removeVertex(const T &value); + void removeEdge(const Edge &e); + void removeEdge(const T &start, const T &end); + unsigned int size(void) const; // tests bool gotValue(const T &value) const; // graph topological manipulations @@ -71,7 +72,9 @@ public: std::vector getParents(const T &value) const; std::vector getRoots(void) const; std::vector> getConnectedComponents(void) const; - std::vector topoSort(const bool randomize = false); + std::vector topoSort(void); + template + std::vector topoSort(Gen &gen); std::vector> allTopoSort(void); // I/O friend std::ostream & operator<<(std::ostream &out, const Graph &g) @@ -97,9 +100,11 @@ private: void unmarkAll(void); bool isMarked(const T &value) const; const T * getFirstMarked(const bool isMarked = true) const; - const T * getRandomMarked(const bool isMarked = true); + template + const T * getRandomMarked(const bool isMarked, Gen &gen); const T * getFirstUnmarked(void) const; - const T * getRandomUnmarked(void); + template + const T * getRandomUnmarked(Gen &gen); // prune marked/unmarked vertices void removeMarked(const bool isMarked = true); void removeUnmarked(void); @@ -109,7 +114,6 @@ private: private: std::map isMarked_; std::set edgeSet_; - std::mt19937 gen_; }; // build depedency matrix from topological sorts @@ -127,11 +131,7 @@ makeDependencyMatrix(const std::vector> &topSort); // constructor ///////////////////////////////////////////////////////////////// template Graph::Graph(void) -{ - std::random_device rd; - - gen_.seed(rd()); -} +{} // access ////////////////////////////////////////////////////////////////////// // complexity: log(V) @@ -157,6 +157,19 @@ void Graph::addEdge(const T &start, const T &end) addEdge(Edge(start, end)); } +template +std::vector Graph::getVertices(void) const +{ + std::vector vertex; + + for (auto &v: isMarked_) + { + vertex.push_back(v.first); + } + + return vertex; +} + // complexity: O(V*log(V)) template void Graph::removeVertex(const T &value) @@ -311,7 +324,8 @@ const T * Graph::getFirstMarked(const bool isMarked) const // complexity: O(log(V)) template -const T * Graph::getRandomMarked(const bool isMarked) +template +const T * Graph::getRandomMarked(const bool isMarked, Gen &gen) { auto pred = [&isMarked](const std::pair &v) { @@ -320,7 +334,7 @@ const T * Graph::getRandomMarked(const bool isMarked) std::uniform_int_distribution dis(0, size() - 1); auto rIt = isMarked_.begin(); - std::advance(rIt, dis(gen_)); + std::advance(rIt, dis(gen)); auto vIt = std::find_if(rIt, isMarked_.end(), pred); if (vIt != isMarked_.end()) { @@ -349,9 +363,10 @@ const T * Graph::getFirstUnmarked(void) const // complexity: O(log(V)) template -const T * Graph::getRandomUnmarked(void) +template +const T * Graph::getRandomUnmarked(Gen &gen) { - return getRandomMarked(false); + return getRandomMarked(false, gen); } // prune marked/unmarked vertices ////////////////////////////////////////////// @@ -515,7 +530,7 @@ std::vector> Graph::getConnectedComponents(void) const // topological sort using a directed DFS algorithm // complexity: O(V*log(V)) template -std::vector Graph::topoSort(const bool randomize) +std::vector Graph::topoSort(void) { std::stack buf; std::vector res; @@ -534,10 +549,6 @@ std::vector Graph::topoSort(const bool randomize) std::vector child = getChildren(v); tmpMarked[v] = true; - if (randomize) - { - std::shuffle(child.begin(), child.end(), gen_); - } for (auto &c: child) { visit(c); @@ -556,25 +567,71 @@ std::vector Graph::topoSort(const bool randomize) // loop on unmarked vertices unmarkAll(); - if (randomize) - { - vPt = getRandomUnmarked(); - } - else - { - vPt = getFirstUnmarked(); - } + vPt = getFirstUnmarked(); while (vPt) { visit(*vPt); - if (randomize) + vPt = getFirstUnmarked(); + } + unmarkAll(); + + // create result vector + while (!buf.empty()) + { + res.push_back(buf.top()); + buf.pop(); + } + + return res; +} + +// random version of the topological sort +// complexity: O(V*log(V)) +template +template +std::vector Graph::topoSort(Gen &gen) +{ + std::stack buf; + std::vector res; + const T *vPt; + std::map tmpMarked(isMarked_); + + // visit function + std::function visit = [&](const T &v) + { + if (tmpMarked.at(v)) { - vPt = getRandomUnmarked(); + HADRON_ERROR("cannot topologically sort a cyclic graph"); } - else + if (!isMarked(v)) { - vPt = getFirstUnmarked(); + std::vector child = getChildren(v); + + tmpMarked[v] = true; + std::shuffle(child.begin(), child.end(), gen); + for (auto &c: child) + { + visit(c); + } + mark(v); + tmpMarked[v] = false; + buf.push(v); } + }; + + // reset temporary marks + for (auto &v: tmpMarked) + { + tmpMarked.at(v.first) = false; + } + + // loop on unmarked vertices + unmarkAll(); + vPt = getRandomUnmarked(gen); + while (vPt) + { + visit(*vPt); + vPt = getRandomUnmarked(gen); } unmarkAll(); diff --git a/programs/Hadrons/Hadrons.cc b/programs/Hadrons/Hadrons.cc index da5e02b1..97b8686c 100644 --- a/programs/Hadrons/Hadrons.cc +++ b/programs/Hadrons/Hadrons.cc @@ -49,6 +49,7 @@ int main(int argc, char *argv[]) HadronsLogError.Active(GridLogError.isActive()); HadronsLogWarning.Active(GridLogWarning.isActive()); HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogIterative.Active(GridLogIterative.isActive()); HadronsLogDebug.Active(GridLogDebug.isActive()); LOG(Message) << "Grid initialized" << std::endl; From 7dfdc9baa0581eacfcdc910467cfce5304deed2e Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 10 May 2016 10:41:20 +0100 Subject: [PATCH 039/807] Hadrons: lattice dynamic cast fix --- programs/Hadrons/Environment.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 7f55308a..65f870ee 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -149,11 +149,11 @@ T * Environment::get(const std::string name) const { if (hasLattice(name)) { - try + if (auto pt = dynamic_cast(lattice_.at(name).get())) { - return dynamic_cast(lattice_.at(name).get()); + return pt; } - catch (std::bad_cast &) + else { HADRON_ERROR("object '" + name + "' does not have type " + typeid(T *).name() + "(object type: " From d604580e5a6ff7fd92010fd662834c7bfbfaad5c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 10 May 2016 19:07:41 +0100 Subject: [PATCH 040/807] Hadrons: all objects/modules mapped to an integer address system to remove string operations from scheduling --- programs/Hadrons/Application.cc | 166 +------- programs/Hadrons/Application.hpp | 14 +- programs/Hadrons/Environment.cc | 662 ++++++++++++++++++++++++++----- programs/Hadrons/Environment.hpp | 156 ++++++-- programs/Hadrons/Global.cc | 27 ++ programs/Hadrons/Global.hpp | 20 + 6 files changed, 734 insertions(+), 311 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 7bcc9959..6381a9e1 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -42,10 +42,9 @@ using namespace Hadrons; Application::Application(const std::string parameterFileName) : parameterFileName_(parameterFileName) , env_(Environment::getInstance()) -, modFactory_(ModuleFactory::getInstance()) { LOG(Message) << "Modules available:" << std::endl; - auto list = modFactory_.getBuilderList(); + auto list = ModuleFactory::getInstance().getBuilderList(); for (auto &m: list) { LOG(Message) << " " << m << std::endl; @@ -95,18 +94,12 @@ void Application::parseParameterFile(void) do { read(reader, "id", id); - module_[id.name] = modFactory_.create(id.type, id.name); - module_[id.name]->parseParameters(reader, "options"); - std::vector output = module_[id.name]->getOutput(); - for (auto &n: output) - { - associatedModule_[n] = id.name; - } - input_[id.name] = module_[id.name]->getInput(); + env_.createModule(id.name, id.type, reader); } while (reader.nextElement("module")); pop(reader); pop(reader); env_.setSeed(strToVec(par_.seed)); + env_.printContent(); } // schedule computation //////////////////////////////////////////////////////// @@ -116,7 +109,7 @@ sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" void Application::schedule(void) { // memory peak function - auto memPeak = [this](const std::vector &program) + auto memPeak = [this](const std::vector &program) { unsigned int memPeak; bool msg; @@ -124,7 +117,7 @@ void Application::schedule(void) msg = HadronsLogMessage.isActive(); HadronsLogMessage.Active(false); env_.dryRun(true); - memPeak = execute(program); + memPeak = env_.executeProgram(program); env_.dryRun(false); env_.freeAll(); HadronsLogMessage.Active(true); @@ -132,32 +125,14 @@ void Application::schedule(void) return memPeak; }; - // create dependency graph - Graph moduleGraph; - - LOG(Message) << "Scheduling computation..." << std::endl; - for (auto &m: module_) - { - std::vector input = m.second->getInput(); - for (auto &n: input) - { - try - { - moduleGraph.addEdge(associatedModule_.at(n), m.first); - } - catch (std::out_of_range &) - { - HADRON_ERROR("unknown object '" + n + "'"); - } - } - } - // constrained topological sort using a genetic algorithm + LOG(Message) << "Scheduling computation..." << std::endl; constexpr unsigned int maxGen = 200, maxCstGen = 50; unsigned int k = 0, gen, prevPeak, nCstPeak = 0; - std::vector> con = moduleGraph.getConnectedComponents(); - GeneticScheduler::Parameters par; - std::random_device rd; + auto graph = env_.makeModuleGraph(); + auto con = graph.getConnectedComponents(); + std::random_device rd; + GeneticScheduler::Parameters par; par.popSize = 20; par.mutationRate = .1; @@ -165,7 +140,7 @@ void Application::schedule(void) CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed)); for (unsigned int i = 0; i < con.size(); ++i) { - GeneticScheduler scheduler(con[i], memPeak, par); + GeneticScheduler scheduler(con[i], memPeak, par); gen = 0; do @@ -197,13 +172,13 @@ void Application::schedule(void) { program_.push_back(t[j]); LOG(Message) << std::setw(4) << std::right << k + 1 << ": " - << program_[k] << std::endl; + << env_.getModuleName(program_[k]) << std::endl; k++; } } } -// program execution /////////////////////////////////////////////////////////// +// loop on configurations ////////////////////////////////////////////////////// void Application::configLoop(void) { auto range = par_.configs.range; @@ -213,121 +188,8 @@ void Application::configLoop(void) LOG(Message) << BIG_SEP << " Starting measurement for trajectory " << t << " " << BIG_SEP << std::endl; env_.setTrajectory(t); - execute(program_); + env_.executeProgram(program_); env_.freeAll(); } LOG(Message) << BIG_SEP << " End of measurement " << BIG_SEP << std::endl; } - -unsigned int Application::execute(const std::vector &program) -{ - unsigned int memPeak = 0, sizeBefore, sizeAfter; - std::vector> freeProg; - bool continueCollect, nothingFreed; - - // build garbage collection schedule - freeProg.resize(program.size()); - for (auto &n: associatedModule_) - { - auto pred = [&n, this](const std::string &s) - { - auto &in = input_[s]; - auto it = std::find(in.begin(), in.end(), n.first); - - return (it != in.end()) or (s == n.second); - }; - auto it = std::find_if(program.rbegin(), program.rend(), pred); - if (it != program.rend()) - { - freeProg[program.rend() - it - 1].insert(n.first); - } - } - - // program execution - for (unsigned int i = 0; i < program.size(); ++i) - { - // execute module - LOG(Message) << SEP << " Measurement step " << i+1 << "/" - << program.size() << " (module '" << program[i] << "') " - << SEP << std::endl; - (*module_[program[i]])(); - sizeBefore = env_.getTotalSize(); - // print used memory after execution - LOG(Message) << "Allocated objects: " << MEM_MSG(sizeBefore) - << std::endl; - if (sizeBefore > memPeak) - { - memPeak = sizeBefore; - } - // garbage collection for step i - LOG(Message) << "Garbage collection..." << std::endl; - nothingFreed = true; - do - { - continueCollect = false; - auto toFree = freeProg[i]; - for (auto &n: toFree) - { - // continue garbage collection while there are still - // objects without owners - continueCollect = continueCollect or !env_.hasOwners(n); - if(env_.freeObject(n)) - { - // if an object has been freed, remove it from - // the garbage collection schedule - freeProg[i].erase(n); - nothingFreed = false; - } - } - } while (continueCollect); - // any remaining objects in step i garbage collection schedule - // is scheduled for step i + 1 - if (i + 1 < program.size()) - { - for (auto &n: freeProg[i]) - { - freeProg[i + 1].insert(n); - } - } - // print used memory after garbage collection if necessary - sizeAfter = env_.getTotalSize(); - if (sizeBefore != sizeAfter) - { - LOG(Message) << "Allocated objects: " << MEM_MSG(sizeAfter) - << std::endl; - } - else - { - LOG(Message) << "Nothing to free" << std::endl; - } - } - - return memPeak; -} - -// pretty size formatting ////////////////////////////////////////////////////// -std::string Application::sizeString(long unsigned int bytes) - -{ - constexpr unsigned int bufSize = 256; - const char *suffixes[7] = {"", "K", "M", "G", "T", "P", "E"}; - char buf[256]; - long unsigned int s = 0; - double count = bytes; - - while (count >= 1024 && s < 7) - { - s++; - count /= 1024; - } - if (count - floor(count) == 0.0) - { - snprintf(buf, bufSize, "%d %sB", (int)count, suffixes[s]); - } - else - { - snprintf(buf, bufSize, "%.1f %sB", count, suffixes[s]); - } - - return std::string(buf); -} diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 6b7e54c5..67b8d7a0 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -82,22 +82,14 @@ private: void parseParameterFile(void); // schedule computation void schedule(void); - // program execution - void configLoop(void); - unsigned int execute(const std::vector &program); - // pretty size formatting - static std::string sizeString(long unsigned int bytes); + // loop on configurations + void configLoop(void); private: long unsigned int locVol_; std::string parameterFileName_; GlobalPar par_; Environment &env_; - ModuleFactory &modFactory_; - std::map> module_; - std::map associatedModule_; - std::map> input_; - std::vector program_; - std::vector> freeProg_; + std::vector program_; }; END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index bdb8d0d2..4c7ce023 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -26,6 +26,8 @@ directory. *******************************************************************************/ #include +#include +#include using namespace Grid; using namespace QCD; @@ -41,6 +43,12 @@ Environment::Environment(void) GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), GridDefaultMpi())); gridRb4d_.reset(SpaceTimeGrid::makeFourDimRedBlackGrid(grid4d_.get())); + auto loc = getGrid()->LocalDimensions(); + locVol_ = 1; + for (unsigned int d = 0; d < loc.size(); ++d) + { + locVol_ *= loc[d]; + } rng4d_.reset(new GridParallelRNG(grid4d_.get())); } @@ -116,12 +124,312 @@ GridRedBlackCartesian * Environment::getRbGrid(const unsigned int Ls) const } } -// fermion actions ///////////////////////////////////////////////////////////// -void Environment::addFermionMatrix(const std::string name, FMat *fMat) +// random number generator ///////////////////////////////////////////////////// +void Environment::setSeed(const std::vector &seed) +{ + rng4d_->SeedFixedIntegers(seed); +} + +GridParallelRNG * Environment::get4dRng(void) const +{ + return rng4d_.get(); +} + +// module management /////////////////////////////////////////////////////////// +void Environment::createModule(const std::string name, const std::string type, + XmlReader &reader) +{ + auto addObject = [this](const std::string name, const int moduleAddress) + { + ObjInfo info; + + object_.push_back(info); + objectName_.push_back(name); + objectAddress_[name] = object_.size() - 1; + objectModule_.push_back(moduleAddress); + owners_.push_back(std::set()); + properties_.push_back(std::set()); + }; + + if (!hasModule(name)) + { + auto &factory = ModuleFactory::getInstance(); + std::vector inputAddress; + + module_.push_back(factory.create(type, name)); + moduleType_.push_back(type); + moduleName_.push_back(name); + moduleAddress_[name] = module_.size() - 1; + module_.back()->parseParameters(reader, "options"); + auto input = module_.back()->getInput(); + for (auto &in: input) + { + if (!hasObject(in)) + { + addObject(in , -1); + } + inputAddress.push_back(objectAddress_[in]); + } + moduleInput_.push_back(inputAddress); + auto output = module_.back()->getOutput(); + for (auto &out: output) + { + if (!hasObject(out)) + { + addObject(out , module_.size() - 1); + } + else + { + if (objectModule_[objectAddress_[out]] < 0) + { + objectModule_[objectAddress_[out]] = module_.size() - 1; + } + else + { + HADRON_ERROR("object '" + out + + "' is already produced by module '" + + moduleName_[objectModule_[getObjectAddress(out)]] + + "' (while creating module '" + name + "')"); + } + } + } + } + else + { + HADRON_ERROR("module '" + name + "' already exists"); + } +} + +Module * Environment::getModule(const unsigned int address) const +{ + if (hasModule(address)) + { + return module_[address].get(); + } + else + { + HADRON_ERROR("no module with address " + std::to_string(address)); + } +} + +Module * Environment::getModule(const std::string name) const +{ + return getModule(getModuleAddress(name)); +} + +unsigned int Environment::getModuleAddress(const std::string name) const +{ + if (hasModule(name)) + { + return moduleAddress_.at(name); + } + else + { + HADRON_ERROR("no module with name '" + name + "'"); + } +} + +std::string Environment::getModuleName(const unsigned int address) const +{ + if (hasModule(address)) + { + return moduleName_[address]; + } + else + { + HADRON_ERROR("no module with address " + std::to_string(address)); + } +} + +std::string Environment::getModuleType(const unsigned int address) const +{ + if (hasModule(address)) + { + return moduleType_[address]; + } + else + { + HADRON_ERROR("no module with address " + std::to_string(address)); + } +} + +std::string Environment::getModuleType(const std::string name) const +{ + return getModuleType(getModuleAddress(name)); +} + +bool Environment::hasModule(const unsigned int address) const +{ + return (address < module_.size()); +} + +bool Environment::hasModule(const std::string name) const +{ + return (moduleAddress_.find(name) != moduleAddress_.end()); +} + +Graph Environment::makeModuleGraph(void) const +{ + Graph moduleGraph; + + for (unsigned int i = 0; i < module_.size(); ++i) + { + for (auto &j: moduleInput_[i]) + { + moduleGraph.addEdge(objectModule_[j], i); + } + } + + return moduleGraph; +} + +#define BIG_SEP "===============" +#define SEP "---------------" +#define MEM_MSG(size)\ +sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" + +unsigned int Environment::executeProgram(const std::vector &p) +{ + unsigned int memPeak = 0, sizeBefore, sizeAfter; + std::vector> freeProg; + bool continueCollect, nothingFreed; + + // build garbage collection schedule + freeProg.resize(p.size()); + for (unsigned int i = 0; i < object_.size(); ++i) + { + auto pred = [i, this](const unsigned int j) + { + auto &in = moduleInput_[j]; + auto it = std::find(in.begin(), in.end(), i); + + return (it != in.end()) or (j == objectModule_[i]); + }; + auto it = std::find_if(p.rbegin(), p.rend(), pred); + if (it != p.rend()) + { + freeProg[p.rend() - it - 1].insert(i); + } + } + + // program execution + for (unsigned int i = 0; i < p.size(); ++i) + { + // execute module + LOG(Message) << SEP << " Measurement step " << i+1 << "/" + << p.size() << " (module '" << moduleName_[p[i]] << "') " + << SEP << std::endl; + (*module_[p[i]])(); + sizeBefore = getTotalSize(); + // print used memory after execution + LOG(Message) << "Allocated objects: " << MEM_MSG(sizeBefore) + << std::endl; + if (sizeBefore > memPeak) + { + memPeak = sizeBefore; + } + // garbage collection for step i + LOG(Message) << "Garbage collection..." << std::endl; + nothingFreed = true; + do + { + continueCollect = false; + auto toFree = freeProg[i]; + for (auto &j: toFree) + { + // continue garbage collection while there are still + // objects without owners + continueCollect = continueCollect or !hasOwners(j); + if(freeObject(j)) + { + // if an object has been freed, remove it from + // the garbage collection schedule + freeProg[i].erase(j); + nothingFreed = false; + } + } + } while (continueCollect); + // 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 + sizeAfter = getTotalSize(); + if (sizeBefore != sizeAfter) + { + LOG(Message) << "Allocated objects: " << MEM_MSG(sizeAfter) + << std::endl; + } + else + { + LOG(Message) << "Nothing to free" << std::endl; + } + } + + return memPeak; +} + +unsigned int Environment::executeProgram(const std::vector &p) +{ + std::vector pAddress; + + for (auto &n: p) + { + pAddress.push_back(getModuleAddress(n)); + } + + return executeProgram(pAddress); +} + +// lattice store /////////////////////////////////////////////////////////////// +void Environment::freeLattice(const unsigned int address) +{ + if (hasLattice(address)) + { + if (!isDryRun()) + { + LOG(Message) << "Freeing lattice '" << moduleName_[address] + << "'" << std::endl; + } + lattice_.erase(address); + object_[address] = ObjInfo(); + } + else + { + HADRON_ERROR("trying to free unknown lattice (address " + + std::to_string(address) + ")"); + } +} + +bool Environment::hasLattice(const unsigned int address) const +{ + return (hasRegisteredObject(address) + and (lattice_.find(address) != lattice_.end())); +} + +bool Environment::hasLattice(const std::string name) const { if (hasObject(name)) { - fMat_[name].reset(fMat); + return hasLattice(getObjectAddress(name)); + } + else + { + return false; + } +} + +// fermion actions ///////////////////////////////////////////////////////////// +void Environment::addFermionMatrix(const std::string name, FMat *fMat) +{ + if (hasRegisteredObject(name)) + { + fMat_[getObjectAddress(name)].reset(fMat); } else { @@ -131,15 +439,21 @@ void Environment::addFermionMatrix(const std::string name, FMat *fMat) Environment::FMat * Environment::getFermionMatrix(const std::string name) const { + unsigned int i; + if (hasFermionMatrix(name)) { - return fMat_.at(name).get(); + i = getObjectAddress(name); + + return fMat_.at(i).get(); } else { if (hasSolver(name)) { - return fMat_.at(solverAction_.at(name)).get(); + i = getObjectAddress(solverAction_.at(name)); + + return fMat_.at(i).get(); } else { @@ -148,41 +462,80 @@ Environment::FMat * Environment::getFermionMatrix(const std::string name) const } } -void Environment::freeFermionMatrix(const std::string name) +bool Environment::hasFermionMatrix(const unsigned int address) const { - if (hasFermionMatrix(name)) - { - LOG(Message) << "Freeing fermion matrix '" << name << "'" << std::endl; - fMat_.erase(name); - object_.erase(name); - } - else - { - HADRON_ERROR("trying to free unknown fermion matrix '" + name + "'"); - } + return (hasRegisteredObject(address) + and (fMat_.find(address) != fMat_.end())); } bool Environment::hasFermionMatrix(const std::string name) const { - return (hasObject(name) and (fMat_.find(name) != fMat_.end())); + if (hasObject(name)) + { + return hasFermionMatrix(getObjectAddress(name)); + } + else + { + return false; + } +} + +void Environment::freeFermionMatrix(const unsigned int address) +{ + if (hasFermionMatrix(address)) + { + if (!isDryRun()) + { + LOG(Message) << "Freeing fermion matrix '" << objectName_[address] + << "'" << std::endl; + } + fMat_.erase(address); + object_[address] = ObjInfo(); + } + else + { + HADRON_ERROR("trying to free unknown fermion matrix (address " + + std::to_string(address) + ")"); + } +} + +void Environment::freeFermionMatrix(const std::string name) +{ + freeFermionMatrix(getObjectAddress(name)); } // solvers ///////////////////////////////////////////////////////////////////// void Environment::addSolver(const std::string name, Solver s) { - if (hasObject(name)) + auto address = getObjectAddress(name); + + if (hasRegisteredObject(address)) { - solver_[name] = s; + solver_[address] = s; } else { - HADRON_ERROR("no object named '" << name << "'"); + HADRON_ERROR("object with name '" + name + + "' exsists but is not registered"); } } +bool Environment::hasSolver(const unsigned int address) const +{ + return (hasRegisteredObject(address) + and (solver_.find(address) != solver_.end())); +} + bool Environment::hasSolver(const std::string name) const { - return (hasObject(name) and (solver_.find(name) != solver_.end())); + if (hasObject(name)) + { + return hasSolver(getObjectAddress(name)); + } + else + { + return false; + } } void Environment::setSolverAction(const std::string name, @@ -222,7 +575,7 @@ void Environment::callSolver(const std::string name, LatticeFermion &sol, { if (hasSolver(name)) { - solver_.at(name)(sol, source); + solver_.at(getObjectAddress(name))(sol, source); } else { @@ -230,114 +583,124 @@ void Environment::callSolver(const std::string name, LatticeFermion &sol, } } -// random number generator ///////////////////////////////////////////////////// -void Environment::setSeed(const std::vector &seed) +// general memory management /////////////////////////////////////////////////// +void Environment::registerObject(const unsigned int address, + const unsigned int size, const unsigned int Ls) { - rng4d_->SeedFixedIntegers(seed); -} - -GridParallelRNG * Environment::get4dRng(void) const -{ - return rng4d_.get(); -} - -// lattice store /////////////////////////////////////////////////////////////// -void Environment::freeLattice(const std::string name) -{ - if (hasLattice(name)) + if (!hasRegisteredObject(address)) { - LOG(Message) << "Freeing lattice '" << name << "'" << std::endl; - lattice_.erase(name); - object_.erase(name); + if (hasObject(address)) + { + ObjInfo info; + + info.size = size; + info.Ls = Ls; + info.isRegistered = true; + object_[address] = info; + } + else + { + HADRON_ERROR("no object with address " + std::to_string(address)); + } } else { - HADRON_ERROR("trying to free unknown lattice '" + name + "'"); + HADRON_ERROR("object with address " + std::to_string(address) + + " already registered"); } } -bool Environment::hasLattice(const std::string name) const -{ - return (hasObject(name) and (lattice_.find(name) != lattice_.end())); -} - -// general memory management /////////////////////////////////////////////////// -bool Environment::hasObject(const std::string name) const -{ - return (object_.find(name) != object_.end()); -} - void Environment::registerObject(const std::string name, const unsigned int size, const unsigned int Ls) { - if (!hasObject(name)) + registerObject(getObjectAddress(name), size, Ls); +} + +unsigned int Environment::getObjectAddress(const std::string name) const +{ + if (hasObject(name)) { - ObjInfo info{size, Ls}; - - object_[name] = info; + return objectAddress_.at(name); } else { - HADRON_ERROR("object '" + name + "' already exists"); + HADRON_ERROR("no object with name '" + name + "'"); + } +} + +std::string Environment::getObjectName(const unsigned int address) const +{ + if (hasObject(address)) + { + return objectName_[address]; + } + else + { + HADRON_ERROR("no object with address " + std::to_string(address)); + } +} + +unsigned int Environment::getObjectSize(const unsigned int address) const +{ + if (hasRegisteredObject(address)) + { + return object_[address].size; + } + else if (hasObject(address)) + { + HADRON_ERROR("object with address " + std::to_string(address) + + " exsists but is not registered"); + } + else + { + HADRON_ERROR("no object with address " + std::to_string(address)); } } unsigned int Environment::getObjectSize(const std::string name) const { - if (hasObject(name)) + return getObjectSize(getObjectAddress(name)); +} + +unsigned int Environment::getObjectLs(const unsigned int address) const +{ + if (hasRegisteredObject(address)) { - return object_.at(name).size; + return object_[address].Ls; + } + else if (hasObject(address)) + { + HADRON_ERROR("object with address " + std::to_string(address) + + " exsists but is not registered"); } else { - HADRON_ERROR("no object named '" + name + "'"); + HADRON_ERROR("no object with address " + std::to_string(address)); } } -long unsigned int Environment::getTotalSize(void) const -{ - long unsigned int size = 0; - - for (auto &s: object_) - { - size += s.second.size; - } - - return size; -} - unsigned int Environment::getObjectLs(const std::string name) const { - if (hasObject(name)) - { - return object_.at(name).Ls; - } - else - { - HADRON_ERROR("no object named '" + name + "'"); - } + return getObjectLs(getObjectAddress(name)); } -bool Environment::isObject5d(const std::string name) const +bool Environment::hasObject(const unsigned int address) const { - return (getObjectLs(name) > 1); + return (address < object_.size()); } -void Environment::addOwnership(const std::string owner, - const std::string property) -{ - owners_[property].insert(owner); - properties_[owner].insert(property); -} - -bool Environment::hasOwners(const std::string name) const +bool Environment::hasObject(const std::string name) const { + auto it = objectAddress_.find(name); - auto it = owners_.find(name); - - if (it != owners_.end()) + return ((it != objectAddress_.end()) and hasObject(it->second)); +} + +bool Environment::hasRegisteredObject(const unsigned int address) const +{ + if (hasObject(address)) { - return (!it->second.empty()); + return object_[address].isRegistered; } else { @@ -345,26 +708,94 @@ bool Environment::hasOwners(const std::string name) const } } -bool Environment::freeObject(const std::string name) +bool Environment::hasRegisteredObject(const std::string name) const { - if (!hasOwners(name)) + if (hasObject(name)) { - for (auto &p: properties_[name]) + return hasRegisteredObject(getObjectAddress(name)); + } + else + { + return false; + } +} + +bool Environment::isObject5d(const unsigned int address) const +{ + return (getObjectLs(address) > 1); +} + +bool Environment::isObject5d(const std::string name) const +{ + return (getObjectLs(name) > 1); +} + +long unsigned int Environment::getTotalSize(void) const +{ + long unsigned int size = 0; + + for (auto &o: object_) + { + if (o.isRegistered) { - owners_[p].erase(name); + size += o.size; } - properties_[name].clear(); - if (hasLattice(name)) + } + + return size; +} + +void Environment::addOwnership(const unsigned int owner, + const unsigned int property) +{ + owners_[property].insert(owner); + properties_[owner].insert(property); +} + +void Environment::addOwnership(const std::string owner, + const std::string property) +{ + addOwnership(getObjectAddress(owner), getObjectAddress(property)); +} + +bool Environment::hasOwners(const unsigned int address) const +{ + + if (hasObject(address)) + { + return (!owners_[address].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)) + { + for (auto &p: properties_[address]) { - freeLattice(name); + owners_[p].erase(address); } - else if (hasFermionMatrix(name)) + properties_[address].clear(); + if (hasLattice(address)) { - freeFermionMatrix(name); + freeLattice(address); } - else if (hasObject(name)) + else if (hasFermionMatrix(address)) { - object_.erase(name); + freeFermionMatrix(address); + } + else if (hasObject(address)) + { + object_[address] = ObjInfo(); } return true; @@ -375,9 +806,13 @@ bool Environment::freeObject(const std::string name) } } +bool Environment::freeObject(const std::string name) +{ + return freeObject(getObjectAddress(name)); +} + void Environment::freeAll(void) { - object_.clear(); lattice_.clear(); fMat_.clear(); solver_.clear(); @@ -385,3 +820,20 @@ void Environment::freeAll(void) owners_.clear(); properties_.clear(); } + +void Environment::printContent(void) +{ + LOG(Message) << "Modules: " << std::endl; + for (unsigned int i = 0; i < module_.size(); ++i) + { + LOG(Message) << std::setw(4) << std::right << i << ": " + << moduleName_[i] << " (" + << moduleType_[i] << ")" << std::endl; + } + LOG(Message) << "Objects: " << std::endl; + for (unsigned int i = 0; i < object_.size(); ++i) + { + LOG(Message) << std::setw(4) << std::right << i << ": " + << objectName_[i] << std::endl; + } +} diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 65f870ee..4cecf7da 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -29,28 +29,34 @@ directory. #define Hadrons_Environment_hpp_ #include +#include BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Global environment * ******************************************************************************/ +// forward declaration of Module +class Module; + class Environment { SINGLETON(Environment); public: - typedef FermionOperator FMat; - typedef std::function Solver; + typedef std::unique_ptr ModPt; typedef std::unique_ptr GridPt; typedef std::unique_ptr GridRbPt; - typedef std::unique_ptr RngPt; + typedef FermionOperator FMat; typedef std::unique_ptr FMatPt; + typedef std::function Solver; + typedef std::unique_ptr RngPt; typedef std::unique_ptr LatticePt; private: struct ObjInfo { - unsigned int size, Ls; + unsigned int size{0}, Ls{0}; + bool isRegistered{false}; }; public: // dry run @@ -63,13 +69,45 @@ public: void createGrid(const unsigned int Ls); GridCartesian * getGrid(const unsigned int Ls = 1) const; GridRedBlackCartesian * getRbGrid(const unsigned int Ls = 1) const; + // random number generator + void setSeed(const std::vector &seed); + GridParallelRNG * get4dRng(void) const; + // module management + void createModule(const std::string name, + const std::string type, + XmlReader &reader); + Module * getModule(const unsigned int address) const; + Module * getModule(const std::string name) const; + unsigned int getModuleAddress(const std::string name) const; + std::string getModuleName(const unsigned int address) const; + std::string getModuleType(const unsigned int address) const; + std::string getModuleType(const std::string name) const; + bool hasModule(const unsigned int address) const; + bool hasModule(const std::string name) const; + Graph makeModuleGraph(void) const; + unsigned int executeProgram(const std::vector &p); + unsigned int executeProgram(const std::vector &p); + // lattice store + template + T * create(const std::string name); + template + T * get(const std::string name) const; + bool hasLattice(const unsigned int address) const; + bool hasLattice(const std::string name) const; + void freeLattice(const unsigned int address); + void freeLattice(const std::string name); + template + unsigned int lattice4dSize(void) const; // fermion actions void addFermionMatrix(const std::string name, FMat *mat); FMat * getFermionMatrix(const std::string name) const; - void freeFermionMatrix(const std::string name); + bool hasFermionMatrix(const unsigned int address) const; bool hasFermionMatrix(const std::string name) const; + void freeFermionMatrix(const unsigned int address); + void freeFermionMatrix(const std::string name); // solvers void addSolver(const std::string name, Solver s); + bool hasSolver(const unsigned int address) const; bool hasSolver(const std::string name) const; void setSolverAction(const std::string name, const std::string actionName); @@ -77,52 +115,73 @@ public: void callSolver(const std::string name, LatticeFermion &sol, const LatticeFermion &src) const; - // random number generator - void setSeed(const std::vector &seed); - GridParallelRNG * get4dRng(void) const; - // lattice store - template - T * create(const std::string name); - template - T * get(const std::string name) const; - bool hasLattice(const std::string name) const; - void freeLattice(const std::string name); - template - unsigned int lattice4dSize(void) const; // general memory management - bool hasObject(const std::string name) const; + void registerObject(const unsigned int address, + const unsigned int size, + const unsigned int Ls = 1); void registerObject(const std::string name, const unsigned int size, const unsigned int Ls = 1); template + void registerLattice(const unsigned int address, + const unsigned int Ls = 1); + template void registerLattice(const std::string name, const unsigned int Ls = 1); + unsigned int getObjectAddress(const std::string name) const; + std::string getObjectName(const unsigned int address) const; + unsigned int getObjectSize(const unsigned int address) const; unsigned int getObjectSize(const std::string name) const; - long unsigned int getTotalSize(void) const; + unsigned int getObjectLs(const unsigned int address) const; unsigned int getObjectLs(const std::string name) const; + bool hasObject(const unsigned int address) const; + bool hasObject(const std::string name) const; + bool hasRegisteredObject(const unsigned int address) const; + bool hasRegisteredObject(const std::string name) const; + bool isObject5d(const unsigned int address) const; bool isObject5d(const std::string name) const; + long unsigned int 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 freeAll(void); + void printContent(void); private: - -private: - bool dryRun_{false}; - unsigned int traj_; - GridPt grid4d_; - std::map grid5d_; - GridRbPt gridRb4d_; - std::map gridRb5d_; - RngPt rng4d_; - std::map object_; - std::map lattice_; - std::map fMat_; - std::map solver_; - std::map solverAction_; - std::map> owners_; - std::map> properties_; + // general + bool dryRun_{false}; + unsigned int traj_, locVol_; + // grids + GridPt grid4d_; + std::map grid5d_; + GridRbPt gridRb4d_; + std::map gridRb5d_; + // random number generator + RngPt rng4d_; + // module and related maps + std::vector module_; + std::vector moduleType_; + std::vector moduleName_; + std::map moduleAddress_; + std::vector> moduleInput_; + // lattice store + std::map lattice_; + // fermion matrix store + std::map fMat_; + // solver store & solver/action map + std::map solver_; + std::map solverAction_; + // object register + std::vector object_; + std::vector objectName_; + std::map objectAddress_; + std::vector objectModule_; + std::vector> owners_; + std::vector> properties_; }; /****************************************************************************** @@ -137,11 +196,12 @@ unsigned int Environment::lattice4dSize(void) const template T * Environment::create(const std::string name) { - GridCartesian *g = getGrid(getObjectLs(name)); + auto i = getObjectAddress(name); + GridCartesian *g = getGrid(getObjectLs(i)); - lattice_[name].reset(new T(g)); + lattice_[i].reset(new T(g)); - return dynamic_cast(lattice_[name].get()); + return dynamic_cast(lattice_[i].get()); } template @@ -149,25 +209,35 @@ T * Environment::get(const std::string name) const { if (hasLattice(name)) { - if (auto pt = dynamic_cast(lattice_.at(name).get())) + auto i = getObjectAddress(name); + + if (auto pt = dynamic_cast(lattice_.at(i).get())) { return pt; } else { HADRON_ERROR("object '" + name + "' does not have type " - + typeid(T *).name() + "(object type: " - + typeid(lattice_.at(name).get()).name() + ")"); + + typeName() + "(object type: " + + typeName(*lattice_.at(i).get()) + ")"); } } else { - HADRON_ERROR("no lattice name '" + name + "'"); + HADRON_ERROR("no lattice with name '" + name + "'"); return nullptr; } } +template +void Environment::registerLattice(const unsigned int address, + const unsigned int Ls) +{ + createGrid(Ls); + registerObject(address, Ls*lattice4dSize()); +} + template void Environment::registerLattice(const std::string name, const unsigned int Ls) { diff --git a/programs/Hadrons/Global.cc b/programs/Hadrons/Global.cc index ec5e8f51..a13efec1 100644 --- a/programs/Hadrons/Global.cc +++ b/programs/Hadrons/Global.cc @@ -36,3 +36,30 @@ HadronsLogger Hadrons::HadronsLogWarning(1,"Warning"); HadronsLogger Hadrons::HadronsLogMessage(1,"Message"); HadronsLogger Hadrons::HadronsLogIterative(1,"Iterative"); HadronsLogger Hadrons::HadronsLogDebug(1,"Debug"); + +// pretty size formatting ////////////////////////////////////////////////////// +std::string Hadrons::sizeString(long unsigned int bytes) + +{ + constexpr unsigned int bufSize = 256; + const char *suffixes[7] = {"", "K", "M", "G", "T", "P", "E"}; + char buf[256]; + long unsigned int s = 0; + double count = bytes; + + while (count >= 1024 && s < 7) + { + s++; + count /= 1024; + } + if (count - floor(count) == 0.0) + { + snprintf(buf, bufSize, "%d %sB", (int)count, suffixes[s]); + } + else + { + snprintf(buf, bufSize, "%.1f %sB", count, suffixes[s]); + } + + return std::string(buf); +} diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 38bdcc0f..c42753c1 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -30,6 +30,7 @@ directory. #include #include +#include #include #define BEGIN_HADRONS_NAMESPACE \ @@ -91,6 +92,25 @@ public:\ private:\ name(void) = default; +// pretty size formating +std::string sizeString(long unsigned int bytes); + +template +std::string typeName(const T &x) +{ + std::string name(typeid(x).name()); + + return name; +} + +template +std::string typeName(void) +{ + std::string name(typeid(T).name()); + + return name; +} + END_HADRONS_NAMESPACE #endif // Hadrons_Global_hpp_ From 29dfe99e7ccbf128eaea50e37959aba17fdb8b3b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 10 May 2016 19:19:38 +0100 Subject: [PATCH 041/807] Hadrons: more scheduler optimizations --- programs/Hadrons/Environment.cc | 38 ++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 4c7ce023..45b16aa0 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -316,20 +316,29 @@ unsigned int Environment::executeProgram(const std::vector &p) for (unsigned int i = 0; i < p.size(); ++i) { // execute module - LOG(Message) << SEP << " Measurement step " << i+1 << "/" - << p.size() << " (module '" << moduleName_[p[i]] << "') " - << SEP << std::endl; + if (!isDryRun()) + { + LOG(Message) << SEP << " Measurement step " << i+1 << "/" + << p.size() << " (module '" << moduleName_[p[i]] + << "') " << SEP << std::endl; + } (*module_[p[i]])(); sizeBefore = getTotalSize(); // print used memory after execution - LOG(Message) << "Allocated objects: " << MEM_MSG(sizeBefore) - << std::endl; + if (!isDryRun()) + { + LOG(Message) << "Allocated objects: " << MEM_MSG(sizeBefore) + << std::endl; + } if (sizeBefore > memPeak) { memPeak = sizeBefore; } // garbage collection for step i - LOG(Message) << "Garbage collection..." << std::endl; + if (!isDryRun()) + { + LOG(Message) << "Garbage collection..." << std::endl; + } nothingFreed = true; do { @@ -360,14 +369,17 @@ unsigned int Environment::executeProgram(const std::vector &p) } // print used memory after garbage collection if necessary sizeAfter = getTotalSize(); - if (sizeBefore != sizeAfter) + if (!isDryRun()) { - LOG(Message) << "Allocated objects: " << MEM_MSG(sizeAfter) - << std::endl; - } - else - { - LOG(Message) << "Nothing to free" << std::endl; + if (sizeBefore != sizeAfter) + { + LOG(Message) << "Allocated objects: " << MEM_MSG(sizeAfter) + << std::endl; + } + else + { + LOG(Message) << "Nothing to free" << std::endl; + } } } From 84fa2bdce6a8d4b27bb02371eebd51be759dc363 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 10 May 2016 20:12:48 +0100 Subject: [PATCH 042/807] Hadrons: modules moved in their own directory & utility script to add new modules --- programs/Hadrons/Makefile.am | 31 ++----------- programs/Hadrons/Module.cc.template | 45 +++++++++++++++++++ programs/Hadrons/Module.hpp.template | 43 ++++++++++++++++++ programs/Hadrons/add_module.sh | 15 +++++++ programs/Hadrons/make_module_list.sh | 4 ++ programs/Hadrons/modules.inc | 10 +++++ programs/Hadrons/{ => modules}/AWilson.cc | 2 +- programs/Hadrons/{ => modules}/AWilson.hpp | 0 programs/Hadrons/{ => modules}/CMeson.cc | 2 +- programs/Hadrons/{ => modules}/CMeson.hpp | 0 programs/Hadrons/{ => modules}/GLoad.cc | 2 +- programs/Hadrons/{ => modules}/GLoad.hpp | 0 programs/Hadrons/{ => modules}/GRandom.cc | 4 +- programs/Hadrons/{ => modules}/GRandom.hpp | 0 programs/Hadrons/{ => modules}/GUnit.cc | 2 +- programs/Hadrons/{ => modules}/GUnit.hpp | 0 programs/Hadrons/{ => modules}/MQuark.cc | 2 +- programs/Hadrons/{ => modules}/MQuark.hpp | 0 programs/Hadrons/{ => modules}/SolRBPrecCG.cc | 2 +- .../Hadrons/{ => modules}/SolRBPrecCG.hpp | 0 programs/Hadrons/{ => modules}/SrcPoint.cc | 2 +- programs/Hadrons/{ => modules}/SrcPoint.hpp | 0 programs/Hadrons/{ => modules}/SrcZ2.cc | 2 +- programs/Hadrons/{ => modules}/SrcZ2.hpp | 0 24 files changed, 131 insertions(+), 37 deletions(-) create mode 100644 programs/Hadrons/Module.cc.template create mode 100644 programs/Hadrons/Module.hpp.template create mode 100755 programs/Hadrons/add_module.sh create mode 100755 programs/Hadrons/make_module_list.sh create mode 100644 programs/Hadrons/modules.inc rename programs/Hadrons/{ => modules}/AWilson.cc (98%) rename programs/Hadrons/{ => modules}/AWilson.hpp (100%) rename programs/Hadrons/{ => modules}/CMeson.cc (98%) rename programs/Hadrons/{ => modules}/CMeson.hpp (100%) rename programs/Hadrons/{ => modules}/GLoad.cc (98%) rename programs/Hadrons/{ => modules}/GLoad.hpp (100%) rename programs/Hadrons/{ => modules}/GRandom.cc (94%) rename programs/Hadrons/{ => modules}/GRandom.hpp (100%) rename programs/Hadrons/{ => modules}/GUnit.cc (98%) rename programs/Hadrons/{ => modules}/GUnit.hpp (100%) rename programs/Hadrons/{ => modules}/MQuark.cc (99%) rename programs/Hadrons/{ => modules}/MQuark.hpp (100%) rename programs/Hadrons/{ => modules}/SolRBPrecCG.cc (98%) rename programs/Hadrons/{ => modules}/SolRBPrecCG.hpp (100%) rename programs/Hadrons/{ => modules}/SrcPoint.cc (98%) rename programs/Hadrons/{ => modules}/SrcPoint.hpp (100%) rename programs/Hadrons/{ => modules}/SrcZ2.cc (98%) rename programs/Hadrons/{ => modules}/SrcZ2.hpp (100%) diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 2d1b5980..19bc9515 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -I$(top_srcdir)/programs -I$(top_srcdir)/lib +AM_CXXFLAGS = -I$(top_srcdir)/programs -I../$(top_srcdir)/programs -I$(top_srcdir)/lib AM_LDFLAGS = -L$(top_builddir)/lib bin_PROGRAMS = Hadrons @@ -11,31 +11,8 @@ Hadrons_SOURCES = \ Hadrons.cc \ Module.cc -# general modules -Hadrons_SOURCES += \ - MQuark.cc - -# fermion actions -Hadrons_SOURCES += \ - AWilson.cc - -# contraction modules -Hadrons_SOURCES += \ - CMeson.cc - -# gauge modules -Hadrons_SOURCES += \ - GLoad.cc \ - GRandom.cc \ - GUnit.cc - -# solver modules -Hadrons_SOURCES += \ - SolRBPrecCG.cc - -# source modules -Hadrons_SOURCES += \ - SrcPoint.cc \ - SrcZ2.cc +# modules +include modules.inc +Hadrons_SOURCES += $(modules) Hadrons_LDADD = -lGrid diff --git a/programs/Hadrons/Module.cc.template b/programs/Hadrons/Module.cc.template new file mode 100644 index 00000000..f2533d80 --- /dev/null +++ b/programs/Hadrons/Module.cc.template @@ -0,0 +1,45 @@ +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* ___FILEBASENAME___ implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +___FILEBASENAME___::___FILEBASENAME___(const std::string name) +: Module(name) +{} + +// parse parameters //////////////////////////////////////////////////////////// +void ___FILEBASENAME___::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_); +} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector ___FILEBASENAME___::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector ___FILEBASENAME___::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +void ___FILEBASENAME___::setup(void) +{ + +} + +// execution /////////////////////////////////////////////////////////////////// +void ___FILEBASENAME___::execute(void) +{ + +} diff --git a/programs/Hadrons/Module.hpp.template b/programs/Hadrons/Module.hpp.template new file mode 100644 index 00000000..002d93b9 --- /dev/null +++ b/programs/Hadrons/Module.hpp.template @@ -0,0 +1,43 @@ +#ifndef Hadrons____FILEBASENAME____hpp_ +#define Hadrons____FILEBASENAME____hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * ___FILEBASENAME___ * + ******************************************************************************/ +class ___FILEBASENAME___: public Module +{ +public: + class Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Par, unsigned int, i); + }; +public: + // constructor + ___FILEBASENAME___(const std::string name); + // destructor + virtual ~___FILEBASENAME___(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +private: + Par par_; +}; + +MODULE_REGISTER(___FILEBASENAME___); + +END_HADRONS_NAMESPACE + +#endif // Hadrons____FILEBASENAME____hpp_ diff --git a/programs/Hadrons/add_module.sh b/programs/Hadrons/add_module.sh new file mode 100755 index 00000000..e412e0e7 --- /dev/null +++ b/programs/Hadrons/add_module.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +if (( $# != 1 )); then + echo "usage: `basename $0` " 1>&2 + exit 1 +fi +NAME=$1 + +if [ -e "Modules/${NAME}.cc" ] || [ -e "Modules/${NAME}.hpp" ]; then + echo "error: files Modules/${NAME}.* already exists" 1>&2 + exit 1 +fi +sed "s/___FILEBASENAME___/${NAME}/g" Module.cc.template > Modules/${NAME}.cc +sed "s/___FILEBASENAME___/${NAME}/g" Module.hpp.template > Modules/${NAME}.hpp +./make_module_list.sh diff --git a/programs/Hadrons/make_module_list.sh b/programs/Hadrons/make_module_list.sh new file mode 100755 index 00000000..78ed8040 --- /dev/null +++ b/programs/Hadrons/make_module_list.sh @@ -0,0 +1,4 @@ +#!/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 diff --git a/programs/Hadrons/modules.inc b/programs/Hadrons/modules.inc new file mode 100644 index 00000000..c0da727a --- /dev/null +++ b/programs/Hadrons/modules.inc @@ -0,0 +1,10 @@ +modules =\ + Modules/AWilson.cc \ + Modules/CMeson.cc \ + Modules/GLoad.cc \ + Modules/GRandom.cc \ + Modules/GUnit.cc \ + Modules/MQuark.cc \ + Modules/SolRBPrecCG.cc \ + Modules/SrcPoint.cc \ + Modules/SrcZ2.cc diff --git a/programs/Hadrons/AWilson.cc b/programs/Hadrons/modules/AWilson.cc similarity index 98% rename from programs/Hadrons/AWilson.cc rename to programs/Hadrons/modules/AWilson.cc index 5a75a257..77f9cc25 100644 --- a/programs/Hadrons/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/AWilson.hpp b/programs/Hadrons/modules/AWilson.hpp similarity index 100% rename from programs/Hadrons/AWilson.hpp rename to programs/Hadrons/modules/AWilson.hpp diff --git a/programs/Hadrons/CMeson.cc b/programs/Hadrons/modules/CMeson.cc similarity index 98% rename from programs/Hadrons/CMeson.cc rename to programs/Hadrons/modules/CMeson.cc index 6cd627bd..28b2dd81 100644 --- a/programs/Hadrons/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/CMeson.hpp b/programs/Hadrons/modules/CMeson.hpp similarity index 100% rename from programs/Hadrons/CMeson.hpp rename to programs/Hadrons/modules/CMeson.hpp diff --git a/programs/Hadrons/GLoad.cc b/programs/Hadrons/modules/GLoad.cc similarity index 98% rename from programs/Hadrons/GLoad.cc rename to programs/Hadrons/modules/GLoad.cc index cff9f3ed..8f1b4d95 100644 --- a/programs/Hadrons/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/GLoad.hpp b/programs/Hadrons/modules/GLoad.hpp similarity index 100% rename from programs/Hadrons/GLoad.hpp rename to programs/Hadrons/modules/GLoad.hpp diff --git a/programs/Hadrons/GRandom.cc b/programs/Hadrons/modules/GRandom.cc similarity index 94% rename from programs/Hadrons/GRandom.cc rename to programs/Hadrons/modules/GRandom.cc index 7f81624c..34b1d57e 100644 --- a/programs/Hadrons/GRandom.cc +++ b/programs/Hadrons/modules/GRandom.cc @@ -25,13 +25,13 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; /****************************************************************************** -* GRandom implementation * +* GRandom implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// GRandom::GRandom(const std::string name) diff --git a/programs/Hadrons/GRandom.hpp b/programs/Hadrons/modules/GRandom.hpp similarity index 100% rename from programs/Hadrons/GRandom.hpp rename to programs/Hadrons/modules/GRandom.hpp diff --git a/programs/Hadrons/GUnit.cc b/programs/Hadrons/modules/GUnit.cc similarity index 98% rename from programs/Hadrons/GUnit.cc rename to programs/Hadrons/modules/GUnit.cc index 75bdc597..d61f5551 100644 --- a/programs/Hadrons/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/GUnit.hpp b/programs/Hadrons/modules/GUnit.hpp similarity index 100% rename from programs/Hadrons/GUnit.hpp rename to programs/Hadrons/modules/GUnit.hpp diff --git a/programs/Hadrons/MQuark.cc b/programs/Hadrons/modules/MQuark.cc similarity index 99% rename from programs/Hadrons/MQuark.cc rename to programs/Hadrons/modules/MQuark.cc index c6af53f4..ffb91791 100644 --- a/programs/Hadrons/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/MQuark.hpp b/programs/Hadrons/modules/MQuark.hpp similarity index 100% rename from programs/Hadrons/MQuark.hpp rename to programs/Hadrons/modules/MQuark.hpp diff --git a/programs/Hadrons/SolRBPrecCG.cc b/programs/Hadrons/modules/SolRBPrecCG.cc similarity index 98% rename from programs/Hadrons/SolRBPrecCG.cc rename to programs/Hadrons/modules/SolRBPrecCG.cc index fc1d00aa..3db4a4d1 100644 --- a/programs/Hadrons/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/SolRBPrecCG.hpp b/programs/Hadrons/modules/SolRBPrecCG.hpp similarity index 100% rename from programs/Hadrons/SolRBPrecCG.hpp rename to programs/Hadrons/modules/SolRBPrecCG.hpp diff --git a/programs/Hadrons/SrcPoint.cc b/programs/Hadrons/modules/SrcPoint.cc similarity index 98% rename from programs/Hadrons/SrcPoint.cc rename to programs/Hadrons/modules/SrcPoint.cc index 559e56d3..b668f7bb 100644 --- a/programs/Hadrons/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/SrcPoint.hpp b/programs/Hadrons/modules/SrcPoint.hpp similarity index 100% rename from programs/Hadrons/SrcPoint.hpp rename to programs/Hadrons/modules/SrcPoint.hpp diff --git a/programs/Hadrons/SrcZ2.cc b/programs/Hadrons/modules/SrcZ2.cc similarity index 98% rename from programs/Hadrons/SrcZ2.cc rename to programs/Hadrons/modules/SrcZ2.cc index 0ed6227d..2c9bb403 100644 --- a/programs/Hadrons/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/SrcZ2.hpp b/programs/Hadrons/modules/SrcZ2.hpp similarity index 100% rename from programs/Hadrons/SrcZ2.hpp rename to programs/Hadrons/modules/SrcZ2.hpp From 78198d1b04b48ae80ad22f3788c346bb8b2a1414 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 10 May 2016 20:13:28 +0100 Subject: [PATCH 043/807] Hadrons: size fix for module graph with one vertex --- programs/Hadrons/Environment.cc | 1 + programs/Hadrons/GeneticScheduler.hpp | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 45b16aa0..98724035 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -274,6 +274,7 @@ Graph Environment::makeModuleGraph(void) const for (unsigned int i = 0; i < module_.size(); ++i) { + moduleGraph.addVertex(i); for (auto &j: moduleInput_[i]) { moduleGraph.addEdge(objectModule_[j], i); diff --git a/programs/Hadrons/GeneticScheduler.hpp b/programs/Hadrons/GeneticScheduler.hpp index 8d9bbf40..026ee303 100644 --- a/programs/Hadrons/GeneticScheduler.hpp +++ b/programs/Hadrons/GeneticScheduler.hpp @@ -183,7 +183,7 @@ template void GeneticScheduler::crossover(const std::vector &p1, const std::vector &p2) { - std::uniform_int_distribution dis(1, p1.size() - 2); + std::uniform_int_distribution dis(0, p1.size() - 1); unsigned int cut = dis(gen_); std::vector c1, c2, buf; @@ -211,7 +211,7 @@ void GeneticScheduler::crossover(const std::vector &p1, template void GeneticScheduler::mutation(std::vector &c) { - std::uniform_int_distribution dis(1, c.size() - 2); + std::uniform_int_distribution dis(0, c.size() - 1); unsigned int cut = dis(gen_); Graph g = graph_; std::vector buf; @@ -220,7 +220,10 @@ void GeneticScheduler::mutation(std::vector &c) { g.removeVertex(c[i]); } - buf = g.topoSort(gen_); + if (g.size() > 0) + { + buf = g.topoSort(gen_); + } for (unsigned int i = cut; i < c.size(); ++i) { buf.push_back(c[i]); From 56a8d7a5bcd5bf08d40282d0d0463c013b29c505 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 11 May 2016 10:27:14 +0100 Subject: [PATCH 044/807] Hadrons: build system fix --- programs/Hadrons/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 19bc9515..64ad5252 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -3,16 +3,14 @@ AM_LDFLAGS = -L$(top_builddir)/lib bin_PROGRAMS = Hadrons -# general sources +include modules.inc + Hadrons_SOURCES = \ + $(modules) \ Application.cc \ Environment.cc \ Global.cc \ Hadrons.cc \ Module.cc -# modules -include modules.inc -Hadrons_SOURCES += $(modules) - Hadrons_LDADD = -lGrid From 328d213c9ec62cb1741de81fd0e841392d20c794 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 11 May 2016 14:44:14 +0100 Subject: [PATCH 045/807] Hadrons: FS case sensitivity fix --- programs/Hadrons/{modules => Modules}/AWilson.cc | 0 programs/Hadrons/{modules => Modules}/AWilson.hpp | 0 programs/Hadrons/{modules => Modules}/CMeson.cc | 0 programs/Hadrons/{modules => Modules}/CMeson.hpp | 0 programs/Hadrons/{modules => Modules}/GLoad.cc | 0 programs/Hadrons/{modules => Modules}/GLoad.hpp | 0 programs/Hadrons/{modules => Modules}/GRandom.cc | 0 programs/Hadrons/{modules => Modules}/GRandom.hpp | 0 programs/Hadrons/{modules => Modules}/GUnit.cc | 0 programs/Hadrons/{modules => Modules}/GUnit.hpp | 0 programs/Hadrons/{modules => Modules}/MQuark.cc | 0 programs/Hadrons/{modules => Modules}/MQuark.hpp | 0 programs/Hadrons/{modules => Modules}/SolRBPrecCG.cc | 0 programs/Hadrons/{modules => Modules}/SolRBPrecCG.hpp | 0 programs/Hadrons/{modules => Modules}/SrcPoint.cc | 0 programs/Hadrons/{modules => Modules}/SrcPoint.hpp | 0 programs/Hadrons/{modules => Modules}/SrcZ2.cc | 0 programs/Hadrons/{modules => Modules}/SrcZ2.hpp | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename programs/Hadrons/{modules => Modules}/AWilson.cc (100%) rename programs/Hadrons/{modules => Modules}/AWilson.hpp (100%) rename programs/Hadrons/{modules => Modules}/CMeson.cc (100%) rename programs/Hadrons/{modules => Modules}/CMeson.hpp (100%) rename programs/Hadrons/{modules => Modules}/GLoad.cc (100%) rename programs/Hadrons/{modules => Modules}/GLoad.hpp (100%) rename programs/Hadrons/{modules => Modules}/GRandom.cc (100%) rename programs/Hadrons/{modules => Modules}/GRandom.hpp (100%) rename programs/Hadrons/{modules => Modules}/GUnit.cc (100%) rename programs/Hadrons/{modules => Modules}/GUnit.hpp (100%) rename programs/Hadrons/{modules => Modules}/MQuark.cc (100%) rename programs/Hadrons/{modules => Modules}/MQuark.hpp (100%) rename programs/Hadrons/{modules => Modules}/SolRBPrecCG.cc (100%) rename programs/Hadrons/{modules => Modules}/SolRBPrecCG.hpp (100%) rename programs/Hadrons/{modules => Modules}/SrcPoint.cc (100%) rename programs/Hadrons/{modules => Modules}/SrcPoint.hpp (100%) rename programs/Hadrons/{modules => Modules}/SrcZ2.cc (100%) rename programs/Hadrons/{modules => Modules}/SrcZ2.hpp (100%) diff --git a/programs/Hadrons/modules/AWilson.cc b/programs/Hadrons/Modules/AWilson.cc similarity index 100% rename from programs/Hadrons/modules/AWilson.cc rename to programs/Hadrons/Modules/AWilson.cc diff --git a/programs/Hadrons/modules/AWilson.hpp b/programs/Hadrons/Modules/AWilson.hpp similarity index 100% rename from programs/Hadrons/modules/AWilson.hpp rename to programs/Hadrons/Modules/AWilson.hpp diff --git a/programs/Hadrons/modules/CMeson.cc b/programs/Hadrons/Modules/CMeson.cc similarity index 100% rename from programs/Hadrons/modules/CMeson.cc rename to programs/Hadrons/Modules/CMeson.cc diff --git a/programs/Hadrons/modules/CMeson.hpp b/programs/Hadrons/Modules/CMeson.hpp similarity index 100% rename from programs/Hadrons/modules/CMeson.hpp rename to programs/Hadrons/Modules/CMeson.hpp diff --git a/programs/Hadrons/modules/GLoad.cc b/programs/Hadrons/Modules/GLoad.cc similarity index 100% rename from programs/Hadrons/modules/GLoad.cc rename to programs/Hadrons/Modules/GLoad.cc diff --git a/programs/Hadrons/modules/GLoad.hpp b/programs/Hadrons/Modules/GLoad.hpp similarity index 100% rename from programs/Hadrons/modules/GLoad.hpp rename to programs/Hadrons/Modules/GLoad.hpp diff --git a/programs/Hadrons/modules/GRandom.cc b/programs/Hadrons/Modules/GRandom.cc similarity index 100% rename from programs/Hadrons/modules/GRandom.cc rename to programs/Hadrons/Modules/GRandom.cc diff --git a/programs/Hadrons/modules/GRandom.hpp b/programs/Hadrons/Modules/GRandom.hpp similarity index 100% rename from programs/Hadrons/modules/GRandom.hpp rename to programs/Hadrons/Modules/GRandom.hpp diff --git a/programs/Hadrons/modules/GUnit.cc b/programs/Hadrons/Modules/GUnit.cc similarity index 100% rename from programs/Hadrons/modules/GUnit.cc rename to programs/Hadrons/Modules/GUnit.cc diff --git a/programs/Hadrons/modules/GUnit.hpp b/programs/Hadrons/Modules/GUnit.hpp similarity index 100% rename from programs/Hadrons/modules/GUnit.hpp rename to programs/Hadrons/Modules/GUnit.hpp diff --git a/programs/Hadrons/modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc similarity index 100% rename from programs/Hadrons/modules/MQuark.cc rename to programs/Hadrons/Modules/MQuark.cc diff --git a/programs/Hadrons/modules/MQuark.hpp b/programs/Hadrons/Modules/MQuark.hpp similarity index 100% rename from programs/Hadrons/modules/MQuark.hpp rename to programs/Hadrons/Modules/MQuark.hpp diff --git a/programs/Hadrons/modules/SolRBPrecCG.cc b/programs/Hadrons/Modules/SolRBPrecCG.cc similarity index 100% rename from programs/Hadrons/modules/SolRBPrecCG.cc rename to programs/Hadrons/Modules/SolRBPrecCG.cc diff --git a/programs/Hadrons/modules/SolRBPrecCG.hpp b/programs/Hadrons/Modules/SolRBPrecCG.hpp similarity index 100% rename from programs/Hadrons/modules/SolRBPrecCG.hpp rename to programs/Hadrons/Modules/SolRBPrecCG.hpp diff --git a/programs/Hadrons/modules/SrcPoint.cc b/programs/Hadrons/Modules/SrcPoint.cc similarity index 100% rename from programs/Hadrons/modules/SrcPoint.cc rename to programs/Hadrons/Modules/SrcPoint.cc diff --git a/programs/Hadrons/modules/SrcPoint.hpp b/programs/Hadrons/Modules/SrcPoint.hpp similarity index 100% rename from programs/Hadrons/modules/SrcPoint.hpp rename to programs/Hadrons/Modules/SrcPoint.hpp diff --git a/programs/Hadrons/modules/SrcZ2.cc b/programs/Hadrons/Modules/SrcZ2.cc similarity index 100% rename from programs/Hadrons/modules/SrcZ2.cc rename to programs/Hadrons/Modules/SrcZ2.cc diff --git a/programs/Hadrons/modules/SrcZ2.hpp b/programs/Hadrons/Modules/SrcZ2.hpp similarity index 100% rename from programs/Hadrons/modules/SrcZ2.hpp rename to programs/Hadrons/Modules/SrcZ2.hpp From 835003b3c5e72ea5e4aa581d750916236e32c9f1 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 11 May 2016 15:01:52 +0100 Subject: [PATCH 046/807] Hadrons: removed useless gauge global parameters --- programs/Hadrons/Application.cc | 2 +- programs/Hadrons/Application.hpp | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 6381a9e1..4bb300e9 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -181,7 +181,7 @@ void Application::schedule(void) // loop on configurations ////////////////////////////////////////////////////// void Application::configLoop(void) { - auto range = par_.configs.range; + auto range = par_.trajCounter; for (unsigned int t = range.start; t < range.end; t += range.step) { diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 67b8d7a0..20716adf 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -32,10 +32,6 @@ directory. #include #include -namespace Grid { - GRID_SERIALIZABLE_ENUM(ConfigType, undef, load, 1, unit, 2, gen, 3); -} - BEGIN_HADRONS_NAMESPACE class TrajRange: Serializable @@ -47,19 +43,11 @@ public: unsigned int, step); }; -class ConfigPar: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(ConfigPar, - std::string, ioStem, - TrajRange, range); -}; - class GlobalPar: Serializable { public: GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, - ConfigPar, configs, + TrajRange, trajCounter, std::string, seed); }; From 362f255100a159061e9d81ec2f02cee8d3c46174 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 11:59:28 +0100 Subject: [PATCH 047/807] Hadrons: module parameters can now be accessed from outside --- lib/serialisation/BaseIO.h | 24 ++++++- programs/Hadrons/Environment.cc | 4 +- programs/Hadrons/Environment.hpp | 8 +-- programs/Hadrons/Module.cc | 8 +-- programs/Hadrons/Module.hpp | 54 ++++++++++++-- programs/Hadrons/ModuleFactory.hpp | 2 +- programs/Hadrons/Modules/AWilson.cc | 18 ++--- programs/Hadrons/Modules/AWilson.hpp | 19 +++-- programs/Hadrons/Modules/CMeson.cc | 18 ++--- programs/Hadrons/Modules/CMeson.hpp | 23 +++--- programs/Hadrons/Modules/GLoad.cc | 10 +-- programs/Hadrons/Modules/GLoad.hpp | 17 ++--- programs/Hadrons/Modules/GRandom.cc | 2 +- programs/Hadrons/Modules/GRandom.hpp | 2 +- programs/Hadrons/Modules/GUnit.cc | 2 +- programs/Hadrons/Modules/GUnit.hpp | 2 +- programs/Hadrons/Modules/MQuark.cc | 89 ++++++++++++------------ programs/Hadrons/Modules/MQuark.hpp | 18 +++-- programs/Hadrons/Modules/SolRBPrecCG.cc | 20 ++---- programs/Hadrons/Modules/SolRBPrecCG.hpp | 19 +++-- programs/Hadrons/Modules/SrcPoint.cc | 12 +--- programs/Hadrons/Modules/SrcPoint.hpp | 17 ++--- programs/Hadrons/Modules/SrcZ2.cc | 18 ++--- programs/Hadrons/Modules/SrcZ2.hpp | 19 +++-- 24 files changed, 216 insertions(+), 209 deletions(-) diff --git a/lib/serialisation/BaseIO.h b/lib/serialisation/BaseIO.h index 6deb17f5..7761a8e6 100644 --- a/lib/serialisation/BaseIO.h +++ b/lib/serialisation/BaseIO.h @@ -67,9 +67,8 @@ namespace Grid { return os; } - class Serializable {}; - // static polymorphism implemented using CRTP idiom + class Serializable; // Static abstract writer template @@ -122,6 +121,27 @@ namespace Grid { T *upcast; }; + // serializable base class + class Serializable + { + public: + template + static inline void write(Writer &WR,const std::string &s, + const Serializable &obj) + {} + + template + static inline void read(Reader &RD,const std::string &s, + Serializable &obj) + {} + + friend inline std::ostream & operator<<(std::ostream &os, + const Serializable &obj) + { + return os; + } + }; + // Generic writer interface template inline void push(Writer &w, const std::string &s) diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index 98724035..f92ab9d4 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -200,7 +200,7 @@ void Environment::createModule(const std::string name, const std::string type, } } -Module * Environment::getModule(const unsigned int address) const +ModuleBase * Environment::getModule(const unsigned int address) const { if (hasModule(address)) { @@ -212,7 +212,7 @@ Module * Environment::getModule(const unsigned int address) const } } -Module * Environment::getModule(const std::string name) const +ModuleBase * Environment::getModule(const std::string name) const { return getModule(getModuleAddress(name)); } diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 4cecf7da..b56b1680 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -37,13 +37,13 @@ BEGIN_HADRONS_NAMESPACE * Global environment * ******************************************************************************/ // forward declaration of Module -class Module; +class ModuleBase; class Environment { SINGLETON(Environment); public: - typedef std::unique_ptr ModPt; + typedef std::unique_ptr ModPt; typedef std::unique_ptr GridPt; typedef std::unique_ptr GridRbPt; typedef FermionOperator FMat; @@ -76,8 +76,8 @@ public: void createModule(const std::string name, const std::string type, XmlReader &reader); - Module * getModule(const unsigned int address) const; - Module * getModule(const std::string name) const; + ModuleBase * getModule(const unsigned int address) const; + ModuleBase * getModule(const std::string name) const; unsigned int getModuleAddress(const std::string name) const; std::string getModuleName(const unsigned int address) const; std::string getModuleType(const unsigned int address) const; diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index a2dedb52..70fcd79f 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -35,24 +35,24 @@ using namespace Hadrons; * Module implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Module::Module(const std::string name) +ModuleBase::ModuleBase(const std::string name) : name_(name) , env_(Environment::getInstance()) {} // access ////////////////////////////////////////////////////////////////////// -std::string Module::getName(void) const +std::string ModuleBase::getName(void) const { return name_; } -Environment & Module::env(void) const +Environment & ModuleBase::env(void) const { return env_; } // execution /////////////////////////////////////////////////////////////////// -void Module::operator()(void) +void ModuleBase::operator()(void) { setup(); if (!env().isDryRun()) diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 2b4bfabe..7260eee8 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -52,21 +52,21 @@ static mod##ModuleRegistrar mod##ModuleRegistrarInstance; /****************************************************************************** * Module * ******************************************************************************/ -class Module +class ModuleBase { public: // constructor - Module(const std::string name); + ModuleBase(const std::string name); // destructor - virtual ~Module(void) = default; + virtual ~ModuleBase(void) = default; // access std::string getName(void) const; Environment &env(void) const; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name) {}; // dependencies/products virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name) = 0; // setup virtual void setup(void) {}; // execution @@ -77,6 +77,50 @@ private: Environment &env_; }; +typedef Serializable NoPar; + +template +class Module: public ModuleBase +{ +public: + typedef P Par; +public: + // constructor + Module(const std::string name); + // destructor + virtual ~Module(void) = default; + // parse parameters + virtual void parseParameters(XmlReader &reader, const std::string name); + // parameter access + const P & par(void) const; + void setPar(const P &par); +private: + P par_; +}; + +template +Module

::Module(const std::string name) +: ModuleBase(name) +{} + +template +void Module

::parseParameters(XmlReader &reader, const std::string name) +{ + read(reader, name, par_);read(reader, name, par_); +} + +template +const P & Module

::par(void) const +{ + return par_; +} + +template +void Module

::setPar(const P &par) +{ + par_ = par; +} + END_HADRONS_NAMESPACE #endif // Hadrons_Module_hpp_ diff --git a/programs/Hadrons/ModuleFactory.hpp b/programs/Hadrons/ModuleFactory.hpp index 263a0828..0169ef94 100644 --- a/programs/Hadrons/ModuleFactory.hpp +++ b/programs/Hadrons/ModuleFactory.hpp @@ -37,7 +37,7 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * ModuleFactory * ******************************************************************************/ -class ModuleFactory: public Factory +class ModuleFactory: public Factory { SINGLETON_DEFCTOR(ModuleFactory) }; diff --git a/programs/Hadrons/Modules/AWilson.cc b/programs/Hadrons/Modules/AWilson.cc index 77f9cc25..9b7c1b04 100644 --- a/programs/Hadrons/Modules/AWilson.cc +++ b/programs/Hadrons/Modules/AWilson.cc @@ -35,19 +35,13 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// AWilson::AWilson(const std::string name) -: Module(name) +: Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void AWilson::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector AWilson::getInput(void) { - std::vector in = {par_.gauge}; + std::vector in = {par().gauge}; return in; } @@ -71,13 +65,13 @@ void AWilson::setup(void) // execution /////////////////////////////////////////////////////////////////// void AWilson::execute() { - auto &U = *env().get(par_.gauge); + auto &U = *env().get(par().gauge); auto &grid = *env().getGrid(); auto &gridRb = *env().getRbGrid(); - auto fMatPt = new WilsonFermionR(U, grid, gridRb, par_.mass); + auto fMatPt = new WilsonFermionR(U, grid, gridRb, par().mass); unsigned int size; - LOG(Message) << "Setting up Wilson fermion matrix with m= " << par_.mass - << " using gauge field '" << par_.gauge << "'" << std::endl; + LOG(Message) << "Setting up Wilson fermion matrix with m= " << par().mass + << " using gauge field '" << par().gauge << "'" << std::endl; env().addFermionMatrix(getName(), fMatPt); } diff --git a/programs/Hadrons/Modules/AWilson.hpp b/programs/Hadrons/Modules/AWilson.hpp index 1eaf0a36..cb35525e 100644 --- a/programs/Hadrons/Modules/AWilson.hpp +++ b/programs/Hadrons/Modules/AWilson.hpp @@ -37,22 +37,21 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Wilson quark action * ******************************************************************************/ -class AWilson: public Module +class AWilsonPar: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, gauge, - double , mass); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(AWilsonPar, + std::string, gauge, + double , mass); +}; + +class AWilson: public Module +{ public: // constructor AWilson(const std::string name); // destructor virtual ~AWilson(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -60,8 +59,6 @@ public: virtual void setup(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(AWilson); diff --git a/programs/Hadrons/Modules/CMeson.cc b/programs/Hadrons/Modules/CMeson.cc index 28b2dd81..53088c43 100644 --- a/programs/Hadrons/Modules/CMeson.cc +++ b/programs/Hadrons/Modules/CMeson.cc @@ -36,19 +36,13 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// CMeson::CMeson(const std::string name) -: Module(name) +: Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void CMeson::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector CMeson::getInput(void) { - std::vector input = {par_.q1, par_.q2}; + std::vector input = {par().q1, par().q2}; return input; } @@ -64,12 +58,12 @@ std::vector CMeson::getOutput(void) void CMeson::execute(void) { LOG(Message) << "Computing meson contraction '" << getName() << "' using" - << " quarks '" << par_.q1 << "' and '" << par_.q2 << "'" + << " quarks '" << par().q1 << "' and '" << par().q2 << "'" << std::endl; - XmlWriter writer(par_.output); - LatticePropagator &q1 = *env().get(par_.q1); - LatticePropagator &q2 = *env().get(par_.q2); + XmlWriter writer(par().output); + LatticePropagator &q1 = *env().get(par().q1); + LatticePropagator &q2 = *env().get(par().q2); LatticeComplex c(env().getGrid()); SpinMatrix g[Ns*Ns], g5; std::vector buf; diff --git a/programs/Hadrons/Modules/CMeson.hpp b/programs/Hadrons/Modules/CMeson.hpp index bc9f3177..1cbd6d86 100644 --- a/programs/Hadrons/Modules/CMeson.hpp +++ b/programs/Hadrons/Modules/CMeson.hpp @@ -37,17 +37,18 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * CMeson * ******************************************************************************/ -class CMeson: public Module +class CMesonPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(CMesonPar, + std::string, q1, + std::string, q2, + std::string, output); +}; + +class CMeson: public Module { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, - std::string, q1, - std::string, q2, - std::string, output); - }; class Result: Serializable { public: @@ -59,15 +60,11 @@ public: CMeson(const std::string name); // destructor virtual ~CMeson(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(CMeson); diff --git a/programs/Hadrons/Modules/GLoad.cc b/programs/Hadrons/Modules/GLoad.cc index 8f1b4d95..590c4135 100644 --- a/programs/Hadrons/Modules/GLoad.cc +++ b/programs/Hadrons/Modules/GLoad.cc @@ -35,15 +35,9 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// GLoad::GLoad(const std::string name) -: Module(name) +: Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void GLoad::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector GLoad::getInput(void) { @@ -69,7 +63,7 @@ void GLoad::setup(void) void GLoad::execute(void) { NerscField header; - std::string fileName = par_.file + "." + std::string fileName = par().file + "." + std::to_string(env().getTrajectory()); LOG(Message) << "Loading NERSC configuration from file '" << fileName diff --git a/programs/Hadrons/Modules/GLoad.hpp b/programs/Hadrons/Modules/GLoad.hpp index cb076bb5..af01e40e 100644 --- a/programs/Hadrons/Modules/GLoad.hpp +++ b/programs/Hadrons/Modules/GLoad.hpp @@ -37,21 +37,20 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Load a NERSC configuration * ******************************************************************************/ -class GLoad: public Module +class GLoadPar: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, file); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(GLoadPar, + std::string, file); +}; + +class GLoad: public Module +{ public: // constructor GLoad(const std::string name); // destructor virtual ~GLoad(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -59,8 +58,6 @@ public: virtual void setup(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(GLoad); diff --git a/programs/Hadrons/Modules/GRandom.cc b/programs/Hadrons/Modules/GRandom.cc index 34b1d57e..f40c8121 100644 --- a/programs/Hadrons/Modules/GRandom.cc +++ b/programs/Hadrons/Modules/GRandom.cc @@ -35,7 +35,7 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// GRandom::GRandom(const std::string name) -: Module(name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// diff --git a/programs/Hadrons/Modules/GRandom.hpp b/programs/Hadrons/Modules/GRandom.hpp index 5d0f4197..a31028fd 100644 --- a/programs/Hadrons/Modules/GRandom.hpp +++ b/programs/Hadrons/Modules/GRandom.hpp @@ -37,7 +37,7 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Random gauge * ******************************************************************************/ -class GRandom: public Module +class GRandom: public Module { public: // constructor diff --git a/programs/Hadrons/Modules/GUnit.cc b/programs/Hadrons/Modules/GUnit.cc index d61f5551..20d815f1 100644 --- a/programs/Hadrons/Modules/GUnit.cc +++ b/programs/Hadrons/Modules/GUnit.cc @@ -35,7 +35,7 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// GUnit::GUnit(const std::string name) -: Module(name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// diff --git a/programs/Hadrons/Modules/GUnit.hpp b/programs/Hadrons/Modules/GUnit.hpp index 3c72bd07..eff34020 100644 --- a/programs/Hadrons/Modules/GUnit.hpp +++ b/programs/Hadrons/Modules/GUnit.hpp @@ -37,7 +37,7 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Unit gauge * ******************************************************************************/ -class GUnit: public Module +class GUnit: public Module { public: // constructor diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index ffb91791..aa8344ac 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -39,16 +39,10 @@ MQuark::MQuark(const std::string name) : Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void MQuark::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector MQuark::getInput(void) { - std::vector in = {par_.source, par_.solver}; + std::vector in = {par().source, par().solver}; return in; } @@ -63,7 +57,7 @@ std::vector MQuark::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void MQuark::setup(void) { - Ls_ = env().getObjectLs(env().getSolverAction(par_.solver)); + Ls_ = env().getObjectLs(env().getSolverAction(par().solver)); env().registerLattice(getName()); if (Ls_ > 1) { @@ -74,54 +68,59 @@ void MQuark::setup(void) // execution /////////////////////////////////////////////////////////////////// void MQuark::execute(void) { - LatticePropagator *fullSource; - LatticeFermion source(env().getGrid(Ls_)), sol(env().getGrid(Ls_)); - std::string propName = (Ls_ == 1) ? getName() : (getName() + "_5d"); + LatticeFermion source(env().getGrid(Ls_)), sol(env().getGrid(Ls_)), + tmp(env().getGrid()); + std::string propName = (Ls_ == 1) ? getName() : (getName() + "_5d"); LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; - LatticePropagator &prop = *env().create(propName); - // source conversion for 4D sources - if (!env().isObject5d(par_.source)) - { - if (Ls_ == 1) - { - fullSource = env().get(par_.source); - } - else - { - HADRON_ERROR("MQuark not implemented with 5D actions"); - } - } - // source conversion for 5D sources - else - { - if (Ls_ == 1) - { - HADRON_ERROR("MQuark not implemented with 5D actions"); - } - else if (Ls_ != env().getObjectLs(par_.source)) - { - HADRON_ERROR("Ls mismatch between quark action and source"); - } - else - { - fullSource = env().get(par_.source); - } - } - LOG(Message) << "Inverting using solver '" << par_.solver - << "' on source '" << par_.source << "'" << std::endl; + LatticePropagator &prop = *env().create(propName); + LatticePropagator &fullSrc = *env().create(par().source); + + LOG(Message) << "Inverting using solver '" << par().solver + << "' on source '" << par().source << "'" << std::endl; for (unsigned int s = 0; s < Ns; ++s) for (unsigned int c = 0; c < Nc; ++c) { - PropToFerm(source, *fullSource, s, c); + // source conversion for 4D sources + if (!env().isObject5d(par().source)) + { + if (Ls_ == 1) + { + PropToFerm(source, fullSrc, s, c); + } + else + { + PropToFerm(tmp, fullSrc, s, c); + InsertSlice(source, tmp, 0, 0); + InsertSlice(source, tmp, Ls_ - 1, 0); + axpby_ssp_pplus(source, 0., source, 1., source, + 0, 0); + axpby_ssp_pminus(source, 0., source, 1., source, + Ls_ - 1, Ls_ - 1); + } + } + // source conversion for 5D sources + else + { + if (Ls_ != env().getObjectLs(par().source)) + { + HADRON_ERROR("Ls mismatch between quark action and source"); + } + else + { + PropToFerm(source, fullSrc, s, c); + } + } sol = zero; - env().callSolver(par_.solver, sol, source); + env().callSolver(par().solver, sol, source); FermToProp(prop, sol, s, c); } // create 4D propagators from 5D one if necessary if (Ls_ > 1) { - HADRON_ERROR("MQuark not implemented with 5D actions"); + LatticePropagator &prop4d = *env().create(getName()); + + } } diff --git a/programs/Hadrons/Modules/MQuark.hpp b/programs/Hadrons/Modules/MQuark.hpp index 14ced177..0080090b 100644 --- a/programs/Hadrons/Modules/MQuark.hpp +++ b/programs/Hadrons/Modules/MQuark.hpp @@ -37,22 +37,21 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * MQuark * ******************************************************************************/ -class MQuark: public Module +class MQuarkPar: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, source, - std::string, solver); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(MQuarkPar, + std::string, source, + std::string, solver); +}; + +class MQuark: public Module +{ public: // constructor MQuark(const std::string name); // destructor virtual ~MQuark(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -61,7 +60,6 @@ public: // execution virtual void execute(void); private: - Par par_; unsigned int Ls_; Environment::Solver *solver_{nullptr}; }; diff --git a/programs/Hadrons/Modules/SolRBPrecCG.cc b/programs/Hadrons/Modules/SolRBPrecCG.cc index 3db4a4d1..14a09be5 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.cc +++ b/programs/Hadrons/Modules/SolRBPrecCG.cc @@ -39,16 +39,10 @@ SolRBPrecCG::SolRBPrecCG(const std::string name) : Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void SolRBPrecCG::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector SolRBPrecCG::getInput(void) { - std::vector in = {par_.action}; + std::vector in = {par().action}; return in; } @@ -64,25 +58,25 @@ std::vector SolRBPrecCG::getOutput(void) void SolRBPrecCG::setup(void) { env().registerObject(getName(), 0); - env().addOwnership(getName(), par_.action); - env().setSolverAction(getName(), par_.action); + env().addOwnership(getName(), par().action); + env().setSolverAction(getName(), par().action); } // execution /////////////////////////////////////////////////////////////////// void SolRBPrecCG::execute(void) { - auto &mat = *(env().getFermionMatrix(par_.action)); + auto &mat = *(env().getFermionMatrix(par().action)); auto solver = [&mat, this](LatticeFermion &sol, const LatticeFermion &source) { - ConjugateGradient cg(par_.residual, 10000); + ConjugateGradient cg(par().residual, 10000); SchurRedBlackDiagMooeeSolve schurSolver(cg); schurSolver(mat, source, sol); }; LOG(Message) << "setting up Schur red-black preconditioned CG for" - << " action '" << par_.action << "' with residual " - << par_.residual << std::endl; + << " action '" << par().action << "' with residual " + << par().residual << std::endl; env().addSolver(getName(), solver); } diff --git a/programs/Hadrons/Modules/SolRBPrecCG.hpp b/programs/Hadrons/Modules/SolRBPrecCG.hpp index 82784666..b987eb95 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.hpp +++ b/programs/Hadrons/Modules/SolRBPrecCG.hpp @@ -37,22 +37,21 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Schur red-black preconditioned CG * ******************************************************************************/ -class SolRBPrecCG: public Module +class SolRBPrecCGPar: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, action, - double , residual); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(SolRBPrecCGPar, + std::string, action, + double , residual); +}; + +class SolRBPrecCG: public Module +{ public: // constructor SolRBPrecCG(const std::string name); // destructor virtual ~SolRBPrecCG(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -60,8 +59,6 @@ public: virtual void setup(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(SolRBPrecCG); diff --git a/programs/Hadrons/Modules/SrcPoint.cc b/programs/Hadrons/Modules/SrcPoint.cc index b668f7bb..3b7c3d10 100644 --- a/programs/Hadrons/Modules/SrcPoint.cc +++ b/programs/Hadrons/Modules/SrcPoint.cc @@ -35,15 +35,9 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// SrcPoint::SrcPoint(const std::string name) -: Module(name) +: Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void SrcPoint::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector SrcPoint::getInput(void) { @@ -68,10 +62,10 @@ void SrcPoint::setup(void) // execution /////////////////////////////////////////////////////////////////// void SrcPoint::execute(void) { - std::vector position = strToVec(par_.position); + std::vector position = strToVec(par().position); SpinColourMatrix id; - LOG(Message) << "Creating point source at position [" << par_.position + LOG(Message) << "Creating point source at position [" << par().position << "]" << std::endl; LatticePropagator &src = *env().create(getName()); id = 1.; diff --git a/programs/Hadrons/Modules/SrcPoint.hpp b/programs/Hadrons/Modules/SrcPoint.hpp index 8cfa89c9..75108319 100644 --- a/programs/Hadrons/Modules/SrcPoint.hpp +++ b/programs/Hadrons/Modules/SrcPoint.hpp @@ -48,21 +48,20 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * SrcPoint * ******************************************************************************/ -class SrcPoint: public Module +class SrcPointPar: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, std::string, position); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(SrcPointPar, + std::string, position); +}; + +class SrcPoint: public Module +{ public: // constructor SrcPoint(const std::string name); // destructor virtual ~SrcPoint(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -70,8 +69,6 @@ public: virtual void setup(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(SrcPoint); diff --git a/programs/Hadrons/Modules/SrcZ2.cc b/programs/Hadrons/Modules/SrcZ2.cc index 2c9bb403..c77c2943 100644 --- a/programs/Hadrons/Modules/SrcZ2.cc +++ b/programs/Hadrons/Modules/SrcZ2.cc @@ -35,15 +35,9 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// SrcZ2::SrcZ2(const std::string name) -: Module(name) +: Module(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void SrcZ2::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector SrcZ2::getInput(void) { @@ -73,21 +67,21 @@ void SrcZ2::execute(void) LatticeFermion phi(env().getGrid()); Complex shift(1., 1.); - if (par_.tA == par_.tB) + if (par().tA == par().tB) { - LOG(Message) << "Generating Z_2 wall source at t= " << par_.tA + LOG(Message) << "Generating Z_2 wall source at t= " << par().tA << std::endl; } else { - LOG(Message) << "Generating Z_2 band for " << par_.tA << " <= t <= " - << par_.tB << std::endl; + LOG(Message) << "Generating Z_2 band for " << par().tA << " <= t <= " + << par().tB << std::endl; } LatticePropagator &src = *env().create(getName()); LatticeCoordinate(t, Tp); bernoulli(*env().get4dRng(), eta); eta = (2.*eta - shift)*(1./::sqrt(2.)); - eta = where((t >= par_.tA) and (t <= par_.tB), eta, 0.*eta); + eta = where((t >= par().tA) and (t <= par().tB), eta, 0.*eta); src = 1.; src = src*eta; } diff --git a/programs/Hadrons/Modules/SrcZ2.hpp b/programs/Hadrons/Modules/SrcZ2.hpp index a1458693..a61f8688 100644 --- a/programs/Hadrons/Modules/SrcZ2.hpp +++ b/programs/Hadrons/Modules/SrcZ2.hpp @@ -49,22 +49,21 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * SrcZ2 * ******************************************************************************/ -class SrcZ2: public Module +class SrcZ2Par: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, unsigned int, tA, - unsigned int, tB); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(SrcZ2Par, + unsigned int, tA, + unsigned int, tB); +}; + +class SrcZ2: public Module +{ public: // constructor SrcZ2(const std::string name); // destructor virtual ~SrcZ2(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -72,8 +71,6 @@ public: virtual void setup(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(SrcZ2); From 3d75e0f0d1f33d4b0578d289f51950d36fb949b7 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 12:02:15 +0100 Subject: [PATCH 048/807] Hadrons: MQuark fix --- programs/Hadrons/Modules/MQuark.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index aa8344ac..3a0e27f8 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -75,7 +75,7 @@ void MQuark::execute(void) LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; LatticePropagator &prop = *env().create(propName); - LatticePropagator &fullSrc = *env().create(par().source); + LatticePropagator &fullSrc = *env().get(par().source); LOG(Message) << "Inverting using solver '" << par().solver << "' on source '" << par().source << "'" << std::endl; @@ -121,6 +121,6 @@ void MQuark::execute(void) { LatticePropagator &prop4d = *env().create(getName()); - + HADRON_ERROR("5D implementation not finished"); } } From 5c06e89d6975d0c86ee5b35b4b1d706e1e075804 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 12:49:49 +0100 Subject: [PATCH 049/807] Hadrons: code cleaning --- programs/Hadrons/Graph.hpp | 2 +- programs/Hadrons/Module.cc | 2 +- programs/Hadrons/Module.hpp | 12 +++++++++--- programs/Hadrons/Modules/MQuark.cc | 8 +++----- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/programs/Hadrons/Graph.hpp b/programs/Hadrons/Graph.hpp index 5f71f31b..78b43452 100644 --- a/programs/Hadrons/Graph.hpp +++ b/programs/Hadrons/Graph.hpp @@ -726,7 +726,7 @@ std::vector> Graph::allTopoSort(void) } // build depedency matrix from topological sorts /////////////////////////////// -// complexity: can be V! +// complexity: something like O(V^2*log(V!)) template std::map> makeDependencyMatrix(const std::vector> &topSort) diff --git a/programs/Hadrons/Module.cc b/programs/Hadrons/Module.cc index 70fcd79f..6669a861 100644 --- a/programs/Hadrons/Module.cc +++ b/programs/Hadrons/Module.cc @@ -32,7 +32,7 @@ using namespace QCD; using namespace Hadrons; /****************************************************************************** - * Module implementation * + * ModuleBase implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// ModuleBase::ModuleBase(const std::string name) diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 7260eee8..c2bebd93 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -50,8 +50,9 @@ public:\ static mod##ModuleRegistrar mod##ModuleRegistrarInstance; /****************************************************************************** - * Module * + * Module class * ******************************************************************************/ +// base class class ModuleBase { public: @@ -77,8 +78,7 @@ private: Environment &env_; }; -typedef Serializable NoPar; - +// derived class, templating the parameter class template class Module: public ModuleBase { @@ -98,6 +98,12 @@ private: P par_; }; +// no parameter type +typedef Serializable NoPar; + +/****************************************************************************** + * Template implementation * + ******************************************************************************/ template Module

::Module(const std::string name) : ModuleBase(name) diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index 3a0e27f8..ced6d362 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -93,11 +93,9 @@ void MQuark::execute(void) { PropToFerm(tmp, fullSrc, s, c); InsertSlice(source, tmp, 0, 0); - InsertSlice(source, tmp, Ls_ - 1, 0); - axpby_ssp_pplus(source, 0., source, 1., source, - 0, 0); - axpby_ssp_pminus(source, 0., source, 1., source, - Ls_ - 1, Ls_ - 1); + InsertSlice(source, tmp, Ls_-1, 0); + axpby_ssp_pplus(source, 0., source, 1., source, 0, 0); + axpby_ssp_pminus(source, 0., source, 1., source, Ls_-1, Ls_-1); } } // source conversion for 5D sources From 7ae667c76779ba68d158462b1d41889be06c5758 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 18:33:08 +0100 Subject: [PATCH 050/807] Hadrons: module template update --- programs/Hadrons/Module.cc.template | 10 ++-------- programs/Hadrons/Module.hpp.template | 17 +++++++---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/programs/Hadrons/Module.cc.template b/programs/Hadrons/Module.cc.template index f2533d80..1bcf53ca 100644 --- a/programs/Hadrons/Module.cc.template +++ b/programs/Hadrons/Module.cc.template @@ -1,4 +1,4 @@ -#include +#include using namespace Grid; using namespace Hadrons; @@ -8,15 +8,9 @@ using namespace Hadrons; ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// ___FILEBASENAME___::___FILEBASENAME___(const std::string name) -: Module(name) +: Module<___FILEBASENAME___Par>(name) {} -// parse parameters //////////////////////////////////////////////////////////// -void ___FILEBASENAME___::parseParameters(XmlReader &reader, const std::string name) -{ - read(reader, name, par_); -} - // dependencies/products /////////////////////////////////////////////////////// std::vector ___FILEBASENAME___::getInput(void) { diff --git a/programs/Hadrons/Module.hpp.template b/programs/Hadrons/Module.hpp.template index 002d93b9..e8e6c4de 100644 --- a/programs/Hadrons/Module.hpp.template +++ b/programs/Hadrons/Module.hpp.template @@ -10,21 +10,20 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * ___FILEBASENAME___ * ******************************************************************************/ -class ___FILEBASENAME___: public Module +class ___FILEBASENAME___Par: Serializable { public: - class Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Par, unsigned int, i); - }; + GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par, + unsigned int, i); +}; + +class ___FILEBASENAME___: public Module<___FILEBASENAME___Par> +{ public: // constructor ___FILEBASENAME___(const std::string name); // destructor virtual ~___FILEBASENAME___(void) = default; - // parse parameters - virtual void parseParameters(XmlReader &reader, const std::string name); // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -32,8 +31,6 @@ public: virtual void setup(void); // execution virtual void execute(void); -private: - Par par_; }; MODULE_REGISTER(___FILEBASENAME___); From afe5a947456d4ffc05b0e3c98110e93d3123b8fd Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 18:33:36 +0100 Subject: [PATCH 051/807] Hadrons: getModule with upcast --- programs/Hadrons/Environment.hpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index b56b1680..8c5c6021 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -78,6 +78,10 @@ public: XmlReader &reader); ModuleBase * getModule(const unsigned int address) const; ModuleBase * getModule(const std::string name) const; + template + M * getModule(const unsigned int address) const; + template + M * getModule(const std::string name) const; unsigned int getModuleAddress(const std::string name) const; std::string getModuleName(const unsigned int address) const; std::string getModuleType(const unsigned int address) const; @@ -187,6 +191,27 @@ private: /****************************************************************************** * template implementation * ******************************************************************************/ +template +M * Environment::getModule(const unsigned int address) const +{ + if (auto *pt = dynamic_cast(getModule(address))) + { + return pt; + } + else + { + HADRON_ERROR("module '" + moduleName_[address] + "' does not have type " + + typeName() + "(object type: " + + typeName(*module_.at(address).get()) + ")"); + } +} + +template +M * Environment::getModule(const std::string name) const +{ + return getModule(getModuleAddress(name)); +} + template unsigned int Environment::lattice4dSize(void) const { From 2b31bf61ff969d618d64c5a6e67bd056240ec5f1 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 18:33:49 +0100 Subject: [PATCH 052/807] Hadrons: message fix --- programs/Hadrons/Environment.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index f92ab9d4..cbdf678e 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -406,7 +406,7 @@ void Environment::freeLattice(const unsigned int address) { if (!isDryRun()) { - LOG(Message) << "Freeing lattice '" << moduleName_[address] + LOG(Message) << "Freeing lattice '" << objectName_[address] << "'" << std::endl; } lattice_.erase(address); From 232fda5fe1ceaaa801ec35f36daeb091cd45189a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 18:34:10 +0100 Subject: [PATCH 053/807] Hadrons: DWF action --- programs/Hadrons/Modules/ADWF.cc | 83 +++++++++++++++++++++++++++++++ programs/Hadrons/Modules/ADWF.hpp | 70 ++++++++++++++++++++++++++ programs/Hadrons/modules.inc | 1 + 3 files changed, 154 insertions(+) create mode 100644 programs/Hadrons/Modules/ADWF.cc create mode 100644 programs/Hadrons/Modules/ADWF.hpp diff --git a/programs/Hadrons/Modules/ADWF.cc b/programs/Hadrons/Modules/ADWF.cc new file mode 100644 index 00000000..f579c0b7 --- /dev/null +++ b/programs/Hadrons/Modules/ADWF.cc @@ -0,0 +1,83 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/ADWF.cc + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +/****************************************************************************** +* ADWF implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +ADWF::ADWF(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector ADWF::getInput(void) +{ + std::vector in = {par().gauge}; + + return in; +} + +std::vector ADWF::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +void ADWF::setup(void) +{ + unsigned int size; + + size = 3*env().lattice4dSize(); + env().registerObject(getName(), size, par().Ls); +} + +// execution /////////////////////////////////////////////////////////////////// +void ADWF::execute(void) +{ + env().createGrid(par().Ls); + + auto &U = *env().get(par().gauge); + auto &g4 = *env().getGrid(); + auto &grb4 = *env().getRbGrid(); + auto &g5 = *env().getGrid(par().Ls); + auto &grb5 = *env().getRbGrid(par().Ls); + auto fMatPt = new DomainWallFermionR(U, g5, grb5, g4, grb4, + par().mass, par().M5); + + LOG(Message) << "Setting up domain wall fermion matrix with m= " + << par().mass << ", M5= " << par().M5 << " and Ls= " + << par().Ls << " using gauge field '" << par().gauge << "'" + << std::endl; + env().addFermionMatrix(getName(), fMatPt); +} diff --git a/programs/Hadrons/Modules/ADWF.hpp b/programs/Hadrons/Modules/ADWF.hpp new file mode 100644 index 00000000..0f4f5402 --- /dev/null +++ b/programs/Hadrons/Modules/ADWF.hpp @@ -0,0 +1,70 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/ADWF.hpp + +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#ifndef Hadrons_ADWF_hpp_ +#define Hadrons_ADWF_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Domain wall quark action * + ******************************************************************************/ +class ADWFPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(ADWFPar, + std::string, gauge, + unsigned int, Ls, + double , mass, + double , M5); +}; + +class ADWF: public Module +{ +public: + // constructor + ADWF(const std::string name); + // destructor + virtual ~ADWF(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +MODULE_REGISTER(ADWF); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_ADWF_hpp_ diff --git a/programs/Hadrons/modules.inc b/programs/Hadrons/modules.inc index c0da727a..6ca8329e 100644 --- a/programs/Hadrons/modules.inc +++ b/programs/Hadrons/modules.inc @@ -1,4 +1,5 @@ modules =\ + Modules/ADWF.cc \ Modules/AWilson.cc \ Modules/CMeson.cc \ Modules/GLoad.cc \ From bb2125962bbb3e9484626f8daeeab5d399a71487 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 12 May 2016 18:34:42 +0100 Subject: [PATCH 054/807] Hadrons: finished implementation of 5D quarks --- programs/Hadrons/Modules/MQuark.cc | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index ced6d362..f3f1da06 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -76,6 +76,10 @@ void MQuark::execute(void) << std::endl; LatticePropagator &prop = *env().create(propName); LatticePropagator &fullSrc = *env().get(par().source); + if (Ls_ > 1) + { + env().create(getName()); + } LOG(Message) << "Inverting using solver '" << par().solver << "' on source '" << par().source << "'" << std::endl; @@ -91,9 +95,10 @@ void MQuark::execute(void) } else { + source = zero; PropToFerm(tmp, fullSrc, s, c); - InsertSlice(source, tmp, 0, 0); - InsertSlice(source, tmp, Ls_-1, 0); + InsertSlice(tmp, source, 0, 0); + InsertSlice(tmp, source, Ls_-1, 0); axpby_ssp_pplus(source, 0., source, 1., source, 0, 0); axpby_ssp_pminus(source, 0., source, 1., source, Ls_-1, Ls_-1); } @@ -113,12 +118,15 @@ void MQuark::execute(void) sol = zero; env().callSolver(par().solver, sol, source); FermToProp(prop, sol, s, c); - } - // create 4D propagators from 5D one if necessary - if (Ls_ > 1) - { - LatticePropagator &prop4d = *env().create(getName()); - - HADRON_ERROR("5D implementation not finished"); + // create 4D propagators from 5D one if necessary + if (Ls_ > 1) + { + LatticePropagator &p4d = *env().get(getName()); + + axpby_ssp_pminus(sol, 0., sol, 1., sol, 0, 0); + axpby_ssp_pplus(sol, 0., sol, 1., sol, 0, Ls_-1); + ExtractSlice(tmp, sol, 0, 0); + FermToProp(p4d, tmp, s, c); + } } } From 8e2078be7158e231ab9bd24c29c0d4ca33d618bf Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 6 Jun 2016 17:45:37 +0100 Subject: [PATCH 055/807] Hadrons: environment with fully generic object store --- programs/Hadrons/Application.cc | 2 +- programs/Hadrons/Environment.cc | 366 +++++++----------------- programs/Hadrons/Environment.hpp | 238 +++++++++------ programs/Hadrons/Global.hpp | 12 + programs/Hadrons/Module.hpp | 18 +- programs/Hadrons/Modules/ADWF.cc | 20 +- programs/Hadrons/Modules/AWilson.cc | 12 +- programs/Hadrons/Modules/CMeson.cc | 4 +- programs/Hadrons/Modules/GLoad.cc | 2 +- programs/Hadrons/Modules/GRandom.cc | 2 +- programs/Hadrons/Modules/GUnit.cc | 2 +- programs/Hadrons/Modules/MQuark.cc | 15 +- programs/Hadrons/Modules/SolRBPrecCG.cc | 9 +- programs/Hadrons/Modules/SrcPoint.cc | 2 +- programs/Hadrons/Modules/SrcZ2.cc | 2 +- 15 files changed, 321 insertions(+), 385 deletions(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index 4bb300e9..f45ca066 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -127,7 +127,7 @@ void Application::schedule(void) // constrained topological sort using a genetic algorithm LOG(Message) << "Scheduling computation..." << std::endl; - constexpr unsigned int maxGen = 200, maxCstGen = 50; + constexpr unsigned int maxGen = 2000000, maxCstGen = 2000000; unsigned int k = 0, gen, prevPeak, nCstPeak = 0; auto graph = env_.makeModuleGraph(); auto con = graph.getConnectedComponents(); diff --git a/programs/Hadrons/Environment.cc b/programs/Hadrons/Environment.cc index cbdf678e..92a19e41 100644 --- a/programs/Hadrons/Environment.cc +++ b/programs/Hadrons/Environment.cc @@ -139,39 +139,28 @@ GridParallelRNG * Environment::get4dRng(void) const void Environment::createModule(const std::string name, const std::string type, XmlReader &reader) { - auto addObject = [this](const std::string name, const int moduleAddress) - { - ObjInfo info; - - object_.push_back(info); - objectName_.push_back(name); - objectAddress_[name] = object_.size() - 1; - objectModule_.push_back(moduleAddress); - owners_.push_back(std::set()); - properties_.push_back(std::set()); - }; - if (!hasModule(name)) { auto &factory = ModuleFactory::getInstance(); std::vector inputAddress; + ModuleInfo m; - module_.push_back(factory.create(type, name)); - moduleType_.push_back(type); - moduleName_.push_back(name); - moduleAddress_[name] = module_.size() - 1; - module_.back()->parseParameters(reader, "options"); - auto input = module_.back()->getInput(); + m.data = factory.create(type, name); + m.type = typeIdPt(*m.data.get()); + m.name = name; + m.data->parseParameters(reader, "options"); + auto input = m.data->getInput(); for (auto &in: input) { if (!hasObject(in)) { addObject(in , -1); } - inputAddress.push_back(objectAddress_[in]); + m.input.push_back(objectAddress_[in]); } - moduleInput_.push_back(inputAddress); - auto output = module_.back()->getOutput(); + auto output = m.data->getOutput(); + module_.push_back(std::move(m)); + moduleAddress_[name] = module_.size() - 1; for (auto &out: output) { if (!hasObject(out)) @@ -180,16 +169,16 @@ void Environment::createModule(const std::string name, const std::string type, } else { - if (objectModule_[objectAddress_[out]] < 0) + if (object_[objectAddress_[out]].module < 0) { - objectModule_[objectAddress_[out]] = module_.size() - 1; + object_[objectAddress_[out]].module = module_.size() - 1; } else { HADRON_ERROR("object '" + out - + "' is already produced by module '" - + moduleName_[objectModule_[getObjectAddress(out)]] - + "' (while creating module '" + name + "')"); + + "' is already produced by module '" + + module_[object_[getObjectAddress(out)].module].name + + "' (while creating module '" + name + "')"); } } } @@ -204,7 +193,7 @@ ModuleBase * Environment::getModule(const unsigned int address) const { if (hasModule(address)) { - return module_[address].get(); + return module_[address].data.get(); } else { @@ -233,7 +222,7 @@ std::string Environment::getModuleName(const unsigned int address) const { if (hasModule(address)) { - return moduleName_[address]; + return module_[address].name; } else { @@ -245,7 +234,7 @@ std::string Environment::getModuleType(const unsigned int address) const { if (hasModule(address)) { - return moduleType_[address]; + return module_[address].type->name(); } else { @@ -275,9 +264,9 @@ Graph Environment::makeModuleGraph(void) const for (unsigned int i = 0; i < module_.size(); ++i) { moduleGraph.addVertex(i); - for (auto &j: moduleInput_[i]) + for (auto &j: module_[i].input) { - moduleGraph.addEdge(objectModule_[j], i); + moduleGraph.addEdge(object_[j].module, i); } } @@ -301,10 +290,10 @@ unsigned int Environment::executeProgram(const std::vector &p) { auto pred = [i, this](const unsigned int j) { - auto &in = moduleInput_[j]; + auto &in = module_[j].input; auto it = std::find(in.begin(), in.end(), i); - return (it != in.end()) or (j == objectModule_[i]); + return (it != in.end()) or (j == object_[i].module); }; auto it = std::find_if(p.rbegin(), p.rend(), pred); if (it != p.rend()) @@ -320,10 +309,10 @@ unsigned int Environment::executeProgram(const std::vector &p) if (!isDryRun()) { LOG(Message) << SEP << " Measurement step " << i+1 << "/" - << p.size() << " (module '" << moduleName_[p[i]] + << p.size() << " (module '" << module_[p[i]].name << "') " << SEP << std::endl; } - (*module_[p[i]])(); + (*module_[p[i]].data)(); sizeBefore = getTotalSize(); // print used memory after execution if (!isDryRun()) @@ -369,9 +358,9 @@ unsigned int Environment::executeProgram(const std::vector &p) } } // print used memory after garbage collection if necessary - sizeAfter = getTotalSize(); if (!isDryRun()) { + sizeAfter = getTotalSize(); if (sizeBefore != sizeAfter) { LOG(Message) << "Allocated objects: " << MEM_MSG(sizeAfter) @@ -399,204 +388,17 @@ unsigned int Environment::executeProgram(const std::vector &p) return executeProgram(pAddress); } -// lattice store /////////////////////////////////////////////////////////////// -void Environment::freeLattice(const unsigned int address) -{ - if (hasLattice(address)) - { - if (!isDryRun()) - { - LOG(Message) << "Freeing lattice '" << objectName_[address] - << "'" << std::endl; - } - lattice_.erase(address); - object_[address] = ObjInfo(); - } - else - { - HADRON_ERROR("trying to free unknown lattice (address " - + std::to_string(address) + ")"); - } -} - -bool Environment::hasLattice(const unsigned int address) const -{ - return (hasRegisteredObject(address) - and (lattice_.find(address) != lattice_.end())); -} - -bool Environment::hasLattice(const std::string name) const -{ - if (hasObject(name)) - { - return hasLattice(getObjectAddress(name)); - } - else - { - return false; - } -} - -// fermion actions ///////////////////////////////////////////////////////////// -void Environment::addFermionMatrix(const std::string name, FMat *fMat) -{ - if (hasRegisteredObject(name)) - { - fMat_[getObjectAddress(name)].reset(fMat); - } - else - { - HADRON_ERROR("no object named '" << name << "'"); - } -} - -Environment::FMat * Environment::getFermionMatrix(const std::string name) const -{ - unsigned int i; - - if (hasFermionMatrix(name)) - { - i = getObjectAddress(name); - - return fMat_.at(i).get(); - } - else - { - if (hasSolver(name)) - { - i = getObjectAddress(solverAction_.at(name)); - - return fMat_.at(i).get(); - } - else - { - HADRON_ERROR("no action/solver with name '" << name << "'"); - } - } -} - -bool Environment::hasFermionMatrix(const unsigned int address) const -{ - return (hasRegisteredObject(address) - and (fMat_.find(address) != fMat_.end())); -} - -bool Environment::hasFermionMatrix(const std::string name) const -{ - if (hasObject(name)) - { - return hasFermionMatrix(getObjectAddress(name)); - } - else - { - return false; - } -} - -void Environment::freeFermionMatrix(const unsigned int address) -{ - if (hasFermionMatrix(address)) - { - if (!isDryRun()) - { - LOG(Message) << "Freeing fermion matrix '" << objectName_[address] - << "'" << std::endl; - } - fMat_.erase(address); - object_[address] = ObjInfo(); - } - else - { - HADRON_ERROR("trying to free unknown fermion matrix (address " - + std::to_string(address) + ")"); - } -} - -void Environment::freeFermionMatrix(const std::string name) -{ - freeFermionMatrix(getObjectAddress(name)); -} - -// solvers ///////////////////////////////////////////////////////////////////// -void Environment::addSolver(const std::string name, Solver s) -{ - auto address = getObjectAddress(name); - - if (hasRegisteredObject(address)) - { - solver_[address] = s; - } - else - { - HADRON_ERROR("object with name '" + name - + "' exsists but is not registered"); - } -} - -bool Environment::hasSolver(const unsigned int address) const -{ - return (hasRegisteredObject(address) - and (solver_.find(address) != solver_.end())); -} - -bool Environment::hasSolver(const std::string name) const -{ - if (hasObject(name)) - { - return hasSolver(getObjectAddress(name)); - } - else - { - return false; - } -} - -void Environment::setSolverAction(const std::string name, - const std::string actionName) -{ - if (hasObject(name)) - { - solverAction_[name] = actionName; - } - else - { - HADRON_ERROR("no object named '" << name << "'"); - } -} - -std::string Environment::getSolverAction(const std::string name) const -{ - if (hasObject(name)) - { - try - { - return solverAction_.at(name); - } - catch (std::out_of_range &) - { - HADRON_ERROR("no action registered for solver '" << name << "'") - } - } - else - { - HADRON_ERROR("no object with name '" << name << "'"); - } -} - -void Environment::callSolver(const std::string name, LatticeFermion &sol, - const LatticeFermion &source) const -{ - if (hasSolver(name)) - { - solver_.at(getObjectAddress(name))(sol, source); - } - else - { - HADRON_ERROR("no solver with name '" << name << "'"); - } -} - // general memory management /////////////////////////////////////////////////// +void Environment::addObject(const std::string name, const int moduleAddress) +{ + ObjInfo info; + + info.name = name; + info.module = moduleAddress; + object_.push_back(std::move(info)); + objectAddress_[name] = object_.size() - 1; +} + void Environment::registerObject(const unsigned int address, const unsigned int size, const unsigned int Ls) { @@ -604,12 +406,9 @@ void Environment::registerObject(const unsigned int address, { if (hasObject(address)) { - ObjInfo info; - - info.size = size; - info.Ls = Ls; - info.isRegistered = true; - object_[address] = info; + object_[address].size = size; + object_[address].Ls = Ls; + object_[address].isRegistered = true; } else { @@ -645,7 +444,7 @@ std::string Environment::getObjectName(const unsigned int address) const { if (hasObject(address)) { - return objectName_[address]; + return object_[address].name; } else { @@ -653,6 +452,28 @@ std::string Environment::getObjectName(const unsigned int address) const } } +std::string Environment::getObjectType(const unsigned int address) const +{ + if (hasRegisteredObject(address)) + { + return object_[address].type->name(); + } + else if (hasObject(address)) + { + HADRON_ERROR("object with address " + std::to_string(address) + + " exists but is not registered"); + } + else + { + HADRON_ERROR("no object with address " + std::to_string(address)); + } +} + +std::string Environment::getObjectType(const std::string name) const +{ + return getObjectType(getObjectAddress(name)); +} + unsigned int Environment::getObjectSize(const unsigned int address) const { if (hasRegisteredObject(address)) @@ -662,7 +483,7 @@ unsigned int Environment::getObjectSize(const unsigned int address) const else if (hasObject(address)) { HADRON_ERROR("object with address " + std::to_string(address) - + " exsists but is not registered"); + + " exists but is not registered"); } else { @@ -684,7 +505,7 @@ unsigned int Environment::getObjectLs(const unsigned int address) const else if (hasObject(address)) { HADRON_ERROR("object with address " + std::to_string(address) - + " exsists but is not registered"); + + " exists but is not registered"); } else { @@ -761,8 +582,22 @@ long unsigned int Environment::getTotalSize(void) const void Environment::addOwnership(const unsigned int owner, const unsigned int property) { - owners_[property].insert(owner); - properties_[owner].insert(property); + if (hasObject(property)) + { + 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)); + } } void Environment::addOwnership(const std::string owner, @@ -776,7 +611,7 @@ bool Environment::hasOwners(const unsigned int address) const if (hasObject(address)) { - return (!owners_[address].empty()); + return (!object_[address].owners.empty()); } else { @@ -793,23 +628,22 @@ bool Environment::freeObject(const unsigned int address) { if (!hasOwners(address)) { - for (auto &p: properties_[address]) + if (!isDryRun()) { - owners_[p].erase(address); + LOG(Message) << "Destroying object '" << object_[address].name + << "'" << std::endl; } - properties_[address].clear(); - if (hasLattice(address)) + for (auto &p: object_[address].properties) { - freeLattice(address); - } - else if (hasFermionMatrix(address)) - { - freeFermionMatrix(address); - } - else if (hasObject(address)) - { - object_[address] = ObjInfo(); + object_[p].owners.erase(address); } + object_[address].size = 0; + object_[address].Ls = 0; + object_[address].isRegistered = false; + object_[address].type = nullptr; + object_[address].owners.clear(); + object_[address].properties.clear(); + object_[address].data.reset(nullptr); return true; } @@ -826,12 +660,10 @@ bool Environment::freeObject(const std::string name) void Environment::freeAll(void) { - lattice_.clear(); - fMat_.clear(); - solver_.clear(); - solverAction_.clear(); - owners_.clear(); - properties_.clear(); + for (unsigned int i = 0; i < object_.size(); ++i) + { + freeObject(i); + } } void Environment::printContent(void) @@ -840,13 +672,13 @@ void Environment::printContent(void) for (unsigned int i = 0; i < module_.size(); ++i) { LOG(Message) << std::setw(4) << std::right << i << ": " - << moduleName_[i] << " (" - << moduleType_[i] << ")" << std::endl; + << getModuleName(i) << " (" + << getModuleType(i) << ")" << std::endl; } LOG(Message) << "Objects: " << std::endl; for (unsigned int i = 0; i < object_.size(); ++i) { LOG(Message) << std::setw(4) << std::right << i << ": " - << objectName_[i] << std::endl; + << getObjectName(i) << std::endl; } } diff --git a/programs/Hadrons/Environment.hpp b/programs/Hadrons/Environment.hpp index 8c5c6021..f7076b8c 100644 --- a/programs/Hadrons/Environment.hpp +++ b/programs/Hadrons/Environment.hpp @@ -39,6 +39,27 @@ BEGIN_HADRONS_NAMESPACE // forward declaration of Module class ModuleBase; +class Object +{ +public: + Object(void) = default; + virtual ~Object(void) = default; +}; + +template +class Holder: public Object +{ +public: + Holder(void) = default; + Holder(T *pt); + virtual ~Holder(void) = default; + T & get(void) const; + T * getPt(void) const; + void reset(T *pt); +private: + std::unique_ptr objPt_{nullptr}; +}; + class Environment { SINGLETON(Environment); @@ -53,10 +74,22 @@ public: typedef std::unique_ptr RngPt; typedef std::unique_ptr LatticePt; private: + struct ModuleInfo + { + const std::type_info *type{nullptr}; + std::string name; + std::unique_ptr data{nullptr}; + std::vector input; + }; struct ObjInfo { - unsigned int size{0}, Ls{0}; - bool isRegistered{false}; + unsigned int size{0}, Ls{0}; + bool isRegistered{false}; + const std::type_info *type{nullptr}; + std::string name; + int module{-1}; + std::set owners, properties; + std::unique_ptr data{nullptr}; }; public: // dry run @@ -91,35 +124,9 @@ public: Graph makeModuleGraph(void) const; unsigned int executeProgram(const std::vector &p); unsigned int executeProgram(const std::vector &p); - // lattice store - template - T * create(const std::string name); - template - T * get(const std::string name) const; - bool hasLattice(const unsigned int address) const; - bool hasLattice(const std::string name) const; - void freeLattice(const unsigned int address); - void freeLattice(const std::string name); - template - unsigned int lattice4dSize(void) const; - // fermion actions - void addFermionMatrix(const std::string name, FMat *mat); - FMat * getFermionMatrix(const std::string name) const; - bool hasFermionMatrix(const unsigned int address) const; - bool hasFermionMatrix(const std::string name) const; - void freeFermionMatrix(const unsigned int address); - void freeFermionMatrix(const std::string name); - // solvers - void addSolver(const std::string name, Solver s); - bool hasSolver(const unsigned int address) const; - bool hasSolver(const std::string name) const; - void setSolverAction(const std::string name, - const std::string actionName); - std::string getSolverAction(const std::string name) const; - void callSolver(const std::string name, - LatticeFermion &sol, - const LatticeFermion &src) const; // general memory management + void addObject(const std::string name, + const int moduleAddress); void registerObject(const unsigned int address, const unsigned int size, const unsigned int Ls = 1); @@ -127,13 +134,29 @@ public: const unsigned int size, const unsigned int Ls = 1); template + unsigned int lattice4dSize(void) const; + template void registerLattice(const unsigned int address, const unsigned int Ls = 1); template void registerLattice(const std::string name, const unsigned int Ls = 1); + template + void setObject(const unsigned int address, T *object); + template + void setObject(const std::string name, T *object); + template + T * getObject(const unsigned int address) const; + template + T * getObject(const std::string name) const; + template + T * createLattice(const unsigned int address); + template + T * createLattice(const std::string name); unsigned int getObjectAddress(const std::string name) const; std::string getObjectName(const unsigned int address) const; + std::string getObjectType(const unsigned int address) const; + std::string getObjectType(const std::string name) const; unsigned int getObjectSize(const unsigned int address) const; unsigned int getObjectSize(const std::string name) const; unsigned int getObjectLs(const unsigned int address) const; @@ -167,11 +190,8 @@ private: // random number generator RngPt rng4d_; // module and related maps - std::vector module_; - std::vector moduleType_; - std::vector moduleName_; + std::vector module_; std::map moduleAddress_; - std::vector> moduleInput_; // lattice store std::map lattice_; // fermion matrix store @@ -179,18 +199,37 @@ private: // solver store & solver/action map std::map solver_; std::map solverAction_; - // object register + // object store std::vector object_; - std::vector objectName_; std::map objectAddress_; - std::vector objectModule_; - std::vector> owners_; - std::vector> properties_; }; /****************************************************************************** * template implementation * ******************************************************************************/ +template +Holder::Holder(T *pt) +: objPt_(pt) +{} + +template +T & Holder::get(void) const +{ + return &objPt_.get(); +} + +template +T * Holder::getPt(void) const +{ + return objPt_.get(); +} + +template +void Holder::reset(T *pt) +{ + objPt_.reset(pt); +} + template M * Environment::getModule(const unsigned int address) const { @@ -200,9 +239,9 @@ M * Environment::getModule(const unsigned int address) const } else { - HADRON_ERROR("module '" + moduleName_[address] + "' does not have type " - + typeName() + "(object type: " - + typeName(*module_.at(address).get()) + ")"); + HADRON_ERROR("module '" + module_[address].name + + "' does not have type " + typeid(M).name() + + "(object type: " + getModuleType(address) + ")"); } } @@ -218,56 +257,93 @@ unsigned int Environment::lattice4dSize(void) const return sizeof(typename T::vector_object)/getGrid()->Nsimd(); } -template -T * Environment::create(const std::string name) -{ - auto i = getObjectAddress(name); - GridCartesian *g = getGrid(getObjectLs(i)); - - lattice_[i].reset(new T(g)); - - return dynamic_cast(lattice_[i].get()); -} - -template -T * Environment::get(const std::string name) const -{ - if (hasLattice(name)) - { - auto i = getObjectAddress(name); - - if (auto pt = dynamic_cast(lattice_.at(i).get())) - { - return pt; - } - else - { - HADRON_ERROR("object '" + name + "' does not have type " - + typeName() + "(object type: " - + typeName(*lattice_.at(i).get()) + ")"); - } - } - else - { - HADRON_ERROR("no lattice with name '" + name + "'"); - - return nullptr; - } -} - template void Environment::registerLattice(const unsigned int address, const unsigned int Ls) { createGrid(Ls); - registerObject(address, Ls*lattice4dSize()); + registerObject(address, Ls*lattice4dSize(), Ls); } template void Environment::registerLattice(const std::string name, const unsigned int Ls) { createGrid(Ls); - registerObject(name, Ls*lattice4dSize()); + registerObject(name, Ls*lattice4dSize(), Ls); +} + +template +void Environment::setObject(const unsigned int address, T *object) +{ + if (hasRegisteredObject(address)) + { + object_[address].data.reset(new Holder(object)); + object_[address].type = &typeid(T); + } + else if (hasObject(address)) + { + HADRON_ERROR("object with address " + std::to_string(address) + + " exists but is not registered"); + } + else + { + HADRON_ERROR("no object with address " + std::to_string(address)); + } +} + +template +void Environment::setObject(const std::string name, T *object) +{ + setObject(getObjectAddress(name), object); +} + +template +T * Environment::getObject(const unsigned int address) const +{ + if (hasRegisteredObject(address)) + { + 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 '" + typeid(T).name() + + "' (has type '" + getObjectType(address) + "')"); + } + } + else if (hasObject(address)) + { + HADRON_ERROR("object with address " + std::to_string(address) + + " exists but is not registered"); + } + else + { + HADRON_ERROR("no object with address " + std::to_string(address)); + } +} + +template +T * Environment::getObject(const std::string name) const +{ + return getObject(getObjectAddress(name)); +} + +template +T * Environment::createLattice(const unsigned int address) +{ + GridCartesian *g = getGrid(getObjectLs(address)); + + setObject(address, new T(g)); + + return getObject(address); +} + +template +T * Environment::createLattice(const std::string name) +{ + return createLattice(getObjectAddress(name)); } END_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index c42753c1..716aaed9 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -111,6 +111,18 @@ std::string typeName(void) return name; } +template +const std::type_info * typeIdPt(const T &x) +{ + return &typeid(x); +} + +template +const std::type_info * typeName(void) +{ + return &typeid(T); +} + END_HADRONS_NAMESPACE #endif // Hadrons_Global_hpp_ diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index c2bebd93..2ea1cf21 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -55,6 +55,10 @@ static mod##ModuleRegistrar mod##ModuleRegistrarInstance; // base class class ModuleBase { +public: + // convenient type shortcuts + typedef Environment::FMat FMat; + typedef Environment::Solver Solver; public: // constructor ModuleBase(const std::string name); @@ -99,7 +103,19 @@ private: }; // no parameter type -typedef Serializable NoPar; +class NoPar {}; + +template <> +class Module: public ModuleBase +{ +public: + // constructor + Module(const std::string name): ModuleBase(name) {}; + // destructor + virtual ~Module(void) = default; + // parse parameters (do nothing) + virtual void parseParameters(XmlReader &reader, const std::string name) {}; +}; /****************************************************************************** * Template implementation * diff --git a/programs/Hadrons/Modules/ADWF.cc b/programs/Hadrons/Modules/ADWF.cc index f579c0b7..a52caf40 100644 --- a/programs/Hadrons/Modules/ADWF.cc +++ b/programs/Hadrons/Modules/ADWF.cc @@ -65,19 +65,17 @@ void ADWF::setup(void) // execution /////////////////////////////////////////////////////////////////// void ADWF::execute(void) { - env().createGrid(par().Ls); - - auto &U = *env().get(par().gauge); - auto &g4 = *env().getGrid(); - auto &grb4 = *env().getRbGrid(); - auto &g5 = *env().getGrid(par().Ls); - auto &grb5 = *env().getRbGrid(par().Ls); - auto fMatPt = new DomainWallFermionR(U, g5, grb5, g4, grb4, - par().mass, par().M5); - LOG(Message) << "Setting up domain wall fermion matrix with m= " << par().mass << ", M5= " << par().M5 << " and Ls= " << par().Ls << " using gauge field '" << par().gauge << "'" << std::endl; - env().addFermionMatrix(getName(), fMatPt); + env().createGrid(par().Ls); + auto &U = *env().getObject(par().gauge); + auto &g4 = *env().getGrid(); + auto &grb4 = *env().getRbGrid(); + auto &g5 = *env().getGrid(par().Ls); + auto &grb5 = *env().getRbGrid(par().Ls); + FMat *fMatPt = new DomainWallFermionR(U, g5, grb5, g4, grb4, par().mass, + par().M5); + env().setObject(getName(), fMatPt); } diff --git a/programs/Hadrons/Modules/AWilson.cc b/programs/Hadrons/Modules/AWilson.cc index 9b7c1b04..e5a41bfd 100644 --- a/programs/Hadrons/Modules/AWilson.cc +++ b/programs/Hadrons/Modules/AWilson.cc @@ -65,13 +65,11 @@ void AWilson::setup(void) // execution /////////////////////////////////////////////////////////////////// void AWilson::execute() { - auto &U = *env().get(par().gauge); - auto &grid = *env().getGrid(); - auto &gridRb = *env().getRbGrid(); - auto fMatPt = new WilsonFermionR(U, grid, gridRb, par().mass); - unsigned int size; - LOG(Message) << "Setting up Wilson fermion matrix with m= " << par().mass << " using gauge field '" << par().gauge << "'" << std::endl; - env().addFermionMatrix(getName(), fMatPt); + auto &U = *env().getObject(par().gauge); + auto &grid = *env().getGrid(); + auto &gridRb = *env().getRbGrid(); + FMat *fMatPt = new WilsonFermionR(U, grid, gridRb, par().mass); + env().setObject(getName(), fMatPt); } diff --git a/programs/Hadrons/Modules/CMeson.cc b/programs/Hadrons/Modules/CMeson.cc index 53088c43..5e8d6d0c 100644 --- a/programs/Hadrons/Modules/CMeson.cc +++ b/programs/Hadrons/Modules/CMeson.cc @@ -62,8 +62,8 @@ void CMeson::execute(void) << std::endl; XmlWriter writer(par().output); - LatticePropagator &q1 = *env().get(par().q1); - LatticePropagator &q2 = *env().get(par().q2); + LatticePropagator &q1 = *env().getObject(par().q1); + LatticePropagator &q2 = *env().getObject(par().q2); LatticeComplex c(env().getGrid()); SpinMatrix g[Ns*Ns], g5; std::vector buf; diff --git a/programs/Hadrons/Modules/GLoad.cc b/programs/Hadrons/Modules/GLoad.cc index 590c4135..69aa6c9b 100644 --- a/programs/Hadrons/Modules/GLoad.cc +++ b/programs/Hadrons/Modules/GLoad.cc @@ -68,7 +68,7 @@ void GLoad::execute(void) LOG(Message) << "Loading NERSC configuration from file '" << fileName << "'" << std::endl; - LatticeGaugeField &U = *env().create(getName()); + LatticeGaugeField &U = *env().createLattice(getName()); NerscIO::readConfiguration(U, header, fileName); LOG(Message) << "NERSC header:" << std::endl; dump_nersc_header(header, LOG(Message)); diff --git a/programs/Hadrons/Modules/GRandom.cc b/programs/Hadrons/Modules/GRandom.cc index f40c8121..57b4efa9 100644 --- a/programs/Hadrons/Modules/GRandom.cc +++ b/programs/Hadrons/Modules/GRandom.cc @@ -61,6 +61,6 @@ void GRandom::setup(void) void GRandom::execute(void) { LOG(Message) << "Generating random gauge configuration" << std::endl; - LatticeGaugeField &U = *env().create(getName()); + LatticeGaugeField &U = *env().createLattice(getName()); SU3::HotConfiguration(*env().get4dRng(), U); } diff --git a/programs/Hadrons/Modules/GUnit.cc b/programs/Hadrons/Modules/GUnit.cc index 20d815f1..9e660799 100644 --- a/programs/Hadrons/Modules/GUnit.cc +++ b/programs/Hadrons/Modules/GUnit.cc @@ -61,6 +61,6 @@ void GUnit::setup(void) void GUnit::execute(void) { LOG(Message) << "Creating unit gauge configuration" << std::endl; - LatticeGaugeField &U = *env().create(getName()); + LatticeGaugeField &U = *env().createLattice(getName()); SU3::ColdConfiguration(*env().get4dRng(), U); } diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index f3f1da06..a1940771 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -57,7 +57,7 @@ std::vector MQuark::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void MQuark::setup(void) { - Ls_ = env().getObjectLs(env().getSolverAction(par().solver)); + Ls_ = env().getObjectLs(par().solver); env().registerLattice(getName()); if (Ls_ > 1) { @@ -74,11 +74,12 @@ void MQuark::execute(void) LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; - LatticePropagator &prop = *env().create(propName); - LatticePropagator &fullSrc = *env().get(par().source); + LatticePropagator &prop = *env().createLattice(propName); + LatticePropagator &fullSrc = *env().getObject(par().source); + Environment::Solver &solver = *env().getObject(par().solver); if (Ls_ > 1) { - env().create(getName()); + env().createLattice(getName()); } LOG(Message) << "Inverting using solver '" << par().solver @@ -86,6 +87,8 @@ void MQuark::execute(void) for (unsigned int s = 0; s < Ns; ++s) for (unsigned int c = 0; c < Nc; ++c) { + LOG(Message) << "Inversion for spin= " << s << ", color= " << c + << std::endl; // source conversion for 4D sources if (!env().isObject5d(par().source)) { @@ -116,12 +119,12 @@ void MQuark::execute(void) } } sol = zero; - env().callSolver(par().solver, sol, source); + solver(sol, source); FermToProp(prop, sol, s, c); // create 4D propagators from 5D one if necessary if (Ls_ > 1) { - LatticePropagator &p4d = *env().get(getName()); + LatticePropagator &p4d = *env().getObject(getName()); axpby_ssp_pminus(sol, 0., sol, 1., sol, 0, 0); axpby_ssp_pplus(sol, 0., sol, 1., sol, 0, Ls_-1); diff --git a/programs/Hadrons/Modules/SolRBPrecCG.cc b/programs/Hadrons/Modules/SolRBPrecCG.cc index 14a09be5..8a1c7449 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.cc +++ b/programs/Hadrons/Modules/SolRBPrecCG.cc @@ -57,15 +57,16 @@ std::vector SolRBPrecCG::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void SolRBPrecCG::setup(void) { - env().registerObject(getName(), 0); + auto Ls = env().getObjectLs(par().action); + + env().registerObject(getName(), 0, Ls); env().addOwnership(getName(), par().action); - env().setSolverAction(getName(), par().action); } // execution /////////////////////////////////////////////////////////////////// void SolRBPrecCG::execute(void) { - auto &mat = *(env().getFermionMatrix(par().action)); + auto &mat = *(env().getObject(par().action)); auto solver = [&mat, this](LatticeFermion &sol, const LatticeFermion &source) { @@ -78,5 +79,5 @@ void SolRBPrecCG::execute(void) LOG(Message) << "setting up Schur red-black preconditioned CG for" << " action '" << par().action << "' with residual " << par().residual << std::endl; - env().addSolver(getName(), solver); + env().setObject(getName(), new Environment::Solver(solver)); } diff --git a/programs/Hadrons/Modules/SrcPoint.cc b/programs/Hadrons/Modules/SrcPoint.cc index 3b7c3d10..34f1825e 100644 --- a/programs/Hadrons/Modules/SrcPoint.cc +++ b/programs/Hadrons/Modules/SrcPoint.cc @@ -67,7 +67,7 @@ void SrcPoint::execute(void) LOG(Message) << "Creating point source at position [" << par().position << "]" << std::endl; - LatticePropagator &src = *env().create(getName()); + LatticePropagator &src = *env().createLattice(getName()); id = 1.; src = zero; pokeSite(id, src, position); diff --git a/programs/Hadrons/Modules/SrcZ2.cc b/programs/Hadrons/Modules/SrcZ2.cc index c77c2943..a614526d 100644 --- a/programs/Hadrons/Modules/SrcZ2.cc +++ b/programs/Hadrons/Modules/SrcZ2.cc @@ -77,7 +77,7 @@ void SrcZ2::execute(void) LOG(Message) << "Generating Z_2 band for " << par().tA << " <= t <= " << par().tB << std::endl; } - LatticePropagator &src = *env().create(getName()); + LatticePropagator &src = *env().createLattice(getName()); LatticeCoordinate(t, Tp); bernoulli(*env().get4dRng(), eta); eta = (2.*eta - shift)*(1./::sqrt(2.)); From 0b731b5d8030ea6f7287794cdc74d76096eef416 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 6 Jun 2016 17:46:53 +0100 Subject: [PATCH 056/807] Hadrons: genetic scheduler parameter fix --- programs/Hadrons/Application.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/Hadrons/Application.cc b/programs/Hadrons/Application.cc index f45ca066..4bb300e9 100644 --- a/programs/Hadrons/Application.cc +++ b/programs/Hadrons/Application.cc @@ -127,7 +127,7 @@ void Application::schedule(void) // constrained topological sort using a genetic algorithm LOG(Message) << "Scheduling computation..." << std::endl; - constexpr unsigned int maxGen = 2000000, maxCstGen = 2000000; + constexpr unsigned int maxGen = 200, maxCstGen = 50; unsigned int k = 0, gen, prevPeak, nCstPeak = 0; auto graph = env_.makeModuleGraph(); auto con = graph.getConnectedComponents(); From a2e9430abec0d82251b60c0afa8bc1f6cec605fe Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 3 Aug 2016 17:14:32 +0100 Subject: [PATCH 057/807] Hadrons: fix after build system update --- programs/Hadrons/Global.hpp | 5 ++--- programs/Hadrons/Makefile.am | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 716aaed9..21e7ac7c 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -30,8 +30,7 @@ directory. #include #include -#include -#include +#include #define BEGIN_HADRONS_NAMESPACE \ namespace Grid {\ @@ -50,7 +49,7 @@ class HadronsLogger: public Logger { public: HadronsLogger(int on, std::string nm): Logger("Hadrons", on, nm, - Logger::BLACK){}; + GridLogColours, "BLACK"){}; }; #define LOG(channel) std::cout << HadronsLog##channel diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am index 64ad5252..2372c025 100644 --- a/programs/Hadrons/Makefile.am +++ b/programs/Hadrons/Makefile.am @@ -1,5 +1,4 @@ -AM_CXXFLAGS = -I$(top_srcdir)/programs -I../$(top_srcdir)/programs -I$(top_srcdir)/lib -AM_LDFLAGS = -L$(top_builddir)/lib +AM_CXXFLAGS += -I$(top_srcdir)/programs -I../$(top_srcdir)/programs bin_PROGRAMS = Hadrons From e415260961104e3f1bbde929130686a6f60d90f7 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 3 Oct 2016 15:28:00 +0100 Subject: [PATCH 058/807] First cut on generalised HMC Backward compatibility OK --- lib/qcd/action/gauge/GaugeImpl.h | 54 +- lib/qcd/hmc/HMC.h | 38 +- lib/qcd/hmc/HmcRunner.h | 8 +- lib/qcd/hmc/NerscCheckpointer.h | 2 +- lib/qcd/hmc/integrators/Integrator.h | 107 ++-- .../hmc/integrators/Integrator_algorithm.h | 508 +++++++++--------- lib/qcd/smearing/GaugeConfiguration.h | 4 +- 7 files changed, 376 insertions(+), 345 deletions(-) diff --git a/lib/qcd/action/gauge/GaugeImpl.h b/lib/qcd/action/gauge/GaugeImpl.h index 400381bb..8e9ad36f 100644 --- a/lib/qcd/action/gauge/GaugeImpl.h +++ b/lib/qcd/action/gauge/GaugeImpl.h @@ -38,15 +38,19 @@ namespace QCD { template class WilsonLoops; -#define INHERIT_GIMPL_TYPES(GImpl) \ - typedef typename GImpl::Simd Simd; \ - typedef typename GImpl::GaugeLinkField GaugeLinkField; \ - typedef typename GImpl::GaugeField GaugeField; \ - typedef typename GImpl::SiteGaugeField SiteGaugeField; \ - typedef typename GImpl::SiteGaugeLink SiteGaugeLink; +// +#define INHERIT_GIMPL_TYPES(GImpl) \ + typedef typename GImpl::Simd Simd; \ + typedef typename GImpl::LinkField GaugeLinkField; \ + typedef typename GImpl::Field GaugeField; \ + typedef typename GImpl::SiteField SiteGaugeField; \ + typedef typename GImpl::SiteLink SiteGaugeLink; -// -template class GaugeImplTypes { +#define INHERIT_FIELD_TYPES(Impl) \ + typedef typename Impl::Field Field; + + +template class GaugeImplTypes { public: typedef S Simd; @@ -55,16 +59,14 @@ public: template using iImplGaugeField = iVector>, Nd>; - typedef iImplGaugeLink SiteGaugeLink; - typedef iImplGaugeField SiteGaugeField; + typedef iImplGaugeLink SiteLink; + typedef iImplGaugeField SiteField; - typedef Lattice GaugeLinkField; // bit ugly naming; polarised - // gauge field, lorentz... all - // ugly - typedef Lattice GaugeField; + typedef Lattice LinkField; + typedef Lattice Field; // Move this elsewhere? FIXME - static inline void AddGaugeLink(GaugeField &U, GaugeLinkField &W, + static inline void AddLink(Field &U, LinkField &W, int mu) { // U[mu] += W PARALLEL_FOR_LOOP for (auto ss = 0; ss < U._grid->oSites(); ss++) { @@ -72,6 +74,28 @@ public: U._odata[ss]._internal[mu] + W._odata[ss]._internal; } } + + static inline void generate_momenta(Field& P, GridParallelRNG& pRNG){ + // specific for SU gauge fields + LinkField Pmu(P._grid); + Pmu = zero; + for (int mu = 0; mu < Nd; mu++) { + SU::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu); + PokeIndex(P, Pmu, mu); + } + } + + static inline void update_field(Field& P, Field& U, double ep, unsigned int Nexp){ + + for (int mu = 0; mu < Nd; mu++) { + auto Umu = PeekIndex(U, mu); + auto Pmu = PeekIndex(P, mu); + Umu = expMat(Pmu, ep, Nexp) * Umu; + PokeIndex(U, ProjectOnGroup(Umu), mu); + } + + } + }; // Composition with smeared link, bc's etc.. probably need multiple inheritance diff --git a/lib/qcd/hmc/HMC.h b/lib/qcd/hmc/HMC.h index 05838349..a30242d3 100644 --- a/lib/qcd/hmc/HMC.h +++ b/lib/qcd/hmc/HMC.h @@ -60,24 +60,25 @@ struct HMCparameters { ///////////////////////////////// } - void print() const { - std::cout << GridLogMessage << "[HMC parameter] Trajectories : " << Trajectories << "\n"; - std::cout << GridLogMessage << "[HMC parameter] Start trajectory : " << StartTrajectory << "\n"; - std::cout << GridLogMessage << "[HMC parameter] Metropolis test (on/off): " << MetropolisTest << "\n"; - std::cout << GridLogMessage << "[HMC parameter] Thermalization trajs : " << NoMetropolisUntil << "\n"; + void print_parameters() const { + std::cout << GridLogMessage << "[HMC parameters] Trajectories : " << Trajectories << "\n"; + std::cout << GridLogMessage << "[HMC parameters] Start trajectory : " << StartTrajectory << "\n"; + std::cout << GridLogMessage << "[HMC parameters] Metropolis test (on/off): " << MetropolisTest << "\n"; + std::cout << GridLogMessage << "[HMC parameters] Thermalization trajs : " << NoMetropolisUntil << "\n"; } }; -template +template class HmcObservable { public: - virtual void TrajectoryComplete(int traj, GaugeField &U, GridSerialRNG &sRNG, + virtual void TrajectoryComplete(int traj, Field &U, GridSerialRNG &sRNG, GridParallelRNG &pRNG) = 0; }; + // this is only defined for a gauge theory template -class PlaquetteLogger : public HmcObservable { +class PlaquetteLogger : public HmcObservable { private: std::string Stem; @@ -117,19 +118,19 @@ class PlaquetteLogger : public HmcObservable { } }; -// template -template +template class HybridMonteCarlo { private: const HMCparameters Params; + typedef typename IntegratorType::Field Field; + GridSerialRNG &sRNG; // Fixme: need a RNG management strategy. GridParallelRNG &pRNG; // Fixme: need a RNG management strategy. - GaugeField &Ucur; + Field &Ucur; IntegratorType &TheIntegrator; - std::vector *> Observables; + std::vector *> Observables; ///////////////////////////////////////////////////////// // Metropolis step @@ -164,7 +165,7 @@ class HybridMonteCarlo { ///////////////////////////////////////////////////////// // Evolution ///////////////////////////////////////////////////////// - RealD evolve_step(GaugeField &U) { + RealD evolve_step(Field &U) { TheIntegrator.refresh(U, pRNG); // set U and initialize P and phi's RealD H0 = TheIntegrator.S(U); // initial state action @@ -191,20 +192,21 @@ class HybridMonteCarlo { // Constructor ///////////////////////////////////////// HybridMonteCarlo(HMCparameters Pams, IntegratorType &_Int, - GridSerialRNG &_sRNG, GridParallelRNG &_pRNG, GaugeField &_U) + GridSerialRNG &_sRNG, GridParallelRNG &_pRNG, Field &_U) : Params(Pams), TheIntegrator(_Int), sRNG(_sRNG), pRNG(_pRNG), Ucur(_U) {} ~HybridMonteCarlo(){}; - void AddObservable(HmcObservable *obs) { + void AddObservable(HmcObservable *obs) { Observables.push_back(obs); } void evolve(void) { Real DeltaH; - GaugeField Ucopy(Ucur._grid); + Field Ucopy(Ucur._grid); - Params.print(); + Params.print_parameters(); + TheIntegrator.print_parameters(); // Actual updates (evolve a copy Ucopy then copy back eventually) for (int traj = Params.StartTrajectory; diff --git a/lib/qcd/hmc/HmcRunner.h b/lib/qcd/hmc/HmcRunner.h index a31ba784..9ca4be01 100644 --- a/lib/qcd/hmc/HmcRunner.h +++ b/lib/qcd/hmc/HmcRunner.h @@ -32,6 +32,7 @@ directory namespace Grid { namespace QCD { +// Class for HMC specific for gauge theories template class NerscHmcRunnerTemplate { public: @@ -114,7 +115,7 @@ class NerscHmcRunnerTemplate { */ ////////////// NoSmearing SmearingPolicy; - typedef MinimumNorm2, RepresentationsPolicy > + typedef MinimumNorm2, RepresentationsPolicy > IntegratorType; // change here to change the algorithm IntegratorParameters MDpar(20, 1.0); IntegratorType MDynamics(UGrid, MDpar, TheAction, SmearingPolicy); @@ -157,10 +158,9 @@ class NerscHmcRunnerTemplate { // smeared set // notice that the unit configuration is singular in this procedure std::cout << GridLogMessage << "Filling the smeared set\n"; - SmearingPolicy.set_GaugeField(U); + SmearingPolicy.set_Field(U); - HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, - pRNG, U); + HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); HMC.AddObservable(&Checkpoint); HMC.AddObservable(&PlaqLog); diff --git a/lib/qcd/hmc/NerscCheckpointer.h b/lib/qcd/hmc/NerscCheckpointer.h index 2e368b2a..6701740b 100644 --- a/lib/qcd/hmc/NerscCheckpointer.h +++ b/lib/qcd/hmc/NerscCheckpointer.h @@ -36,7 +36,7 @@ Author: paboyle namespace Grid{ namespace QCD{ - + // Only for gauge fields template class NerscHmcCheckpointer : public HmcObservable { private: diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index f89b7959..09e1c275 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -49,60 +49,53 @@ namespace Grid { namespace QCD { struct IntegratorParameters { - int Nexp; - int MDsteps; // number of outer steps - RealD trajL; // trajectory length - RealD stepsize; + unsigned int + Nexp; // number of terms in the Taylor expansion of the exponential + unsigned int MDsteps; // number of outer steps + RealD trajL; // trajectory length + RealD stepsize; // trajectory stepsize - IntegratorParameters(int MDsteps_, RealD trajL_ = 1.0, int Nexp_ = 12) + IntegratorParameters(int MDsteps_, RealD trajL_ = 1.0, + unsigned int Nexp_ = 12) : Nexp(Nexp_), MDsteps(MDsteps_), trajL(trajL_), stepsize(trajL / MDsteps){ // empty body constructor - }; + }; + + void print_parameters() { + std::cout << GridLogMessage << "[Integrator] Trajectory length : " << trajL << std::endl; + std::cout << GridLogMessage << "[Integrator] Number of MD steps : " << MDsteps << std::endl; + std::cout << GridLogMessage << "[Integrator] Step size : " << stepsize << std::endl; + std::cout << GridLogMessage << "[Integrator] Exponential approx.: " << Nexp << std::endl; + + } }; /*! @brief Class for Molecular Dynamics management */ -template +template class Integrator { protected: typedef IntegratorParameters ParameterType; + typedef typename FieldImplementation::Field MomentaField; //for readability + typedef typename FieldImplementation::Field Field; IntegratorParameters Params; - const ActionSet as; + const ActionSet as; int levels; // double t_U; // Track time passing on each level and for U and for P std::vector t_P; // - GaugeField P; + MomentaField P; SmearingPolicy& Smearer; RepresentationPolicy Representations; - // Should match any legal (SU(n)) gauge field - // Need to use this template to match Ncol to pass to SU class - template - void generate_momenta(Lattice >, Nd> >& P, - GridParallelRNG& pRNG) { - typedef Lattice > > > GaugeLinkField; - GaugeLinkField Pmu(P._grid); - Pmu = zero; - for (int mu = 0; mu < Nd; mu++) { - SU::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu); - PokeIndex(P, Pmu, mu); - } - } - - // ObserverList observers; // not yet - // typedef std::vector ObserverList; - // void register_observers(); - // void notify_observers(); - - void update_P(GaugeField& U, int level, double ep) { + void update_P(Field& U, int level, double ep) { t_P[level] += ep; update_P(P, U, level, ep); @@ -129,12 +122,12 @@ class Integrator { } } update_P_hireps{}; - void update_P(GaugeField& Mom, GaugeField& U, int level, double ep) { + void update_P(MomentaField& Mom, Field& U, int level, double ep) { // input U actually not used in the fundamental case // Fundamental updates, include smearing for (int a = 0; a < as[level].actions.size(); ++a) { - GaugeField force(U._grid); - GaugeField& Us = Smearer.get_U(as[level].actions.at(a)->is_smeared); + Field force(U._grid); + Field& Us = Smearer.get_U(as[level].actions.at(a)->is_smeared); as[level].actions.at(a)->deriv(Us, force); // deriv should NOT include Ta std::cout << GridLogIntegrator @@ -152,7 +145,7 @@ class Integrator { as[level].apply(update_P_hireps, Representations, Mom, U, ep); } - void update_U(GaugeField& U, double ep) { + void update_U(Field& U, double ep) { update_U(P, U, ep); t_U += ep; @@ -161,26 +154,21 @@ class Integrator { << "[" << fl << "] U " << " dt " << ep << " : t_U " << t_U << std::endl; } - void update_U(GaugeField& Mom, GaugeField& U, double ep) { - // rewrite exponential to deal internally with the lorentz index? - for (int mu = 0; mu < Nd; mu++) { - auto Umu = PeekIndex(U, mu); - auto Pmu = PeekIndex(Mom, mu); - Umu = expMat(Pmu, ep, Params.Nexp) * Umu; - PokeIndex(U, ProjectOnGroup(Umu), mu); - } - + void update_U(MomentaField& Mom, Field& U, double ep) { + FieldImplementation::update_field(Mom, U, ep, Params.Nexp); + // Update the smeared fields, can be implemented as observer - Smearer.set_GaugeField(U); + Smearer.set_Field(U); + // Update the higher representations fields Representations.update(U); // void functions if fundamental representation } - virtual void step(GaugeField& U, int level, int first, int last) = 0; + virtual void step(Field& U, int level, int first, int last) = 0; public: Integrator(GridBase* grid, IntegratorParameters Par, - ActionSet& Aset, + ActionSet& Aset, SmearingPolicy& Sm) : Params(Par), as(Aset), @@ -195,6 +183,13 @@ class Integrator { virtual ~Integrator() {} + virtual std::string integrator_name() = 0; + + void print_parameters(){ + std::cout << GridLogMessage << "[Integrator] Name : "<< integrator_name() << std::endl; + Params.print_parameters(); + } + // to be used by the actionlevel class to iterate // over the representations struct _refresh { @@ -210,14 +205,14 @@ class Integrator { } refresh_hireps{}; // Initialization of momenta and actions - void refresh(GaugeField& U, GridParallelRNG& pRNG) { + void refresh(Field& U, GridParallelRNG& pRNG) { std::cout << GridLogIntegrator << "Integrator refresh\n"; - generate_momenta(P, pRNG); + FieldImplementation::generate_momenta(P, pRNG); // Update the smeared fields, can be implemented as observer // necessary to keep the fields updated even after a reject // of the Metropolis - Smearer.set_GaugeField(U); + Smearer.set_Field(U); // Set the (eventual) representations gauge fields Representations.update(U); @@ -228,7 +223,7 @@ class Integrator { for (int actionID = 0; actionID < as[level].actions.size(); ++actionID) { // get gauge field from the SmearingPolicy and // based on the boolean is_smeared in actionID - GaugeField& Us = + Field& Us = Smearer.get_U(as[level].actions.at(actionID)->is_smeared); as[level].actions.at(actionID)->refresh(Us, pRNG); } @@ -256,11 +251,12 @@ class Integrator { } S_hireps{}; // Calculate action - RealD S(GaugeField& U) { // here also U not used + RealD S(Field& U) { // here also U not used LatticeComplex Hloc(U._grid); Hloc = zero; - // Momenta + // Momenta --- modify this (take the trace of field) + // momenta_action() for (int mu = 0; mu < Nd; mu++) { auto Pmu = PeekIndex(P, mu); Hloc -= trace(Pmu * Pmu); @@ -276,7 +272,7 @@ class Integrator { for (int actionID = 0; actionID < as[level].actions.size(); ++actionID) { // get gauge field from the SmearingPolicy and // based on the boolean is_smeared in actionID - GaugeField& Us = + Field& Us = Smearer.get_U(as[level].actions.at(actionID)->is_smeared); Hterm = as[level].actions.at(actionID)->S(Us); std::cout << GridLogMessage << "S Level " << level << " term " @@ -289,7 +285,7 @@ class Integrator { return H; } - void integrate(GaugeField& U) { + void integrate(Field& U) { // reset the clocks t_U = 0; for (int level = 0; level < as.size(); ++level) { @@ -312,7 +308,12 @@ class Integrator { // and that we indeed got to the end of the trajectory assert(fabs(t_U - Params.trajL) < 1.0e-6); } + + + + }; } } #endif // INTEGRATOR_INCLUDED + diff --git a/lib/qcd/hmc/integrators/Integrator_algorithm.h b/lib/qcd/hmc/integrators/Integrator_algorithm.h index cd289b08..67144912 100644 --- a/lib/qcd/hmc/integrators/Integrator_algorithm.h +++ b/lib/qcd/hmc/integrators/Integrator_algorithm.h @@ -1,287 +1,291 @@ - /************************************************************************************* +/************************************************************************************* - Grid physics library, www.github.com/paboyle/Grid +Grid physics library, www.github.com/paboyle/Grid - Source file: ./lib/qcd/hmc/integrators/Integrator_algorithm.h +Source file: ./lib/qcd/hmc/integrators/Integrator_algorithm.h - Copyright (C) 2015 +Copyright (C) 2015 Author: Peter Boyle Author: neo - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - See the full license in the file "LICENSE" in the top level distribution directory - *************************************************************************************/ - /* END LEGAL */ +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ //-------------------------------------------------------------------- + + /*! @file Integrator_algorithm.h * @brief Declaration of classes for the Molecular Dynamics algorithms * - * @author Guido Cossu */ //-------------------------------------------------------------------- #ifndef INTEGRATOR_ALG_INCLUDED #define INTEGRATOR_ALG_INCLUDED -namespace Grid{ - namespace QCD{ +namespace Grid { +namespace QCD { - /* PAB: - * - * Recursive leapfrog; explanation of nested stepping - * - * Nested 1:4; units in dt for top level integrator - * - * CHROMA IroIro - * 0 1 0 - * P 1/2 P 1/2 - * P 1/16 P1/16 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/16 P1/8 - * P 1 P 1 - * P 1/16 * skipped --- avoids revaluating force - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/16 P1/8 - * P 1 P 1 - * P 1/16 * skipped - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/16 * skipped - * P 1 P 1 - * P 1/16 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/8 P1/8 - * U 1/8 U1/8 - * P 1/16 P1/16 - * P 1/2 P 1/2 - */ +/* PAB: + * + * Recursive leapfrog; explanation of nested stepping + * + * Nested 1:4; units in dt for top level integrator + * + * CHROMA IroIro + * 0 1 0 + * P 1/2 P 1/2 + * P 1/16 P1/16 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/16 P1/8 + * P 1 P 1 + * P 1/16 * skipped --- avoids revaluating force + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/16 P1/8 + * P 1 P 1 + * P 1/16 * skipped + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/16 * skipped + * P 1 P 1 + * P 1/16 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/8 P1/8 + * U 1/8 U1/8 + * P 1/16 P1/16 + * P 1/2 P 1/2 + */ - template > class LeapFrog : - public Integrator { - public: +template > +class LeapFrog : public Integrator { + public: + typedef LeapFrog + Algorithm; + INHERIT_FIELD_TYPES(FieldImplementation); - typedef LeapFrog Algorithm; + std::string integrator_name(){return "LeapFrog";} - LeapFrog(GridBase* grid, - IntegratorParameters Par, - ActionSet & Aset, - SmearingPolicy & Sm): - Integrator(grid,Par,Aset,Sm) {}; + LeapFrog(GridBase* grid, IntegratorParameters Par, + ActionSet& Aset, SmearingPolicy& Sm) + : Integrator( + grid, Par, Aset, Sm){}; + void step(Field& U, int level, int _first, int _last) { + int fl = this->as.size() - 1; + // level : current level + // fl : final level + // eps : current step size - void step (GaugeField& U, int level,int _first, int _last){ + // Get current level step size + RealD eps = this->Params.stepsize; + for (int l = 0; l <= level; ++l) eps /= this->as[l].multiplier; - int fl = this->as.size() -1; - // level : current level - // fl : final level - // eps : current step size - - // Get current level step size - RealD eps = this->Params.stepsize; - for(int l=0; l<=level; ++l) eps/= this->as[l].multiplier; - - int multiplier = this->as[level].multiplier; - for(int e=0; eas[level].multiplier; + for (int e = 0; e < multiplier; ++e) { + int first_step = _first && (e == 0); + int last_step = _last && (e == multiplier - 1); - int first_step = _first && (e==0); - int last_step = _last && (e==multiplier-1); - - if(first_step){ // initial half step - this->update_P(U, level,eps/2.0); - } - - if(level == fl){ // lowest level - this->update_U(U, eps); - }else{ // recursive function call - this->step(U, level+1,first_step,last_step); - } - - int mm = last_step ? 1 : 2; - this->update_P(U, level,mm*eps/2.0); - - } - } - }; - - template > class MinimumNorm2 : - public Integrator { - private: - const RealD lambda = 0.1931833275037836; - - public: - - MinimumNorm2(GridBase* grid, - IntegratorParameters Par, - ActionSet & Aset, - SmearingPolicy& Sm): - Integrator(grid,Par,Aset,Sm) {}; - - void step (GaugeField& U, int level, int _first,int _last){ - - // level : current level - // fl : final level - // eps : current step size - - int fl = this->as.size() -1; - - RealD eps = this->Params.stepsize*2.0; - for(int l=0; l<=level; ++l) eps/= 2.0*this->as[l].multiplier; - - // Nesting: 2xupdate_U of size eps/2 - // Next level is eps/2/multiplier - - int multiplier = this->as[level].multiplier; - for(int e=0; eupdate_P(U,level,lambda*eps); - } - - if(level == fl){ // lowest level - this->update_U(U,0.5*eps); - }else{ // recursive function call - this->step(U,level+1,first_step,0); - } - - this->update_P(U,level,(1.0-2.0*lambda)*eps); - - if(level == fl){ // lowest level - this->update_U(U,0.5*eps); - }else{ // recursive function call - this->step(U,level+1,0,last_step); - } - - int mm = (last_step) ? 1 : 2; - this->update_P(U,level,lambda*eps*mm); - - } - } - }; - - - template > class ForceGradient : - public Integrator { - private: - const RealD lambda = 1.0/6.0;; - const RealD chi = 1.0/72.0; - const RealD xi = 0.0; - const RealD theta = 0.0; - public: - - // Looks like dH scales as dt^4. tested wilson/wilson 2 level. - ForceGradient(GridBase* grid, - IntegratorParameters Par, - ActionSet & Aset, - SmearingPolicy &Sm): - Integrator(grid,Par,Aset, Sm) {}; - - - void FG_update_P(GaugeField&U, int level,double fg_dt,double ep){ - GaugeField Ufg(U._grid); - GaugeField Pfg(U._grid); - Ufg = U; - Pfg = zero; - std::cout << GridLogMessage << "FG update "<update_P(Pfg,Ufg,level,1.0); - this->update_U(Pfg,Ufg,fg_dt); - this->update_P(Ufg,level,ep); + if (first_step) { // initial half step + this->update_P(U, level, eps / 2.0); } - void step (GaugeField& U, int level, int _first,int _last){ - - RealD eps = this->Params.stepsize*2.0; - for(int l=0; l<=level; ++l) eps/= 2.0*this->as[l].multiplier; - - RealD Chi = chi*eps*eps*eps; - - int fl = this->as.size() -1; - - int multiplier = this->as[level].multiplier; - - for(int e=0; eupdate_P(U,level,lambda*eps); - } - - if(level == fl){ // lowest level - this->update_U(U,0.5*eps); - }else{ // recursive function call - this->step(U,level+1,first_step,0); - } - - this->FG_update_P(U,level,2*Chi/((1.0-2.0*lambda)*eps),(1.0-2.0*lambda)*eps); - - if(level == fl){ // lowest level - this->update_U(U,0.5*eps); - }else{ // recursive function call - this->step(U,level+1,0,last_step); - } - - int mm = (last_step) ? 1 : 2; - this->update_P(U,level,lambda*eps*mm); - - } + if (level == fl) { // lowest level + this->update_U(U, eps); + } else { // recursive function call + this->step(U, level + 1, first_step, last_step); } - }; + int mm = last_step ? 1 : 2; + this->update_P(U, level, mm * eps / 2.0); + } } +}; + +template > +class MinimumNorm2 : public Integrator { + private: + const RealD lambda = 0.1931833275037836; + + public: + INHERIT_FIELD_TYPES(FieldImplementation); + + MinimumNorm2(GridBase* grid, IntegratorParameters Par, + ActionSet& Aset, SmearingPolicy& Sm) + : Integrator( + grid, Par, Aset, Sm){}; + + std::string integrator_name(){return "MininumNorm2";} + + void step(Field& U, int level, int _first, int _last) { + // level : current level + // fl : final level + // eps : current step size + + int fl = this->as.size() - 1; + + RealD eps = this->Params.stepsize * 2.0; + for (int l = 0; l <= level; ++l) eps /= 2.0 * this->as[l].multiplier; + + // Nesting: 2xupdate_U of size eps/2 + // Next level is eps/2/multiplier + + int multiplier = this->as[level].multiplier; + for (int e = 0; e < multiplier; ++e) { // steps per step + + int first_step = _first && (e == 0); + int last_step = _last && (e == multiplier - 1); + + if (first_step) { // initial half step + this->update_P(U, level, lambda * eps); + } + + if (level == fl) { // lowest level + this->update_U(U, 0.5 * eps); + } else { // recursive function call + this->step(U, level + 1, first_step, 0); + } + + this->update_P(U, level, (1.0 - 2.0 * lambda) * eps); + + if (level == fl) { // lowest level + this->update_U(U, 0.5 * eps); + } else { // recursive function call + this->step(U, level + 1, 0, last_step); + } + + int mm = (last_step) ? 1 : 2; + this->update_P(U, level, lambda * eps * mm); + } + } +}; + +template > +class ForceGradient : public Integrator { + private: + const RealD lambda = 1.0 / 6.0; + ; + const RealD chi = 1.0 / 72.0; + const RealD xi = 0.0; + const RealD theta = 0.0; + + public: + INHERIT_FIELD_TYPES(FieldImplementation); + + // Looks like dH scales as dt^4. tested wilson/wilson 2 level. + ForceGradient(GridBase* grid, IntegratorParameters Par, + ActionSet& Aset, + SmearingPolicy& Sm) + : Integrator( + grid, Par, Aset, Sm){}; + + std::string integrator_name(){return "ForceGradient";} + + void FG_update_P(Field& U, int level, double fg_dt, double ep) { + Field Ufg(U._grid); + Field Pfg(U._grid); + Ufg = U; + Pfg = zero; + std::cout << GridLogMessage << "FG update " << fg_dt << " " << ep + << std::endl; + // prepare_fg; no prediction/result cache for now + // could relax CG stopping conditions for the + // derivatives in the small step since the force gets multiplied by + // a tiny dt^2 term relative to main force. + // + // Presently 4 force evals, and should have 3, so 1.33x too expensive. + // could reduce this with sloppy CG to perhaps 1.15x too expensive + // even without prediction. + this->update_P(Pfg, Ufg, level, 1.0); + this->update_U(Pfg, Ufg, fg_dt); + this->update_P(Ufg, level, ep); + } + + void step(Field& U, int level, int _first, int _last) { + RealD eps = this->Params.stepsize * 2.0; + for (int l = 0; l <= level; ++l) eps /= 2.0 * this->as[l].multiplier; + + RealD Chi = chi * eps * eps * eps; + + int fl = this->as.size() - 1; + + int multiplier = this->as[level].multiplier; + + for (int e = 0; e < multiplier; ++e) { // steps per step + + int first_step = _first && (e == 0); + int last_step = _last && (e == multiplier - 1); + + if (first_step) { // initial half step + this->update_P(U, level, lambda * eps); + } + + if (level == fl) { // lowest level + this->update_U(U, 0.5 * eps); + } else { // recursive function call + this->step(U, level + 1, first_step, 0); + } + + this->FG_update_P(U, level, 2 * Chi / ((1.0 - 2.0 * lambda) * eps), + (1.0 - 2.0 * lambda) * eps); + + if (level == fl) { // lowest level + this->update_U(U, 0.5 * eps); + } else { // recursive function call + this->step(U, level + 1, 0, last_step); + } + + int mm = (last_step) ? 1 : 2; + this->update_P(U, level, lambda * eps * mm); + } + } +}; +} } -#endif//INTEGRATOR_INCLUDED +#endif // INTEGRATOR_INCLUDED diff --git a/lib/qcd/smearing/GaugeConfiguration.h b/lib/qcd/smearing/GaugeConfiguration.h index 57cccb0a..803f3566 100644 --- a/lib/qcd/smearing/GaugeConfiguration.h +++ b/lib/qcd/smearing/GaugeConfiguration.h @@ -21,7 +21,7 @@ public: NoSmearing(): ThinLinks(NULL) {} - void set_GaugeField(GaugeField& U) { ThinLinks = &U; } + void set_Field(GaugeField& U) { ThinLinks = &U; } void smeared_force(GaugeField& SigmaTilde) const {} @@ -227,7 +227,7 @@ class SmearedConfiguration { // attach the smeared routines to the thin links U and fill the smeared set - void set_GaugeField(GaugeField& U) { fill_smearedSet(U); } + void set_Field(GaugeField& U) { fill_smearedSet(U); } //==================================================================== void smeared_force(GaugeField& SigmaTilde) const { From 257f69f931d9d6f0e6e627001d76f6efd64e6bbf Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 3 Oct 2016 15:50:04 +0100 Subject: [PATCH 059/807] One more function to generalise the HMC integrator --- lib/qcd/action/gauge/GaugeImpl.h | 11 +++++++++++ lib/qcd/hmc/integrators/Integrator.h | 12 +----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/qcd/action/gauge/GaugeImpl.h b/lib/qcd/action/gauge/GaugeImpl.h index 8e9ad36f..fd3bf55a 100644 --- a/lib/qcd/action/gauge/GaugeImpl.h +++ b/lib/qcd/action/gauge/GaugeImpl.h @@ -96,6 +96,17 @@ public: } + static inline RealD FieldSquareNorm(Field& U){ + LatticeComplex Hloc(U._grid); + Hloc = zero; + for (int mu = 0; mu < Nd; mu++) { + auto Umu = PeekIndex(U, mu); + Hloc += trace(Umu * Umu); + } + Complex Hsum = sum(Hloc); + return Hsum.real(); + } + }; // Composition with smeared link, bc's etc.. probably need multiple inheritance diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index 09e1c275..d2c1aef1 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -253,17 +253,7 @@ class Integrator { // Calculate action RealD S(Field& U) { // here also U not used - LatticeComplex Hloc(U._grid); - Hloc = zero; - // Momenta --- modify this (take the trace of field) - // momenta_action() - for (int mu = 0; mu < Nd; mu++) { - auto Pmu = PeekIndex(P, mu); - Hloc -= trace(Pmu * Pmu); - } - Complex Hsum = sum(Hloc); - - RealD H = Hsum.real(); + RealD H = - FieldImplementation::FieldSquareNorm(P); // - trace (P*P) RealD Hterm; std::cout << GridLogMessage << "Momentum action H_p = " << H << "\n"; From cfbc1a26b8667f95a6fe4c2aff4baeacfad5c21b Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 3 Oct 2016 16:20:06 +0100 Subject: [PATCH 060/807] Now the gauge implementation has to take care of the Nexp --- lib/qcd/action/gauge/GaugeImpl.h | 11 ++++++----- lib/qcd/hmc/integrators/Integrator.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/qcd/action/gauge/GaugeImpl.h b/lib/qcd/action/gauge/GaugeImpl.h index fd3bf55a..5ef9f107 100644 --- a/lib/qcd/action/gauge/GaugeImpl.h +++ b/lib/qcd/action/gauge/GaugeImpl.h @@ -49,8 +49,8 @@ template class WilsonLoops; #define INHERIT_FIELD_TYPES(Impl) \ typedef typename Impl::Field Field; - -template class GaugeImplTypes { +// hard codes the exponential approximation in the template +template class GaugeImplTypes { public: typedef S Simd; @@ -75,6 +75,7 @@ public: } } + // HMC auxiliary functions static inline void generate_momenta(Field& P, GridParallelRNG& pRNG){ // specific for SU gauge fields LinkField Pmu(P._grid); @@ -85,15 +86,15 @@ public: } } - static inline void update_field(Field& P, Field& U, double ep, unsigned int Nexp){ - + + + static inline void update_field(Field& P, Field& U, double ep){ for (int mu = 0; mu < Nd; mu++) { auto Umu = PeekIndex(U, mu); auto Pmu = PeekIndex(P, mu); Umu = expMat(Pmu, ep, Nexp) * Umu; PokeIndex(U, ProjectOnGroup(Umu), mu); } - } static inline RealD FieldSquareNorm(Field& U){ diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index d2c1aef1..f5e5a37c 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -155,7 +155,8 @@ class Integrator { << " dt " << ep << " : t_U " << t_U << std::endl; } void update_U(MomentaField& Mom, Field& U, double ep) { - FieldImplementation::update_field(Mom, U, ep, Params.Nexp); + // exponential of Mom*U in the gauge fields case + FieldImplementation::update_field(Mom, U, ep); // Update the smeared fields, can be implemented as observer Smearer.set_Field(U); From d9b5fbd374fa08d700d52a054786d6ecd70b4e9d Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 4 Oct 2016 11:24:08 +0100 Subject: [PATCH 061/807] In the middle of adding a general binary writer --- lib/parallelIO/BinaryIO.h | 6 ++ lib/parallelIO/NerscIO.h | 86 +++++++++++----------- lib/qcd/hmc/BinaryCheckpointer.h | 106 +++++++++++++++++++++++++++ lib/qcd/hmc/integrators/Integrator.h | 20 ++--- 4 files changed, 163 insertions(+), 55 deletions(-) create mode 100644 lib/qcd/hmc/BinaryCheckpointer.h diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 5eddb57d..6e2bbb67 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -539,6 +539,12 @@ class BinaryIO { int ieee64big = (format == std::string("IEEE64BIG")); int ieee64 = (format == std::string("IEEE64")); + if(!(ieee32big || ieee32 || ieee64big || ieee64)){ + std::cout << GridLogError << "Unrecognized file format " << format << std::endl; + std::cout << GridLogError << "Allowed: IEEE32BIG | IEEE32 | IEEE64BIG | IEEE64" << std::endl; + exit(0); + } + int nd = grid->_ndimension; for(int d=0;dCheckerBoarded(d) == 0); diff --git a/lib/parallelIO/NerscIO.h b/lib/parallelIO/NerscIO.h index 79572539..945c6571 100644 --- a/lib/parallelIO/NerscIO.h +++ b/lib/parallelIO/NerscIO.h @@ -137,51 +137,53 @@ inline void NerscMachineCharacteristics(NerscField &header) const int y=1; const int z=2; for(int mu=0;mu<4;mu++){ - cm(mu)()(2,x) = adj(cm(mu)()(0,y)*cm(mu)()(1,z)-cm(mu)()(0,z)*cm(mu)()(1,y)); //x= yz-zy - cm(mu)()(2,y) = adj(cm(mu)()(0,z)*cm(mu)()(1,x)-cm(mu)()(0,x)*cm(mu)()(1,z)); //y= zx-xz - cm(mu)()(2,z) = adj(cm(mu)()(0,x)*cm(mu)()(1,y)-cm(mu)()(0,y)*cm(mu)()(1,x)); //z= xy-yx + cm(mu)()(2,x) = adj(cm(mu)()(0,y)*cm(mu)()(1,z)-cm(mu)()(0,z)*cm(mu)()(1,y)); //x= yz-zy + cm(mu)()(2,y) = adj(cm(mu)()(0,z)*cm(mu)()(1,x)-cm(mu)()(0,x)*cm(mu)()(1,z)); //y= zx-xz + cm(mu)()(2,z) = adj(cm(mu)()(0,x)*cm(mu)()(1,y)-cm(mu)()(0,y)*cm(mu)()(1,x)); //z= xy-yx } } template struct NerscSimpleMunger{ - - void operator() (fobj &in,sobj &out,uint32_t &csum){ - - for(int mu=0;mu<4;mu++){ - for(int i=0;i<3;i++){ - for(int j=0;j<3;j++){ - out(mu)()(i,j) = in(mu)()(i,j); - }}} - NerscChecksum((uint32_t *)&in,sizeof(in),csum); + void operator()(fobj &in, sobj &out, uint32_t &csum) { + for (int mu = 0; mu < Nd; mu++) { + for (int i = 0; i < Nc; i++) { + for (int j = 0; j < Nc; j++) { + out(mu)()(i, j) = in(mu)()(i, j); + } + } + } + NerscChecksum((uint32_t *)&in, sizeof(in), csum); }; }; - template - struct NerscSimpleUnmunger{ - void operator() (sobj &in,fobj &out,uint32_t &csum){ - for(int mu=0;mu + struct NerscSimpleUnmunger { + void operator()(sobj &in, fobj &out, uint32_t &csum) { + for (int mu = 0; mu < Nd; mu++) { + for (int i = 0; i < Nc; i++) { + for (int j = 0; j < Nc; j++) { + out(mu)()(i, j) = in(mu)()(i, j); + } + } + } + NerscChecksum((uint32_t *)&out, sizeof(out), csum); }; }; - + template struct Nersc3x2munger{ void operator() (fobj &in,sobj &out,uint32_t &csum){ - NerscChecksum((uint32_t *)&in,sizeof(in),csum); + NerscChecksum((uint32_t *)&in,sizeof(in),csum); - for(int mu=0;mu<4;mu++){ - for(int i=0;i<2;i++){ - for(int j=0;j<3;j++){ - out(mu)()(i,j) = in(mu)(i)(j); - }} - } - reconstruct3(out); + for(int mu=0;mu<4;mu++){ + for(int i=0;i<2;i++){ + for(int j=0;j<3;j++){ + out(mu)()(i,j) = in(mu)(i)(j); + }} + } + reconstruct3(out); } }; @@ -191,14 +193,14 @@ inline void NerscMachineCharacteristics(NerscField &header) void operator() (sobj &in,fobj &out,uint32_t &csum){ - for(int mu=0;mu<4;mu++){ - for(int i=0;i<2;i++){ - for(int j=0;j<3;j++){ - out(mu)(i)(j) = in(mu)()(i,j); - }} - } + for(int mu=0;mu<4;mu++){ + for(int i=0;i<2;i++){ + for(int j=0;j<3;j++){ + out(mu)(i)(j) = in(mu)()(i,j); + }} + } - NerscChecksum((uint32_t *)&out,sizeof(out),csum); + NerscChecksum((uint32_t *)&out,sizeof(out),csum); } }; @@ -346,24 +348,24 @@ static inline void readConfiguration(Lattice > &Umu, if ( header.data_type == std::string("4D_SU3_GAUGE") ) { if ( ieee32 || ieee32big ) { // csum=BinaryIO::readObjectSerial, LorentzColour2x3F> - csum=BinaryIO::readObjectParallel, LorentzColour2x3F> - (Umu,file,Nersc3x2munger(), offset,format); + csum=BinaryIO::readObjectParallel, LorentzColour2x3F> + (Umu,file,Nersc3x2munger(), offset,format); } if ( ieee64 || ieee64big ) { //csum=BinaryIO::readObjectSerial, LorentzColour2x3D> csum=BinaryIO::readObjectParallel, LorentzColour2x3D> - (Umu,file,Nersc3x2munger(),offset,format); + (Umu,file,Nersc3x2munger(),offset,format); } } else if ( header.data_type == std::string("4D_SU3_GAUGE_3x3") ) { if ( ieee32 || ieee32big ) { //csum=BinaryIO::readObjectSerial,LorentzColourMatrixF> csum=BinaryIO::readObjectParallel,LorentzColourMatrixF> - (Umu,file,NerscSimpleMunger(),offset,format); + (Umu,file,NerscSimpleMunger(),offset,format); } if ( ieee64 || ieee64big ) { // csum=BinaryIO::readObjectSerial,LorentzColourMatrixD> csum=BinaryIO::readObjectParallel,LorentzColourMatrixD> - (Umu,file,NerscSimpleMunger(),offset,format); + (Umu,file,NerscSimpleMunger(),offset,format); } } else { assert(0); diff --git a/lib/qcd/hmc/BinaryCheckpointer.h b/lib/qcd/hmc/BinaryCheckpointer.h new file mode 100644 index 00000000..fb48201c --- /dev/null +++ b/lib/qcd/hmc/BinaryCheckpointer.h @@ -0,0 +1,106 @@ + /************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/qcd/hmc/NerscCheckpointer.h + + Copyright (C) 2015 + +Author: paboyle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution directory + *************************************************************************************/ + /* END LEGAL */ +#ifndef NERSC_CHECKPOINTER +#define NERSC_CHECKPOINTER + +#include +#include +#include + + +namespace Grid{ + namespace QCD{ + + template + struct BinarySimpleUnmunger{ + void operator() (sobj &in,fobj &out,uint32_t &csum){ + fobj = sobj; + csum =0; + }; + + + // Only for gauge fields + template + class BinaryHmcCheckpointer : public HmcObservable { + private: + std::string configStem; + std::string rngStem; + int SaveInterval; + public: + INHERIT_FIELD_TYPES(Impl); // The Field is a Lattice object + + typedef typename Field::vector_object vobj; + typedef typename vobj::scalar_object sobj; + + + BinaryHmcCheckpointer(std::string cf, std::string rn,int savemodulo) { + configStem = cf; + rngStem = rn; + SaveInterval= savemodulo; + }; + + void TrajectoryComplete(int traj, Field &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + if ((traj % SaveInterval) == 0) { + std::string rng; + { + std::ostringstream os; + os << rngStem << "." << traj; + rng = os.str(); + } + std::string config; + { + std::ostringstream os; + os << configStem << "." << traj; + config = os.str(); + } + + int prec = getPrecision::value; //get precision of oject + std::string floating_point = "IEEE64BIG"; //default precision + if (prec == 1) + floating_point = "IEEE32BIG" + + BinarySimpleUnmunger munge; + BinaryIO::writeRNGSerial(sRNG, pRNG, rng, 0); + BinaryIO::writeObjectParallel(U, config, munge, 0 ,floating_point); + } + }; + + void CheckpointRestore(int traj, GaugeField &U, GridSerialRNG &sRNG, GridParallelRNG & pRNG ){ + + std::string rng; { std::ostringstream os; os << rngStem <<"."<< traj; rng = os.str(); } + std::string config;{ std::ostringstream os; os << configStem <<"."<< traj; config = os.str();} + + NerscField header; + NerscIO::readRNGState(sRNG,pRNG,header,rng); + NerscIO::readConfiguration(U,header,config); + }; + + }; +}} +#endif diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index f5e5a37c..735863a0 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -41,8 +41,6 @@ directory #ifndef INTEGRATOR_INCLUDED #define INTEGRATOR_INCLUDED -// class Observer; - #include namespace Grid { @@ -77,24 +75,20 @@ struct IntegratorParameters { template class Integrator { protected: - typedef IntegratorParameters ParameterType; typedef typename FieldImplementation::Field MomentaField; //for readability typedef typename FieldImplementation::Field Field; + int levels; // number of integration levels + double t_U; // Track time passing on each level and for U and for P + std::vector t_P; + + MomentaField P; + SmearingPolicy& Smearer; + RepresentationPolicy Representations; IntegratorParameters Params; const ActionSet as; - int levels; // - double t_U; // Track time passing on each level and for U and for P - std::vector t_P; // - - MomentaField P; - - SmearingPolicy& Smearer; - - RepresentationPolicy Representations; - void update_P(Field& U, int level, double ep) { t_P[level] += ep; update_P(P, U, level, ep); From c065e454c392dda361eaa0d9f8172ac7b2c09a7e Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 6 Oct 2016 10:12:11 +0100 Subject: [PATCH 062/807] Adding Binrary IO, untested --- lib/algorithms/approx/Chebyshev.h | 5 +- lib/parallelIO/NerscIO.h | 4 +- lib/qcd/hmc/BinaryCheckpointer.h | 202 +++++++++++++++++----------- lib/tensors/Tensor_class.h | 13 +- lib/tensors/Tensor_traits.h | 13 +- tests/solver/Test_wilson_lanczos.cc | 108 +++++++++++++++ 6 files changed, 258 insertions(+), 87 deletions(-) create mode 100644 tests/solver/Test_wilson_lanczos.cc diff --git a/lib/algorithms/approx/Chebyshev.h b/lib/algorithms/approx/Chebyshev.h index 6837ae99..2793f138 100644 --- a/lib/algorithms/approx/Chebyshev.h +++ b/lib/algorithms/approx/Chebyshev.h @@ -197,8 +197,9 @@ namespace Grid { void operator() (LinearOperatorBase &Linop, const Field &in, Field &out) { GridBase *grid=in._grid; -//std::cout << "Chevyshef(): in._grid="< #include #include +#include +namespace Grid { +namespace QCD { -namespace Grid{ - namespace QCD{ +template +struct BinarySimpleUnmunger { + typedef typename getPrecision::real_scalar_type fobj_stype; + typedef typename getPrecision::real_scalar_type sobj_stype; + + void operator()(sobj &in, fobj &out, uint32_t &csum) { + // take word by word and transform accoding to the status + fobj_stype* out_buffer = (fobj_stype*)&out; + sobj_stype* in_buffer = (sobj_stype*)∈ + size_t fobj_words = sizeof(out)/sizeof(fobj_stype); + size_t sobj_words = sizeof(in)/sizeof(sobj_stype); + assert(fobj_words == sobj_words); + + for (unsigned int word = 0; word < sobj_words; word++) + out_buffer[word] = in_buffer[word]; // type conversion on the fly + + BinaryIO::Uint32Checksum((uint32_t*)&out,sizeof(out),csum); - template - struct BinarySimpleUnmunger{ - void operator() (sobj &in,fobj &out,uint32_t &csum){ - fobj = sobj; - csum =0; - }; + }; + +template +struct BinarySimpleMunger { + typedef typename getPrecision::real_scalar_type fobj_stype; + typedef typename getPrecision::real_scalar_type sobj_stype; + + void operator()(sobj &out, fobj &in, uint32_t &csum) { + // take word by word and transform accoding to the status + fobj_stype* in_buffer = (fobj_stype*)∈ + sobj_stype* out_buffer = (sobj_stype*)&out; + size_t fobj_words = sizeof(in)/sizeof(fobj_stype); + size_t sobj_words = sizeof(out)/sizeof(sobj_stype); + assert(fobj_words == sobj_words); + + for (unsigned int word = 0; word < sobj_words; word++) + out_buffer[word] = in_buffer[word]; // type conversion on the fly + + BinaryIO::Uint32Checksum((uint32_t*)&in,sizeof(in),csum); + + }; - // Only for gauge fields - template - class BinaryHmcCheckpointer : public HmcObservable { - private: - std::string configStem; - std::string rngStem; - int SaveInterval; - public: - INHERIT_FIELD_TYPES(Impl); // The Field is a Lattice object + // Only for the main field in the hmc + template + class BinaryHmcCheckpointer : public HmcObservable { + private: + std::string configStem; + std::string rngStem; + int SaveInterval; - typedef typename Field::vector_object vobj; - typedef typename vobj::scalar_object sobj; - + public: + INHERIT_FIELD_TYPES(Impl); // The Field is a Lattice object - BinaryHmcCheckpointer(std::string cf, std::string rn,int savemodulo) { - configStem = cf; - rngStem = rn; - SaveInterval= savemodulo; - }; + typedef typename Field::vector_object vobj; + typedef typename vobj::scalar_object sobj; + typedef typename getPrecision::real_scalar_type sobj_stype; + typedef typename sobj::DoublePrecision sobj_double; - void TrajectoryComplete(int traj, Field &U, GridSerialRNG &sRNG, - GridParallelRNG &pRNG) { - if ((traj % SaveInterval) == 0) { - std::string rng; - { - std::ostringstream os; - os << rngStem << "." << traj; - rng = os.str(); - } - std::string config; - { - std::ostringstream os; - os << configStem << "." << traj; - config = os.str(); - } + BinaryHmcCheckpointer(std::string cf, std::string rn, int savemodulo, const std::string &format) + : configStem(cf), + rngStem(rn), + SaveInterval(savemodulo){}; - int prec = getPrecision::value; //get precision of oject - std::string floating_point = "IEEE64BIG"; //default precision - if (prec == 1) - floating_point = "IEEE32BIG" - - BinarySimpleUnmunger munge; - BinaryIO::writeRNGSerial(sRNG, pRNG, rng, 0); - BinaryIO::writeObjectParallel(U, config, munge, 0 ,floating_point); + void TrajectoryComplete(int traj, Field &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + if ((traj % SaveInterval) == 0) { + std::string rng; + { + std::ostringstream os; + os << rngStem << "." << traj; + rng = os.str(); + } + std::string config; + { + std::ostringstream os; + os << configStem << "." << traj; + config = os.str(); } - }; - - void CheckpointRestore(int traj, GaugeField &U, GridSerialRNG &sRNG, GridParallelRNG & pRNG ){ - - std::string rng; { std::ostringstream os; os << rngStem <<"."<< traj; rng = os.str(); } - std::string config;{ std::ostringstream os; os << configStem <<"."<< traj; config = os.str();} - - NerscField header; - NerscIO::readRNGState(sRNG,pRNG,header,rng); - NerscIO::readConfiguration(U,header,config); - }; + // Save always in double precision + BinarySimpleUnmunger munge; + BinaryIO::writeRNGSerial(sRNG, pRNG, rng, 0); + BinaryIO::writeObjectParallel(U, config, munge, 0, format); + } }; -}} + + void CheckpointRestore(int traj, Field &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + std::string rng; + { + std::ostringstream os; + os << rngStem << "." << traj; + rng = os.str(); + } + std::string config; + { + std::ostringstream os; + os << configStem << "." << traj; + config = os.str(); + } + + BinarySimpleMunger munge; + BinaryIO::readRNGSerial(sRNG, pRNG, rng, header); + BinaryIO::readObjectParallel(U, config, munge, 0, format); + }; + }; +} +} #endif diff --git a/lib/tensors/Tensor_class.h b/lib/tensors/Tensor_class.h index 473dd6b1..916fc09c 100644 --- a/lib/tensors/Tensor_class.h +++ b/lib/tensors/Tensor_class.h @@ -65,6 +65,9 @@ class iScalar { typedef iScalar::Complexified> Complexified; typedef iScalar::Realified> Realified; + // get double precision version + typedef iScalar::DoublePrecision> DoublePrecision; + enum { TensorLevel = GridTypeMapper::TensorLevel + 1 }; // Scalar no action @@ -197,6 +200,10 @@ class iVector { typedef iVector::Complexified, N> Complexified; typedef iVector::Realified, N> Realified; + // get double precision version + typedef iVector::DoublePrecision, N> DoublePrecision; + + template ::value, T>::type * = nullptr> strong_inline auto operator=(T arg) -> iVector { @@ -300,7 +307,11 @@ class iMatrix { typedef iMatrix::Complexified, N> Complexified; typedef iMatrix::Realified, N> Realified; - // Tensure removal + // get double precision version + typedef iMatrix::DoublePrecision, N> DoublePrecision; + + + // Tensor removal typedef iScalar tensor_reduced; typedef iMatrix scalar_object; diff --git a/lib/tensors/Tensor_traits.h b/lib/tensors/Tensor_traits.h index 777b398d..5191f190 100644 --- a/lib/tensors/Tensor_traits.h +++ b/lib/tensors/Tensor_traits.h @@ -57,6 +57,7 @@ namespace Grid { typedef typename T::scalar_object scalar_object; typedef typename T::Complexified Complexified; typedef typename T::Realified Realified; + typedef typename T::DoublePrecision DoublePrecision; enum { TensorLevel = T::TensorLevel }; }; @@ -71,6 +72,7 @@ namespace Grid { typedef RealF scalar_object; typedef ComplexF Complexified; typedef RealF Realified; + typedef RealD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -81,6 +83,7 @@ namespace Grid { typedef RealD scalar_object; typedef ComplexD Complexified; typedef RealD Realified; + typedef RealD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -91,6 +94,7 @@ namespace Grid { typedef ComplexF scalar_object; typedef ComplexF Complexified; typedef RealF Realified; + typedef ComplexD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -101,6 +105,7 @@ namespace Grid { typedef ComplexD scalar_object; typedef ComplexD Complexified; typedef RealD Realified; + typedef ComplexD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -111,6 +116,7 @@ namespace Grid { typedef Integer scalar_object; typedef void Complexified; typedef void Realified; + typedef void DoublePrecision; enum { TensorLevel = 0 }; }; @@ -122,6 +128,7 @@ namespace Grid { typedef RealF scalar_object; typedef vComplexF Complexified; typedef vRealF Realified; + typedef vRealD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -132,6 +139,7 @@ namespace Grid { typedef RealD scalar_object; typedef vComplexD Complexified; typedef vRealD Realified; + typedef vRealD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -142,6 +150,7 @@ namespace Grid { typedef ComplexF scalar_object; typedef vComplexF Complexified; typedef vRealF Realified; + typedef vComplexD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -152,6 +161,7 @@ namespace Grid { typedef ComplexD scalar_object; typedef vComplexD Complexified; typedef vRealD Realified; + typedef vComplexD DoublePrecision; enum { TensorLevel = 0 }; }; template<> class GridTypeMapper { @@ -162,6 +172,7 @@ namespace Grid { typedef Integer scalar_object; typedef void Complexified; typedef void Realified; + typedef void DoublePrecision; enum { TensorLevel = 0 }; }; @@ -256,8 +267,8 @@ namespace Grid { typedef typename getVectorType::type vector_obj; //get the vector_obj (i.e. a grid Tensor) if its a Lattice, do nothing otherwise (i.e. if fundamental or grid Tensor) typedef typename GridTypeMapper::scalar_type scalar_type; //get the associated scalar type. Works on fundamental and tensor types - typedef typename GridTypeMapper::Realified real_scalar_type; //remove any std::complex wrapper, should get us to the fundamental type public: + typedef typename GridTypeMapper::Realified real_scalar_type; //remove any std::complex wrapper, should get us to the fundamental type enum { value = sizeof(real_scalar_type)/sizeof(float) }; }; } diff --git a/tests/solver/Test_wilson_lanczos.cc b/tests/solver/Test_wilson_lanczos.cc new file mode 100644 index 00000000..e8549234 --- /dev/null +++ b/tests/solver/Test_wilson_lanczos.cc @@ -0,0 +1,108 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_dwf_lanczos.cc + +Copyright (C) 2015 + +Author: Peter Boyle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +typedef WilsonFermionR FermionOp; +typedef typename WilsonFermionR::FermionField FermionField; + + +RealD AllZero(RealD x) { return 0.; } + +int main(int argc, char** argv) { + Grid_init(&argc, &argv); + + GridCartesian* UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); + GridRedBlackCartesian* UrbGrid = + SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + GridCartesian* FGrid = UGrid; + GridRedBlackCartesian* FrbGrid = UrbGrid; + printf("UGrid=%p UrbGrid=%p FGrid=%p FrbGrid=%p\n", UGrid, UrbGrid, FGrid, + FrbGrid); + + std::vector seeds4({1, 2, 3, 4}); + std::vector seeds5({5, 6, 7, 8}); + GridParallelRNG RNG5(FGrid); + RNG5.SeedFixedIntegers(seeds5); + GridParallelRNG RNG4(UGrid); + RNG4.SeedFixedIntegers(seeds4); + GridParallelRNG RNG5rb(FrbGrid); + RNG5.SeedFixedIntegers(seeds5); + + LatticeGaugeField Umu(UGrid); + SU3::HotConfiguration(RNG4, Umu); + +/* + std::vector U(4, UGrid); + for (int mu = 0; mu < Nd; mu++) { + U[mu] = PeekIndex(Umu, mu); + } +*/ + + RealD mass = -0.1; + RealD M5 = 1.8; + RealD mob_b = 1.5; + FermionOp WilsonOperator(Umu,*FGrid,*FrbGrid,mass); + MdagMLinearOperator HermOp(WilsonOperator); /// <----- + //SchurDiagTwoOperator HermOp(WilsonOperator); + + const int Nstop = 20; + const int Nk = 60; + const int Np = 60; + const int Nm = Nk + Np; + const int MaxIt = 10000; + RealD resid = 1.0e-6; + + std::vector Coeffs{0, 1.}; + Polynomial PolyX(Coeffs); + Chebyshev Cheb(0.0, 10., 12); + ImplicitlyRestartedLanczos IRL(HermOp, PolyX, Nstop, Nk, Nm, + resid, MaxIt); + + std::vector eval(Nm); + FermionField src(FGrid); + gaussian(RNG5, src); + std::vector evec(Nm, FGrid); + for (int i = 0; i < 1; i++) { + std::cout << i << " / " << Nm << " grid pointer " << evec[i]._grid + << std::endl; + }; + + int Nconv; + IRL.calc(eval, evec, src, Nconv); + + std::cout << eval << std::endl; + + Grid_finalize(); +} From 11b4c80b2778b7f7fc0ad4c9aced2f32cf5ae89c Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 7 Oct 2016 13:37:29 +0100 Subject: [PATCH 063/807] Added support for hmc and binary IO for a general field --- lib/Grid.h | 2 + lib/parallelIO/BinaryIO.h | 260 +++++++++++------- lib/qcd/QCD.h | 2 +- lib/qcd/action/gauge/GaugeImpl.h | 13 + lib/qcd/hmc/BinaryCheckpointer.h | 148 ++++------ lib/qcd/hmc/GenericHMCrunner.h | 173 ++++++++++++ tests/hmc/Make.inc | 7 +- .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 99 +++++++ 8 files changed, 517 insertions(+), 187 deletions(-) create mode 100644 lib/qcd/hmc/GenericHMCrunner.h create mode 100644 tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc diff --git a/lib/Grid.h b/lib/Grid.h index 486ee4d3..d2e12d29 100644 --- a/lib/Grid.h +++ b/lib/Grid.h @@ -83,7 +83,9 @@ Author: paboyle #include #include +#include #include +#include diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 6e2bbb67..f9a8ae3c 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -159,7 +159,48 @@ class BinaryIO { csum=csum+buf[i]; } } - + + // Simple classes for precision conversion + template + struct BinarySimpleUnmunger { + typedef typename getPrecision::real_scalar_type fobj_stype; + typedef typename getPrecision::real_scalar_type sobj_stype; + + void operator()(sobj &in, fobj &out, uint32_t &csum) { + // take word by word and transform accoding to the status + fobj_stype *out_buffer = (fobj_stype *)&out; + sobj_stype *in_buffer = (sobj_stype *)∈ + size_t fobj_words = sizeof(out) / sizeof(fobj_stype); + size_t sobj_words = sizeof(in) / sizeof(sobj_stype); + assert(fobj_words == sobj_words); + + for (unsigned int word = 0; word < sobj_words; word++) + out_buffer[word] = in_buffer[word]; // type conversion on the fly + + BinaryIO::Uint32Checksum((uint32_t *)&out, sizeof(out), csum); + } + }; + + template + struct BinarySimpleMunger { + typedef typename getPrecision::real_scalar_type fobj_stype; + typedef typename getPrecision::real_scalar_type sobj_stype; + + void operator()(fobj &in, sobj &out, uint32_t &csum) { + // take word by word and transform accoding to the status + fobj_stype *in_buffer = (fobj_stype *)∈ + sobj_stype *out_buffer = (sobj_stype *)&out; + size_t fobj_words = sizeof(in) / sizeof(fobj_stype); + size_t sobj_words = sizeof(out) / sizeof(sobj_stype); + assert(fobj_words == sobj_words); + + for (unsigned int word = 0; word < sobj_words; word++) + out_buffer[word] = in_buffer[word]; // type conversion on the fly + + BinaryIO::Uint32Checksum((uint32_t *)&in, sizeof(in), csum); + } + }; + template static inline uint32_t readObjectSerial(Lattice &Umu,std::string file,munger munge,int offset,const std::string &format) { @@ -272,58 +313,65 @@ class BinaryIO { return csum; } - static inline uint32_t writeRNGSerial(GridSerialRNG &serial,GridParallelRNG ¶llel,std::string file,int offset) - { + static inline uint32_t writeRNGSerial(GridSerialRNG &serial, + GridParallelRNG ¶llel, + std::string file, int offset) { typedef typename GridSerialRNG::RngStateType RngStateType; const int RngStateCount = GridSerialRNG::RngStateCount; - GridBase *grid = parallel._grid; int gsites = grid->_gsites; ////////////////////////////////////////////////// // Serialise through node zero ////////////////////////////////////////////////// - std::cout<< GridLogMessage<< "Serial RNG write I/O "<< file<IsBoss() ) { - fout.open(file,std::ios::binary|std::ios::out|std::ios::in); + if (grid->IsBoss()) { + fout.open(file, std::ios::binary | std::ios::out | std::ios::in); + if (!fout.is_open()) { + std::cout << GridLogMessage << "writeRNGSerial: Error opening file " + << file << std::endl; + exit(0); + } fout.seekp(offset); } - - uint32_t csum=0; + + std::cout << GridLogMessage << "Serial RNG write I/O " << file << std::endl; + uint32_t csum = 0; std::vector saved(RngStateCount); - int bytes = sizeof(RngStateType)*saved.size(); + int bytes = sizeof(RngStateType) * saved.size(); std::vector gcoor; - for(int gidx=0;gidxGlobalIndexToGlobalCoor(gidx, gcoor); + grid->GlobalCoorToRankIndex(rank, o_idx, i_idx, gcoor); + int l_idx = parallel.generator_idx(o_idx, i_idx); - int rank,o_idx,i_idx; - grid->GlobalIndexToGlobalCoor(gidx,gcoor); - grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); - int l_idx=parallel.generator_idx(o_idx,i_idx); - - if( rank == grid->ThisRank() ){ - // std::cout << "rank" << rank<<" Getting state for index "<ThisRank()) { + // std::cout << "rank" << rank<<" Getting state for index + // "<Broadcast(rank,(void *)&saved[0],bytes); + grid->Broadcast(rank, (void *)&saved[0], bytes); - if ( grid->IsBoss() ) { - Uint32Checksum((uint32_t *)&saved[0],bytes,csum); - fout.write((char *)&saved[0],bytes); + if (grid->IsBoss()) { + Uint32Checksum((uint32_t *)&saved[0], bytes, csum); + fout.write((char *)&saved[0], bytes); } - } - if ( grid->IsBoss() ) { - serial.GetState(saved,0); - Uint32Checksum((uint32_t *)&saved[0],bytes,csum); - fout.write((char *)&saved[0],bytes); + if (grid->IsBoss()) { + serial.GetState(saved, 0); + Uint32Checksum((uint32_t *)&saved[0], bytes, csum); + fout.write((char *)&saved[0], bytes); } - grid->Broadcast(0,(void *)&csum,sizeof(csum)); + grid->Broadcast(0, (void *)&csum, sizeof(csum)); + + if (grid->IsBoss()) + fout.close(); + return csum; } static inline uint32_t readRNGSerial(GridSerialRNG &serial,GridParallelRNG ¶llel,std::string file,int offset) @@ -528,30 +576,35 @@ class BinaryIO { ////////////////////////////////////////////////////////// // Parallel writer ////////////////////////////////////////////////////////// - template - static inline uint32_t writeObjectParallel(Lattice &Umu,std::string file,munger munge,int offset,const std::string & format) - { + template + static inline uint32_t writeObjectParallel(Lattice &Umu, + std::string file, munger munge, + int offset, + const std::string &format) { typedef typename vobj::scalar_object sobj; GridBase *grid = Umu._grid; int ieee32big = (format == std::string("IEEE32BIG")); - int ieee32 = (format == std::string("IEEE32")); + int ieee32 = (format == std::string("IEEE32")); int ieee64big = (format == std::string("IEEE64BIG")); - int ieee64 = (format == std::string("IEEE64")); + int ieee64 = (format == std::string("IEEE64")); - if(!(ieee32big || ieee32 || ieee64big || ieee64)){ - std::cout << GridLogError << "Unrecognized file format " << format << std::endl; - std::cout << GridLogError << "Allowed: IEEE32BIG | IEEE32 | IEEE64BIG | IEEE64" << std::endl; + if (!(ieee32big || ieee32 || ieee64big || ieee64)) { + std::cout << GridLogError << "Unrecognized file format " << format + << std::endl; + std::cout << GridLogError + << "Allowed: IEEE32BIG | IEEE32 | IEEE64BIG | IEEE64" + << std::endl; exit(0); } int nd = grid->_ndimension; - for(int d=0;dCheckerBoarded(d) == 0); } - std::vector parallel(nd,1); - std::vector ioproc (nd); + std::vector parallel(nd, 1); + std::vector ioproc(nd); std::vector start(nd); std::vector range(nd); @@ -559,39 +612,39 @@ class BinaryIO { int IOnode = 1; - for(int d=0;d_ndimension;d++) { - - if ( d!= grid->_ndimension-1 ) parallel[d] = 0; + for (int d = 0; d < grid->_ndimension; d++) { + if (d != grid->_ndimension - 1) parallel[d] = 0; if (parallel[d]) { - range[d] = grid->_ldimensions[d]; - start[d] = grid->_processor_coor[d]*range[d]; - ioproc[d]= grid->_processor_coor[d]; + range[d] = grid->_ldimensions[d]; + start[d] = grid->_processor_coor[d] * range[d]; + ioproc[d] = grid->_processor_coor[d]; } else { - range[d] = grid->_gdimensions[d]; - start[d] = 0; - ioproc[d]= 0; + range[d] = grid->_gdimensions[d]; + start[d] = 0; + ioproc[d] = 0; - if ( grid->_processor_coor[d] != 0 ) IOnode = 0; + if (grid->_processor_coor[d] != 0) IOnode = 0; } slice_vol = slice_vol * range[d]; } - + { uint32_t tmp = IOnode; grid->GlobalSum(tmp); - std::cout<< GridLogMessage<< "Parallel write I/O from "<< file << " with " <_ndimension;d++){ - std::cout<< range[d]; - if( d< grid->_ndimension-1 ) - std::cout<< " x "; + std::cout << GridLogMessage << "Parallel write I/O from " << file + << " with " << tmp << " IOnodes for subslice "; + for (int d = 0; d < grid->_ndimension; d++) { + std::cout << range[d]; + if (d < grid->_ndimension - 1) std::cout << " x "; } std::cout << std::endl; } - GridStopWatch timer; timer.Start(); - uint64_t bytes=0; + GridStopWatch timer; + timer.Start(); + uint64_t bytes = 0; int myrank = grid->ThisRank(); int iorank = grid->RankFromProcessorCoor(ioproc); @@ -601,71 +654,79 @@ class BinaryIO { // Ideally one reader/writer per xy plane and read these contiguously // with comms from nominated I/O nodes. std::ofstream fout; - if ( IOnode ) fout.open(file,std::ios::binary|std::ios::in|std::ios::out); + if (IOnode){ + fout.open(file, std::ios::binary | std::ios::in | std::ios::out); + if (!fout.is_open()) { + std::cout << GridLogMessage << "writeObjectParallel: Error opening file " << file + << std::endl; + exit(0); + } + } ////////////////////////////////////////////////////////// // Find the location of each site and send to primary node - // Take loop order from Chroma; defines loop order now that NERSC doc no longer + // Take loop order from Chroma; defines loop order now that NERSC doc no + // longer // available (how short sighted is that?) ////////////////////////////////////////////////////////// - uint32_t csum=0; + uint32_t csum = 0; fobj fileObj; - static sobj siteObj; // static for SHMEM target; otherwise dynamic allocate with AlignedAllocator + static sobj siteObj; // static for SHMEM target; otherwise dynamic allocate + // with AlignedAllocator // should aggregate a whole chunk and then write. - // need to implement these loops in Nd independent way with a lexico conversion - for(int tlex=0;tlex tsite(nd); // temporary mixed up site + // need to implement these loops in Nd independent way with a lexico + // conversion + for (int tlex = 0; tlex < slice_vol; tlex++) { + std::vector tsite(nd); // temporary mixed up site std::vector gsite(nd); std::vector lsite(nd); std::vector iosite(nd); - Lexicographic::CoorFromIndex(tsite,tlex,range); + Lexicographic::CoorFromIndex(tsite, tlex, range); - for(int d=0;d_ldimensions[d]; // local site - gsite[d] = tsite[d]+start[d]; // global site + for (int d = 0; d < nd; d++) { + lsite[d] = tsite[d] % grid->_ldimensions[d]; // local site + gsite[d] = tsite[d] + start[d]; // global site } - ///////////////////////// // Get the rank of owner of data ///////////////////////// - int rank, o_idx,i_idx, g_idx; - grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gsite); - grid->GlobalCoorToGlobalIndex(gsite,g_idx); + int rank, o_idx, i_idx, g_idx; + grid->GlobalCoorToRankIndex(rank, o_idx, i_idx, gsite); + grid->GlobalCoorToGlobalIndex(gsite, g_idx); //////////////////////////////// // iorank writes from the seek //////////////////////////////// - + // Owner of data peeks it - peekLocalSite(siteObj,Umu,lsite); + peekLocalSite(siteObj, Umu, lsite); // Pair of nodes may need to do pt2pt send - if ( rank != iorank ) { // comms is necessary - if ( (myrank == rank) || (myrank==iorank) ) { // and we have to do it - // Send to IOrank - grid->SendRecvPacket((void *)&siteObj,(void *)&siteObj,rank,iorank,sizeof(siteObj)); - } + if (rank != iorank) { // comms is necessary + if ((myrank == rank) || (myrank == iorank)) { // and we have to do it + // Send to IOrank + grid->SendRecvPacket((void *)&siteObj, (void *)&siteObj, rank, iorank, + sizeof(siteObj)); + } } - grid->Barrier(); // necessary? + grid->Barrier(); // necessary? if (myrank == iorank) { - - munge(siteObj,fileObj,csum); + munge(siteObj, fileObj, csum); - if(ieee32big) htobe32_v((void *)&fileObj,sizeof(fileObj)); - if(ieee32) htole32_v((void *)&fileObj,sizeof(fileObj)); - if(ieee64big) htobe64_v((void *)&fileObj,sizeof(fileObj)); - if(ieee64) htole64_v((void *)&fileObj,sizeof(fileObj)); - - fout.seekp(offset+g_idx*sizeof(fileObj)); - fout.write((char *)&fileObj,sizeof(fileObj)); - bytes+=sizeof(fileObj); + if (ieee32big) htobe32_v((void *)&fileObj, sizeof(fileObj)); + if (ieee32) htole32_v((void *)&fileObj, sizeof(fileObj)); + if (ieee64big) htobe64_v((void *)&fileObj, sizeof(fileObj)); + if (ieee64) htole64_v((void *)&fileObj, sizeof(fileObj)); + + fout.seekp(offset + g_idx * sizeof(fileObj)); + fout.write((char *)&fileObj, sizeof(fileObj)); + bytes += sizeof(fileObj); } } @@ -673,14 +734,19 @@ class BinaryIO { grid->GlobalSum(bytes); timer.Stop(); - std::cout<Barrier(); // necessary? + if (IOnode) + fout.close(); return csum; } - }; - } #endif diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index f434bdd9..829752c7 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -45,7 +45,7 @@ namespace QCD { static const int Zm = 6; static const int Tm = 7; - static const int Nc=3; + static const int Nc=2; static const int Ns=4; static const int Nd=4; static const int Nhs=2; // half spinor diff --git a/lib/qcd/action/gauge/GaugeImpl.h b/lib/qcd/action/gauge/GaugeImpl.h index 5ef9f107..5423dcbb 100644 --- a/lib/qcd/action/gauge/GaugeImpl.h +++ b/lib/qcd/action/gauge/GaugeImpl.h @@ -75,6 +75,8 @@ public: } } + /////////////////////////////////////////////////////////// + // Move these to another class // HMC auxiliary functions static inline void generate_momenta(Field& P, GridParallelRNG& pRNG){ // specific for SU gauge fields @@ -108,6 +110,17 @@ public: return Hsum.real(); } + static inline void HotConfiguration(GridParallelRNG &pRNG, Field &U) { + SU::HotConfiguration(pRNG, U); + } + + static inline void TepidConfiguration(GridParallelRNG &pRNG, Field &U) { + SU::TepidConfiguration(pRNG, U); + } + + static inline void ColdConfiguration(GridParallelRNG &pRNG, Field &U) { + SU::ColdConfiguration(pRNG, U); + } }; // Composition with smeared link, bc's etc.. probably need multiple inheritance diff --git a/lib/qcd/hmc/BinaryCheckpointer.h b/lib/qcd/hmc/BinaryCheckpointer.h index 1e992dec..8c96f85b 100644 --- a/lib/qcd/hmc/BinaryCheckpointer.h +++ b/lib/qcd/hmc/BinaryCheckpointer.h @@ -36,93 +36,36 @@ directory namespace Grid { namespace QCD { -template -struct BinarySimpleUnmunger { - typedef typename getPrecision::real_scalar_type fobj_stype; +// Simple checkpointer, only binary file +template +class BinaryHmcCheckpointer : public HmcObservable { + private: + std::string configStem; + std::string rngStem; + int SaveInterval; + std::string format; + + public: + INHERIT_FIELD_TYPES(Impl); // Gets the Field type, a Lattice object + + // Extract types from the Field + typedef typename Field::vector_object vobj; + typedef typename vobj::scalar_object sobj; typedef typename getPrecision::real_scalar_type sobj_stype; + typedef typename sobj::DoublePrecision sobj_double; - void operator()(sobj &in, fobj &out, uint32_t &csum) { - // take word by word and transform accoding to the status - fobj_stype* out_buffer = (fobj_stype*)&out; - sobj_stype* in_buffer = (sobj_stype*)∈ - size_t fobj_words = sizeof(out)/sizeof(fobj_stype); - size_t sobj_words = sizeof(in)/sizeof(sobj_stype); - assert(fobj_words == sobj_words); + BinaryHmcCheckpointer(std::string cf, std::string rn, int savemodulo, + const std::string &f) + : configStem(cf), rngStem(rn), SaveInterval(savemodulo), format(f){}; - for (unsigned int word = 0; word < sobj_words; word++) - out_buffer[word] = in_buffer[word]; // type conversion on the fly + void truncate(std::string file) { + std::ofstream fout(file, std::ios::out); + fout.close(); + } - BinaryIO::Uint32Checksum((uint32_t*)&out,sizeof(out),csum); - - }; - -template -struct BinarySimpleMunger { - typedef typename getPrecision::real_scalar_type fobj_stype; - typedef typename getPrecision::real_scalar_type sobj_stype; - - void operator()(sobj &out, fobj &in, uint32_t &csum) { - // take word by word and transform accoding to the status - fobj_stype* in_buffer = (fobj_stype*)∈ - sobj_stype* out_buffer = (sobj_stype*)&out; - size_t fobj_words = sizeof(in)/sizeof(fobj_stype); - size_t sobj_words = sizeof(out)/sizeof(sobj_stype); - assert(fobj_words == sobj_words); - - for (unsigned int word = 0; word < sobj_words; word++) - out_buffer[word] = in_buffer[word]; // type conversion on the fly - - BinaryIO::Uint32Checksum((uint32_t*)&in,sizeof(in),csum); - - }; - - - // Only for the main field in the hmc - template - class BinaryHmcCheckpointer : public HmcObservable { - private: - std::string configStem; - std::string rngStem; - int SaveInterval; - - public: - INHERIT_FIELD_TYPES(Impl); // The Field is a Lattice object - - typedef typename Field::vector_object vobj; - typedef typename vobj::scalar_object sobj; - typedef typename getPrecision::real_scalar_type sobj_stype; - typedef typename sobj::DoublePrecision sobj_double; - - BinaryHmcCheckpointer(std::string cf, std::string rn, int savemodulo, const std::string &format) - : configStem(cf), - rngStem(rn), - SaveInterval(savemodulo){}; - - void TrajectoryComplete(int traj, Field &U, GridSerialRNG &sRNG, - GridParallelRNG &pRNG) { - if ((traj % SaveInterval) == 0) { - std::string rng; - { - std::ostringstream os; - os << rngStem << "." << traj; - rng = os.str(); - } - std::string config; - { - std::ostringstream os; - os << configStem << "." << traj; - config = os.str(); - } - - // Save always in double precision - BinarySimpleUnmunger munge; - BinaryIO::writeRNGSerial(sRNG, pRNG, rng, 0); - BinaryIO::writeObjectParallel(U, config, munge, 0, format); - } - }; - - void CheckpointRestore(int traj, Field &U, GridSerialRNG &sRNG, - GridParallelRNG &pRNG) { + void TrajectoryComplete(int traj, Field &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + if ((traj % SaveInterval) == 0) { std::string rng; { std::ostringstream os; @@ -136,11 +79,42 @@ struct BinarySimpleMunger { config = os.str(); } - BinarySimpleMunger munge; - BinaryIO::readRNGSerial(sRNG, pRNG, rng, header); - BinaryIO::readObjectParallel(U, config, munge, 0, format); - }; + BinaryIO::BinarySimpleUnmunger munge; + truncate(rng); + BinaryIO::writeRNGSerial(sRNG, pRNG, rng, 0); + truncate(config); + uint32_t csum = BinaryIO::writeObjectParallel( + U, config, munge, 0, format); + + std::cout << GridLogMessage << "Written Binary Configuration " << config + << " checksum " << std::hex << csum << std::dec << std::endl; + } }; + + void CheckpointRestore(int traj, Field &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + std::string rng; + { + std::ostringstream os; + os << rngStem << "." << traj; + rng = os.str(); + } + std::string config; + { + std::ostringstream os; + os << configStem << "." << traj; + config = os.str(); + } + + BinaryIO::BinarySimpleMunger munge; + BinaryIO::readRNGSerial(sRNG, pRNG, rng, 0); + uint32_t csum = BinaryIO::readObjectParallel( + U, config, munge, 0, format); + + std::cout << GridLogMessage << "Read Binary Configuration " << config + << " checksum " << std::hex << csum << std::dec << std::endl; + }; +}; } } #endif diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h new file mode 100644 index 00000000..299bff37 --- /dev/null +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -0,0 +1,173 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./lib/qcd/hmc/GenericHmcRunner.h + +Copyright (C) 2015 + +Author: paboyle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#ifndef GENERIC_HMC_RUNNER +#define GENERIC_HMC_RUNNER + +namespace Grid { +namespace QCD { + +// Virtual Class for HMC specific for gauge theories +// implement a specific theory by defining the BuildTheAction +template +class BinaryHmcRunnerTemplate { + public: + INHERIT_FIELD_TYPES(Implementation); + + enum StartType_t { ColdStart, HotStart, TepidStart, CheckpointStart }; + + ActionSet TheAction; + // Add here a vector of HmcObservable + // that can be injected from outside + + GridCartesian *UGrid; + GridCartesian *FGrid; + GridRedBlackCartesian *UrbGrid; + GridRedBlackCartesian *FrbGrid; + + virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? + + void Run(int argc, char **argv) { + StartType_t StartType = HotStart; + + std::string arg; + + if (GridCmdOptionExists(argv, argv + argc, "--StartType")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--StartType"); + if (arg == "HotStart") { + StartType = HotStart; + } else if (arg == "ColdStart") { + StartType = ColdStart; + } else if (arg == "TepidStart") { + StartType = TepidStart; + } else if (arg == "CheckpointStart") { + StartType = CheckpointStart; + } else { + std::cout << GridLogError << "Unrecognized option in --StartType\n"; + std::cout + << GridLogError + << "Valid [HotStart, ColdStart, TepidStart, CheckpointStart]\n"; + assert(0); + } + } + + int StartTraj = 0; + if (GridCmdOptionExists(argv, argv + argc, "--StartTrajectory")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--StartTrajectory"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + StartTraj = ivec[0]; + } + + int NumTraj = 1; + if (GridCmdOptionExists(argv, argv + argc, "--Trajectories")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--Trajectories"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + NumTraj = ivec[0]; + } + + int NumThermalizations = 10; + if (GridCmdOptionExists(argv, argv + argc, "--Thermalizations")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--Thermalizations"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + NumThermalizations = ivec[0]; + } + + GridSerialRNG sRNG; + GridParallelRNG pRNG(UGrid); + Field U(UGrid); + + std::vector SerSeed({1, 2, 3, 4, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); + + NoSmearing SmearingPolicy; + typedef MinimumNorm2, + RepresentationsPolicy> + IntegratorType; // change here to change the algorithm + IntegratorParameters MDpar(20, 1.0); + IntegratorType MDynamics(UGrid, MDpar, TheAction, SmearingPolicy); + + // Checkpoint strategy + int SaveInterval = 1; + std::string format = std::string("IEEE64BIG"); + std::string conf_prefix = std::string("ckpoint_lat"); + std::string rng_prefix = std::string("ckpoint_rng"); + BinaryHmcCheckpointer Checkpoint(conf_prefix, rng_prefix, + SaveInterval, format); + + HMCparameters HMCpar; + HMCpar.StartTrajectory = StartTraj; + HMCpar.Trajectories = NumTraj; + HMCpar.NoMetropolisUntil = NumThermalizations; + + if (StartType == HotStart) { + // Hot start + HMCpar.MetropolisTest = true; + sRNG.SeedFixedIntegers(SerSeed); + pRNG.SeedFixedIntegers(ParSeed); + Implementation::HotConfiguration(pRNG, U); + } else if (StartType == ColdStart) { + // Cold start + HMCpar.MetropolisTest = true; + sRNG.SeedFixedIntegers(SerSeed); + pRNG.SeedFixedIntegers(ParSeed); + Implementation::ColdConfiguration(pRNG, U); + } else if (StartType == TepidStart) { + // Tepid start + HMCpar.MetropolisTest = true; + sRNG.SeedFixedIntegers(SerSeed); + pRNG.SeedFixedIntegers(ParSeed); + Implementation::TepidConfiguration(pRNG, U); + } else if (StartType == CheckpointStart) { + HMCpar.MetropolisTest = true; + // CheckpointRestart + Checkpoint.CheckpointRestore(StartTraj, U, sRNG, pRNG); + } + + SmearingPolicy.set_Field(U); + + HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); + HMC.AddObservable(&Checkpoint); + + // Run it + HMC.evolve(); + } +}; + +typedef BinaryHmcRunnerTemplate BinaryHmcRunner; +typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; +typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; + +template +using BinaryHmcRunnerTemplateHirep = + BinaryHmcRunnerTemplate; +} +} +#endif diff --git a/tests/hmc/Make.inc b/tests/hmc/Make.inc index f6f9c6b5..4fa49710 100644 --- a/tests/hmc/Make.inc +++ b/tests/hmc/Make.inc @@ -1,5 +1,5 @@ -tests: Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio -EXTRA_PROGRAMS = Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +tests: Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +EXTRA_PROGRAMS = Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio Test_hmc_EODWFRatio_SOURCES=Test_hmc_EODWFRatio.cc Test_hmc_EODWFRatio_LDADD=-lGrid @@ -28,6 +28,9 @@ Test_hmc_RectGauge_LDADD=-lGrid Test_hmc_WilsonAdjointFermionGauge_SOURCES=Test_hmc_WilsonAdjointFermionGauge.cc Test_hmc_WilsonAdjointFermionGauge_LDADD=-lGrid +Test_hmc_WilsonFermionGauge_Binary_SOURCES=Test_hmc_WilsonFermionGauge_Binary.cc +Test_hmc_WilsonFermionGauge_Binary_LDADD=-lGrid + Test_hmc_WilsonFermionGauge_SOURCES=Test_hmc_WilsonFermionGauge.cc Test_hmc_WilsonFermionGauge_LDADD=-lGrid diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc new file mode 100644 index 00000000..5161617c --- /dev/null +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -0,0 +1,99 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_hmc_WilsonFermionGauge.cc + +Copyright (C) 2015 + +Author: Peter Boyle +Author: Peter Boyle +Author: neo +Author: paboyle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +namespace Grid { +namespace QCD { + +class HmcRunner : public BinaryHmcRunner { + public: + void BuildTheAction(int argc, char **argv) + + { + typedef WilsonImplR ImplPolicy; + typedef WilsonFermionR FermionAction; + typedef typename FermionAction::FermionField FermionField; + + UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); + UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + FGrid = UGrid; + FrbGrid = UrbGrid; + + // temporarily need a gauge field + LatticeGaugeField U(UGrid); + + // Gauge action + WilsonGaugeActionR Waction(5.6); + + Real mass = -0.77; + FermionAction FermOp(U, *FGrid, *FrbGrid, mass); + + ConjugateGradient CG(1.0e-8, 10000); + + TwoFlavourPseudoFermionAction Nf2(FermOp, CG, CG); + + // Set smearing (true/false), default: false + Nf2.is_smeared = true; + + // Collect actions + ActionLevel Level1(1); + Level1.push_back(&Nf2); + + ActionLevel Level2(4); + Level2.push_back(&Waction); + + TheAction.push_back(Level1); + TheAction.push_back(Level2); + + Run(argc, argv); + }; +}; +} +} + +int main(int argc, char **argv) { + Grid_init(&argc, &argv); + + int threads = GridThread::GetThreads(); + std::cout << GridLogMessage << "Grid is setup to use " << threads + << " threads" << std::endl; + + HmcRunner TheHMC; + + TheHMC.BuildTheAction(argc, argv); +} From 6eb873dd96b8b4fe3d00191282309148108a5fe8 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 7 Oct 2016 17:28:46 +0100 Subject: [PATCH 064/807] Added scalar action phi^4 Check Norm2 output (Complex type assumption) --- lib/qcd/QCD.h | 3 + lib/qcd/action/ActionBase.h | 16 +--- lib/qcd/action/Actions.h | 12 +++ lib/qcd/action/gauge/GaugeImpl.h | 8 +- lib/qcd/action/scalar/ScalarAction.h | 77 +++++++++++++++ lib/qcd/action/scalar/scalarImpl.h | 56 +++++++++++ lib/qcd/hmc/GenericHMCrunner.h | 23 ++++- lib/qcd/hmc/NerscCheckpointer.h | 7 +- lib/qcd/hmc/integrators/Integrator.h | 5 +- lib/qcd/representations/fundamental.h | 13 +++ lib/qcd/representations/hmc_types.h | 11 ++- lib/qcd/smearing/GaugeConfiguration.h | 19 ++-- lib/qcd/utils/ScalarObjs.h | 96 +++++++++++++++++++ tests/hmc/Make.inc | 7 +- tests/hmc/Test_hmc_ScalarAction.cc | 77 +++++++++++++++ .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 9 +- 16 files changed, 401 insertions(+), 38 deletions(-) create mode 100644 lib/qcd/action/scalar/ScalarAction.h create mode 100644 lib/qcd/action/scalar/scalarImpl.h create mode 100644 lib/qcd/utils/ScalarObjs.h create mode 100644 tests/hmc/Test_hmc_ScalarAction.cc diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index 829752c7..fc95490a 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -506,6 +506,9 @@ namespace QCD { #include #include +// Scalar field +#include + #include #include diff --git a/lib/qcd/action/ActionBase.h b/lib/qcd/action/ActionBase.h index 56d6b8e0..7911462e 100644 --- a/lib/qcd/action/ActionBase.h +++ b/lib/qcd/action/ActionBase.h @@ -81,13 +81,13 @@ struct ActionLevel { }; */ -template +template struct ActionLevel { public: unsigned int multiplier; // Fundamental repr actions separated because of the smearing - typedef Action* ActPtr; + typedef Action* ActPtr; // construct a tuple of vectors of the actions for the corresponding higher // representation fields @@ -97,9 +97,6 @@ struct ActionLevel { std::vector& actions; - // Temporary conversion between ActionLevel and ActionLevelHirep - //ActionLevelHirep(ActionLevel& AL ):actions(AL.actions), multiplier(AL.multiplier){} - ActionLevel(unsigned int mul = 1) : actions(std::get<0>(actions_hirep)), multiplier(mul) { // initialize the hirep vectors to zero. //apply(this->resize, actions_hirep, 0); //need a working resize @@ -110,10 +107,10 @@ struct ActionLevel { - template < class Field > - void push_back(Action* ptr) { + template < class GenField > + void push_back(Action* ptr) { // insert only in the correct vector - std::get< Index < Field, action_hirep_types>::value >(actions_hirep).push_back(ptr); + std::get< Index < GenField, action_hirep_types>::value >(actions_hirep).push_back(ptr); }; @@ -142,9 +139,6 @@ struct ActionLevel { }; -//template -//using ActionSet = std::vector >; - template using ActionSet = std::vector >; diff --git a/lib/qcd/action/Actions.h b/lib/qcd/action/Actions.h index ba6e577d..e45f2e0c 100644 --- a/lib/qcd/action/Actions.h +++ b/lib/qcd/action/Actions.h @@ -60,6 +60,12 @@ Author: paboyle #include #include +//////////////////////////////////////////// +// Scalar Actions +//////////////////////////////////////////// +#include +#include + namespace Grid { namespace QCD { @@ -90,6 +96,12 @@ typedef SymanzikGaugeAction ConjugateSymanzikGaugeAction typedef SymanzikGaugeAction ConjugateSymanzikGaugeActionF; typedef SymanzikGaugeAction ConjugateSymanzikGaugeActionD; + + typedef ScalarAction ScalarActionR; + typedef ScalarAction ScalarActionF; + typedef ScalarAction ScalarActionD; + + }} //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/lib/qcd/action/gauge/GaugeImpl.h b/lib/qcd/action/gauge/GaugeImpl.h index 5423dcbb..08fbfa68 100644 --- a/lib/qcd/action/gauge/GaugeImpl.h +++ b/lib/qcd/action/gauge/GaugeImpl.h @@ -47,6 +47,8 @@ template class WilsonLoops; typedef typename GImpl::SiteLink SiteGaugeLink; #define INHERIT_FIELD_TYPES(Impl) \ + typedef typename Impl::Simd Simd; \ + typedef typename Impl::SiteField SiteField; \ typedef typename Impl::Field Field; // hard codes the exponential approximation in the template @@ -88,7 +90,9 @@ public: } } - + static inline Field projectForce(Field& P){ + return Ta(P); + } static inline void update_field(Field& P, Field& U, double ep){ for (int mu = 0; mu < Nd; mu++) { @@ -117,7 +121,7 @@ public: static inline void TepidConfiguration(GridParallelRNG &pRNG, Field &U) { SU::TepidConfiguration(pRNG, U); } - + static inline void ColdConfiguration(GridParallelRNG &pRNG, Field &U) { SU::ColdConfiguration(pRNG, U); } diff --git a/lib/qcd/action/scalar/ScalarAction.h b/lib/qcd/action/scalar/ScalarAction.h new file mode 100644 index 00000000..048cde8d --- /dev/null +++ b/lib/qcd/action/scalar/ScalarAction.h @@ -0,0 +1,77 @@ +/************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/qcd/action/gauge/WilsonGaugeAction.h + + Copyright (C) 2015 + +Author: Azusa Yamaguchi +Author: Peter Boyle +Author: neo +Author: paboyle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution +directory + *************************************************************************************/ +/* END LEGAL */ +#ifndef SCALAR_ACTION_H +#define SCALAR_ACTION_H + +namespace Grid { +namespace QCD { + +//////////////////////////////////////////////////////////////////////// +// Wilson Gauge Action .. should I template the Nc etc.. +//////////////////////////////////////////////////////////////////////// + +template +class ScalarAction : public Action { + public: + INHERIT_FIELD_TYPES(Impl); + + private: + RealD mass_square; + RealD lambda; + + public: + ScalarAction(RealD ms, RealD l) : mass_square(ms), lambda(l){}; + + virtual void refresh(const Field &U, + GridParallelRNG &pRNG){}; // noop as no pseudoferms + + virtual RealD S(const Field &p) { + return (mass_square * 0.5 + Nd) * ScalarObs::sumphisquared(p) + + (lambda / 24.) * ScalarObs::sumphifourth(p) + + ScalarObs::sumphider(p); + }; + + virtual void deriv(const Field &p, + Field &force) { + Field tmp(p._grid); + Field p2(p._grid); + ScalarObs::phisquared(p2, p); + tmp = -(Cshift(p, 0, -1) + Cshift(p, 0, 1)); + for (int mu = 1; mu < Nd; mu++) tmp -= Cshift(p, mu, -1) + Cshift(p, mu, 1); + + force=+(mass_square + 2. * Nd) * p + (lambda / 6.) * p2 * p + tmp; + }; +}; +} +} + +#endif \ No newline at end of file diff --git a/lib/qcd/action/scalar/scalarImpl.h b/lib/qcd/action/scalar/scalarImpl.h new file mode 100644 index 00000000..f3a7932d --- /dev/null +++ b/lib/qcd/action/scalar/scalarImpl.h @@ -0,0 +1,56 @@ +#ifndef SCALAR_IMPL +#define SCALAR_IMPL + + +namespace Grid { +namespace QCD { + +template +class ScalarImplTypes { + public: + typedef S Simd; + + template + using iImplField = iScalar > >; + + typedef iImplField SiteField; + + + typedef Lattice Field; + + static inline void generate_momenta(Field& P, GridParallelRNG& pRNG){ + gaussian(pRNG, P); + } + + static inline Field projectForce(Field& P){return P;} + + static inline void update_field(Field& P, Field& U, double ep){ + U += P*ep; + } + + static inline RealD FieldSquareNorm(Field& U){ + return (- sum(trace(U*U))/2.0); + } + + static inline void HotConfiguration(GridParallelRNG &pRNG, Field &U) { + gaussian(pRNG, U); + } + + static inline void TepidConfiguration(GridParallelRNG &pRNG, Field &U) { + gaussian(pRNG, U); + } + + static inline void ColdConfiguration(GridParallelRNG &pRNG, Field &U) { + U = 1.0; + } + +}; + + +typedef ScalarImplTypes ScalarImplR; +typedef ScalarImplTypes ScalarImplF; +typedef ScalarImplTypes ScalarImplD; + +}} + +#endif \ No newline at end of file diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index 299bff37..a7eb8016 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -34,16 +34,21 @@ namespace QCD { // Virtual Class for HMC specific for gauge theories // implement a specific theory by defining the BuildTheAction -template +template , + class RepresentationsPolicy = NoHirep> class BinaryHmcRunnerTemplate { public: INHERIT_FIELD_TYPES(Implementation); + typedef Implementation ImplPolicy; enum StartType_t { ColdStart, HotStart, TepidStart, CheckpointStart }; ActionSet TheAction; // Add here a vector of HmcObservable // that can be injected from outside + std::vector< HmcObservable > ObservablesList; + GridCartesian *UGrid; GridCartesian *FGrid; @@ -119,8 +124,7 @@ class BinaryHmcRunnerTemplate { std::string format = std::string("IEEE64BIG"); std::string conf_prefix = std::string("ckpoint_lat"); std::string rng_prefix = std::string("ckpoint_rng"); - BinaryHmcCheckpointer Checkpoint(conf_prefix, rng_prefix, - SaveInterval, format); + IOCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); HMCparameters HMCpar; HMCpar.StartTrajectory = StartTraj; @@ -154,20 +158,31 @@ class BinaryHmcRunnerTemplate { SmearingPolicy.set_Field(U); HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); - HMC.AddObservable(&Checkpoint); + //HMC.AddObservable(&Checkpoint); + + for (int obs = 0; obs < ObservablesList.size(); obs++) + HMC.AddObservable(&ObservablesList[obs]); // Run it HMC.evolve(); } }; +// These are for gauge fields typedef BinaryHmcRunnerTemplate BinaryHmcRunner; typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; +typedef BinaryHmcRunnerTemplate > NerscTestHmcRunner; + + template using BinaryHmcRunnerTemplateHirep = BinaryHmcRunnerTemplate; + + + +typedef BinaryHmcRunnerTemplate, ScalarFields> ScalarBinaryHmcRunner; } } #endif diff --git a/lib/qcd/hmc/NerscCheckpointer.h b/lib/qcd/hmc/NerscCheckpointer.h index 6701740b..fca4cd47 100644 --- a/lib/qcd/hmc/NerscCheckpointer.h +++ b/lib/qcd/hmc/NerscCheckpointer.h @@ -36,7 +36,7 @@ Author: paboyle namespace Grid{ namespace QCD{ - // Only for gauge fields + // Only for Gauge fields template class NerscHmcCheckpointer : public HmcObservable { private: @@ -44,12 +44,13 @@ namespace Grid{ std::string rngStem; int SaveInterval; public: - INHERIT_GIMPL_TYPES(Gimpl); + INHERIT_GIMPL_TYPES(Gimpl);// - NerscHmcCheckpointer(std::string cf, std::string rn,int savemodulo) { + NerscHmcCheckpointer(std::string cf, std::string rn,int savemodulo, std::string format = "") { configStem = cf; rngStem = rn; SaveInterval= savemodulo; + // format is fixed to IEEE64BIG for NERSC }; void TrajectoryComplete(int traj, GaugeField &U, GridSerialRNG &sRNG, GridParallelRNG & pRNG ) diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index 735863a0..d37d9271 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -128,7 +128,7 @@ class Integrator { << "Smearing (on/off): " << as[level].actions.at(a)->is_smeared << std::endl; if (as[level].actions.at(a)->is_smeared) Smearer.smeared_force(force); - force = Ta(force); + force = FieldImplementation::projectForce(force); // Ta for gauge fields std::cout << GridLogIntegrator << "Force average: " << norm2(force) / (U._grid->gSites()) << std::endl; @@ -201,9 +201,10 @@ class Integrator { // Initialization of momenta and actions void refresh(Field& U, GridParallelRNG& pRNG) { + assert(P._grid == U._grid); std::cout << GridLogIntegrator << "Integrator refresh\n"; FieldImplementation::generate_momenta(P, pRNG); - + // Update the smeared fields, can be implemented as observer // necessary to keep the fields updated even after a reject // of the Metropolis diff --git a/lib/qcd/representations/fundamental.h b/lib/qcd/representations/fundamental.h index 7d85d357..db52d893 100644 --- a/lib/qcd/representations/fundamental.h +++ b/lib/qcd/representations/fundamental.h @@ -34,8 +34,21 @@ class FundamentalRep { }; + template + class EmptyRep { + public: + typedef Field LatticeField; + + explicit EmptyRep(GridBase* grid) {} //do nothing + void update_representation(const LatticeField& Uin) {} // do nothing + LatticeField RtoFundamentalProject(const LatticeField& in, Real scale = 1.0) const{}// do nothing + }; + + + typedef FundamentalRep FundamentalRepresentation; + } } diff --git a/lib/qcd/representations/hmc_types.h b/lib/qcd/representations/hmc_types.h index 7ab15e9b..65ba7062 100644 --- a/lib/qcd/representations/hmc_types.h +++ b/lib/qcd/representations/hmc_types.h @@ -4,6 +4,8 @@ #include #include #include +#include + #include #include @@ -39,13 +41,17 @@ class Representations { int size() { return tuple_size; } // update the fields + // fields in the main representation always the first in the list + // get the field type + typedef typename std::tuple_element<0,Representation_Fields>::type LatticeSourceField; + template inline typename std::enable_if<(I == tuple_size), void>::type update( - LatticeGaugeField& U) {} + LatticeSourceField& U) {} template inline typename std::enable_if<(I < tuple_size), void>::type update( - LatticeGaugeField& U) { + LatticeSourceField& U) { std::get(rep).update_representation(U); update(U); } @@ -55,6 +61,7 @@ class Representations { }; typedef Representations NoHirep; +typedef Representations > ScalarFields; // Helper classes to access the elements // Strips the first N parameters from the tuple diff --git a/lib/qcd/smearing/GaugeConfiguration.h b/lib/qcd/smearing/GaugeConfiguration.h index 803f3566..fc045ba2 100644 --- a/lib/qcd/smearing/GaugeConfiguration.h +++ b/lib/qcd/smearing/GaugeConfiguration.h @@ -11,24 +11,23 @@ namespace Grid { namespace QCD { //trivial class for no smearing - template< class Gimpl > + template< class Impl > class NoSmearing { public: - INHERIT_GIMPL_TYPES(Gimpl); + INHERIT_FIELD_TYPES(Impl); - GaugeField* - ThinLinks; + Field* ThinField; - NoSmearing(): ThinLinks(NULL) {} + NoSmearing(): ThinField(NULL) {} - void set_Field(GaugeField& U) { ThinLinks = &U; } + void set_Field(Field& U) { ThinField = &U; } - void smeared_force(GaugeField& SigmaTilde) const {} + void smeared_force(Field&) const {} - GaugeField& get_SmearedU() { return *ThinLinks; } + Field& get_SmearedU() { return *ThinField; } - GaugeField& get_U(bool smeared = false) { - return *ThinLinks; + Field& get_U(bool smeared = false) { + return *ThinField; } }; diff --git a/lib/qcd/utils/ScalarObjs.h b/lib/qcd/utils/ScalarObjs.h new file mode 100644 index 00000000..9915a89b --- /dev/null +++ b/lib/qcd/utils/ScalarObjs.h @@ -0,0 +1,96 @@ +/************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/qcd/utils/WilsonLoops.h + + Copyright (C) 2015 + +Author: Azusa Yamaguchi +Author: Peter Boyle +Author: neo +Author: paboyle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#ifndef SCALAR_OBJS_H +#define SCALAR_OBJS_H +namespace Grid { +namespace QCD { + +// Scalar field obs +template +class ScalarObs { + public: + ////////////////////////////////////////////////// + // squared field + ////////////////////////////////////////////////// + + static void phisquared(typename Impl::Field &fsq, + const typename Impl::Field &f) { + fsq = f * f; + } + ////////////////////////////////////////////////// + // phi^4 interaction term + ////////////////////////////////////////////////// + + static void phifourth(typename Impl::Field &fsq, + const typename Impl::Field &f) { + fsq = f * f * f * f; + } + + ////////////////////////////////////////////////// + // phi(x)phi(x+mu) + ////////////////////////////////////////////////// + + static void phider(typename Impl::Field &fsq, + const typename Impl::Field &f) { + fsq = Cshift(f, 0, -1) * f; + for (int mu = 1; mu < Nd; mu++) fsq += Cshift(f, mu, -1) * f; + } + + ////////////////////////////////////////////////// + // Vol sum of the previous obs. + ////////////////////////////////////////////////// + + static RealD sumphider(const typename Impl::Field &f) { + typename Impl::Field tmp(f._grid); + tmp = Cshift(f, 0, -1) * f; + for (int mu = 1; mu < Nd; mu++) { + tmp += Cshift(f, mu, -1) * f; + } + return -sum(trace(tmp)); + } + + static RealD sumphisquared(const typename Impl::Field &f) { + typename Impl::Field tmp(f._grid); + tmp = f * f; + return sum(trace(tmp)); + } + + static RealD sumphifourth(const typename Impl::Field &f) { + typename Impl::Field tmp(f._grid); + phifourth(tmp, f); + return sum(trace(tmp)); + } +}; +} +} + +#endif \ No newline at end of file diff --git a/tests/hmc/Make.inc b/tests/hmc/Make.inc index 4fa49710..e39fb40b 100644 --- a/tests/hmc/Make.inc +++ b/tests/hmc/Make.inc @@ -1,5 +1,5 @@ -tests: Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio -EXTRA_PROGRAMS = Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +tests: Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +EXTRA_PROGRAMS = Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio Test_hmc_EODWFRatio_SOURCES=Test_hmc_EODWFRatio.cc Test_hmc_EODWFRatio_LDADD=-lGrid @@ -25,6 +25,9 @@ Test_hmc_IwasakiGauge_LDADD=-lGrid Test_hmc_RectGauge_SOURCES=Test_hmc_RectGauge.cc Test_hmc_RectGauge_LDADD=-lGrid +Test_hmc_ScalarAction_SOURCES=Test_hmc_ScalarAction.cc +Test_hmc_ScalarAction_LDADD=-lGrid + Test_hmc_WilsonAdjointFermionGauge_SOURCES=Test_hmc_WilsonAdjointFermionGauge.cc Test_hmc_WilsonAdjointFermionGauge_LDADD=-lGrid diff --git a/tests/hmc/Test_hmc_ScalarAction.cc b/tests/hmc/Test_hmc_ScalarAction.cc new file mode 100644 index 00000000..e0798c2b --- /dev/null +++ b/tests/hmc/Test_hmc_ScalarAction.cc @@ -0,0 +1,77 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_hmc_WilsonFermionGauge.cc + +Copyright (C) 2015 + +Author: Peter Boyle +Author: Peter Boyle +Author: neo +Author: paboyle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +namespace Grid { +namespace QCD { + +// Derive from the BinaryHmcRunner (templated for gauge fields) +class HmcRunner : public ScalarBinaryHmcRunner { + public: + void BuildTheAction(int argc, char **argv) + + { + UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); + UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + // Scalar action + ScalarActionR Saction(0.11,0.); + + // Collect actions + ActionLevel Level1(1); + Level1.push_back(&Saction); + + TheAction.push_back(Level1); + + + Run(argc, argv); + }; +}; +} +} + +int main(int argc, char **argv) { + Grid_init(&argc, &argv); + + int threads = GridThread::GetThreads(); + std::cout << GridLogMessage << "Grid is setup to use " << threads + << " threads" << std::endl; + + HmcRunner TheHMC; + + TheHMC.BuildTheAction(argc, argv); +} diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 5161617c..8d8543f2 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -37,6 +37,7 @@ using namespace Grid::QCD; namespace Grid { namespace QCD { +// Derive from the BinaryHmcRunner (templated for gauge fields) class HmcRunner : public BinaryHmcRunner { public: void BuildTheAction(int argc, char **argv) @@ -71,15 +72,19 @@ class HmcRunner : public BinaryHmcRunner { Nf2.is_smeared = true; // Collect actions - ActionLevel Level1(1); + ActionLevel Level1(1); Level1.push_back(&Nf2); - ActionLevel Level2(4); + ActionLevel Level2(4); Level2.push_back(&Waction); TheAction.push_back(Level1); TheAction.push_back(Level2); + // Add observables + //PlaquetteLogger PlaqLog(std::string("plaq")); + //ObservablesList.push_back(PlaqLog); + Run(argc, argv); }; }; From 26b9740d533aa3de155cfe0219af6f39a5867348 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 10 Oct 2016 09:43:05 +0100 Subject: [PATCH 065/807] Some fix for the GenericHMCrunner --- lib/lattice/Lattice_reduction.h | 107 +++++++++--------- lib/qcd/hmc/GenericHMCrunner.h | 9 +- tests/core/Test_main.cc | 13 +++ tests/hmc/Test_hmc_ScalarAction.cc | 7 +- .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 4 +- 5 files changed, 80 insertions(+), 60 deletions(-) diff --git a/lib/lattice/Lattice_reduction.h b/lib/lattice/Lattice_reduction.h index 2615af48..488229f5 100644 --- a/lib/lattice/Lattice_reduction.h +++ b/lib/lattice/Lattice_reduction.h @@ -38,51 +38,56 @@ namespace Grid { //////////////////////////////////////////////////////////////////////////////////////////////////// // Deterministic Reduction operations //////////////////////////////////////////////////////////////////////////////////////////////////// - template inline RealD norm2(const Lattice &arg){ - ComplexD nrm = innerProduct(arg,arg); - return std::real(nrm); +template +inline RealD norm2(const Lattice &arg) { + ComplexD nrm = innerProduct(arg, arg); + return std::real(nrm); +} + +template +inline ComplexD innerProduct(const Lattice &left, + const Lattice &right) { + typedef typename vobj::scalar_type scalar_type; + typedef typename vobj::vector_type vector_type; + scalar_type nrm; + + GridBase *grid = left._grid; + + std::vector > sumarray( + grid->SumArraySize()); + for (int i = 0; i < grid->SumArraySize(); i++) { + sumarray[i] = zero; } - template - inline ComplexD innerProduct(const Lattice &left,const Lattice &right) - { - typedef typename vobj::scalar_type scalar_type; - typedef typename vobj::vector_type vector_type; - scalar_type nrm; + PARALLEL_FOR_LOOP + for (int thr = 0; thr < grid->SumArraySize(); thr++) { + int nwork, mywork, myoff; + GridThread::GetWork(left._grid->oSites(), thr, mywork, myoff); - GridBase *grid = left._grid; - - std::vector > sumarray(grid->SumArraySize()); - for(int i=0;iSumArraySize();i++){ - sumarray[i]=zero; - } - -PARALLEL_FOR_LOOP - for(int thr=0;thrSumArraySize();thr++){ - int nwork, mywork, myoff; - GridThread::GetWork(left._grid->oSites(),thr,mywork,myoff); - - decltype(innerProduct(left._odata[0],right._odata[0])) vnrm=zero; // private to thread; sub summation - for(int ss=myoff;ssSumArraySize();i++){ - vvnrm = vvnrm+sumarray[i]; - } - nrm = Reduce(vvnrm);// sum across simd - right._grid->GlobalSum(nrm); - return nrm; + decltype(innerProduct(left._odata[0], right._odata[0])) vnrm = + zero; // private to thread; sub summation + for (int ss = myoff; ss < mywork + myoff; ss++) { + vnrm = vnrm + innerProduct(left._odata[ss], right._odata[ss]); } + sumarray[thr] = TensorRemove(vnrm); + } + - template - inline auto sum(const LatticeUnaryExpression & expr) - ->typename decltype(expr.first.func(eval(0,std::get<0>(expr.second))))::scalar_object - { - return sum(closure(expr)); + vector_type vvnrm; + vvnrm = zero; // sum across threads + for (int i = 0; i < grid->SumArraySize(); i++) { + vvnrm = vvnrm + sumarray[i]; + } + nrm = Reduce(vvnrm); // sum across simd + right._grid->GlobalSum(nrm); + return nrm; +} + +template +inline auto sum(const LatticeUnaryExpression &expr) -> + typename decltype( + expr.first.func(eval(0, std::get<0>(expr.second))))::scalar_object { + return sum(closure(expr)); } template @@ -96,9 +101,9 @@ PARALLEL_FOR_LOOP template inline auto sum(const LatticeTrinaryExpression & expr) ->typename decltype(expr.first.func(eval(0,std::get<0>(expr.second)), - eval(0,std::get<1>(expr.second)), - eval(0,std::get<2>(expr.second)) - ))::scalar_object + eval(0,std::get<1>(expr.second)), + eval(0,std::get<2>(expr.second)) + ))::scalar_object { return sum(closure(expr)); } @@ -111,24 +116,24 @@ PARALLEL_FOR_LOOP std::vector > sumarray(grid->SumArraySize()); for(int i=0;iSumArraySize();i++){ - sumarray[i]=zero; + sumarray[i]=zero; } PARALLEL_FOR_LOOP for(int thr=0;thrSumArraySize();thr++){ - int nwork, mywork, myoff; - GridThread::GetWork(grid->oSites(),thr,mywork,myoff); + int nwork, mywork, myoff; + GridThread::GetWork(grid->oSites(),thr,mywork,myoff); - vobj vvsum=zero; + vobj vvsum=zero; for(int ss=myoff;ssSumArraySize();i++){ - vsum = vsum+sumarray[i]; + vsum = vsum+sumarray[i]; } typedef typename vobj::scalar_object sobj; diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index a7eb8016..5df3f393 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -47,7 +47,7 @@ class BinaryHmcRunnerTemplate { ActionSet TheAction; // Add here a vector of HmcObservable // that can be injected from outside - std::vector< HmcObservable > ObservablesList; + std::vector< HmcObservable* > ObservablesList; GridCartesian *UGrid; @@ -119,12 +119,13 @@ class BinaryHmcRunnerTemplate { IntegratorParameters MDpar(20, 1.0); IntegratorType MDynamics(UGrid, MDpar, TheAction, SmearingPolicy); - // Checkpoint strategy + // Checkpoint strategy int SaveInterval = 1; std::string format = std::string("IEEE64BIG"); std::string conf_prefix = std::string("ckpoint_lat"); std::string rng_prefix = std::string("ckpoint_rng"); IOCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); + HMCparameters HMCpar; HMCpar.StartTrajectory = StartTraj; @@ -158,10 +159,10 @@ class BinaryHmcRunnerTemplate { SmearingPolicy.set_Field(U); HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); - //HMC.AddObservable(&Checkpoint); + HMC.AddObservable(&Checkpoint); for (int obs = 0; obs < ObservablesList.size(); obs++) - HMC.AddObservable(&ObservablesList[obs]); + HMC.AddObservable(ObservablesList[obs]); // Run it HMC.evolve(); diff --git a/tests/core/Test_main.cc b/tests/core/Test_main.cc index 78c28539..7bef5d4e 100644 --- a/tests/core/Test_main.cc +++ b/tests/core/Test_main.cc @@ -143,6 +143,7 @@ int main(int argc, char **argv) { random(FineRNG, Foo); gaussian(FineRNG, Bar); + random(FineRNG, scFoo); random(FineRNG, scBar); @@ -169,6 +170,18 @@ int main(int argc, char **argv) { abort(); } + // Norm2 check + LatticeReal BarReal(&Fine); + LatticeComplex BarComplex(&Fine); + BarReal = 1.0; + BarComplex = 1.0; + + + std::cout << "Norm2 LatticeReal : "<< norm2(BarReal) << std::endl; + std::cout << "Norm2 LatticeComplex : "<< norm2(BarComplex) << std::endl; + + exit(0); + TComplex tr = trace(cmat); cVec = cMat * cVec; // LatticeColourVector = LatticeColourMatrix diff --git a/tests/hmc/Test_hmc_ScalarAction.cc b/tests/hmc/Test_hmc_ScalarAction.cc index e0798c2b..8565d001 100644 --- a/tests/hmc/Test_hmc_ScalarAction.cc +++ b/tests/hmc/Test_hmc_ScalarAction.cc @@ -43,12 +43,13 @@ class HmcRunner : public ScalarBinaryHmcRunner { void BuildTheAction(int argc, char **argv) { + // Notice that the Grid is for reals now UGrid = SpaceTimeGrid::makeFourDimGrid( - GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultLatt(), GridDefaultSimd(Nd, vReal::Nsimd()), GridDefaultMpi()); UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); - // Scalar action + // Real Scalar action ScalarActionR Saction(0.11,0.); // Collect actions @@ -59,7 +60,7 @@ class HmcRunner : public ScalarBinaryHmcRunner { Run(argc, argv); - }; + }; }; } } diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 8d8543f2..e0227b14 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -82,8 +82,8 @@ class HmcRunner : public BinaryHmcRunner { TheAction.push_back(Level2); // Add observables - //PlaquetteLogger PlaqLog(std::string("plaq")); - //ObservablesList.push_back(PlaqLog); + PlaquetteLogger PlaqLog(std::string("plaq")); + ObservablesList.push_back(&PlaqLog); Run(argc, argv); }; From 65f61bb3bfa6e4457b653296d7607aa9176d3882 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 10 Oct 2016 09:46:17 +0100 Subject: [PATCH 066/807] Reset QCD colours to 3 --- lib/qcd/QCD.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index fc95490a..74107a3e 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -45,7 +45,7 @@ namespace QCD { static const int Zm = 6; static const int Tm = 7; - static const int Nc=2; + static const int Nc=3; static const int Ns=4; static const int Nd=4; static const int Nhs=2; // half spinor From 293df6cd20b36f3bbacb190593a9b2228e07b064 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 10 Oct 2016 11:49:55 +0100 Subject: [PATCH 067/807] Generalising the HMCRunner and moving parameters to the user level --- lib/qcd/hmc/GenericHMCrunner.h | 20 ++++---- tests/hmc/Test_hmc_ScalarAction.cc | 10 +++- .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 46 ++++++++++++++++--- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index 5df3f393..8500cfb4 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -35,7 +35,6 @@ namespace QCD { // Virtual Class for HMC specific for gauge theories // implement a specific theory by defining the BuildTheAction template , class RepresentationsPolicy = NoHirep> class BinaryHmcRunnerTemplate { public: @@ -45,7 +44,8 @@ class BinaryHmcRunnerTemplate { enum StartType_t { ColdStart, HotStart, TepidStart, CheckpointStart }; ActionSet TheAction; - // Add here a vector of HmcObservable + + // A vector of HmcObservable // that can be injected from outside std::vector< HmcObservable* > ObservablesList; @@ -57,7 +57,9 @@ class BinaryHmcRunnerTemplate { virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? - void Run(int argc, char **argv) { +// add here the smearing implementation? +template > + void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { StartType_t StartType = HotStart; std::string arg; @@ -119,13 +121,14 @@ class BinaryHmcRunnerTemplate { IntegratorParameters MDpar(20, 1.0); IntegratorType MDynamics(UGrid, MDpar, TheAction, SmearingPolicy); - // Checkpoint strategy + // Checkpoint strategy + /* int SaveInterval = 1; std::string format = std::string("IEEE64BIG"); std::string conf_prefix = std::string("ckpoint_lat"); std::string rng_prefix = std::string("ckpoint_rng"); IOCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); - + */ HMCparameters HMCpar; HMCpar.StartTrajectory = StartTraj; @@ -159,7 +162,7 @@ class BinaryHmcRunnerTemplate { SmearingPolicy.set_Field(U); HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); - HMC.AddObservable(&Checkpoint); + //HMC.AddObservable(&Checkpoint); for (int obs = 0; obs < ObservablesList.size(); obs++) HMC.AddObservable(ObservablesList[obs]); @@ -174,7 +177,7 @@ typedef BinaryHmcRunnerTemplate BinaryHmcRunner; typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; -typedef BinaryHmcRunnerTemplate > NerscTestHmcRunner; +//typedef BinaryHmcRunnerTemplate > NerscTestHmcRunner; template @@ -183,7 +186,8 @@ using BinaryHmcRunnerTemplateHirep = -typedef BinaryHmcRunnerTemplate, ScalarFields> ScalarBinaryHmcRunner; +//typedef BinaryHmcRunnerTemplate, ScalarFields> ScalarBinaryHmcRunner; + typedef BinaryHmcRunnerTemplate ScalarBinaryHmcRunner; } } #endif diff --git a/tests/hmc/Test_hmc_ScalarAction.cc b/tests/hmc/Test_hmc_ScalarAction.cc index 8565d001..8a2ff036 100644 --- a/tests/hmc/Test_hmc_ScalarAction.cc +++ b/tests/hmc/Test_hmc_ScalarAction.cc @@ -59,7 +59,15 @@ class HmcRunner : public ScalarBinaryHmcRunner { TheAction.push_back(Level1); - Run(argc, argv); + // Add observables and checkpointers + int SaveInterval = 1; + std::string format = std::string("IEEE64BIG"); + std::string conf_prefix = std::string("ckpoint_scalar_lat"); + std::string rng_prefix = std::string("ckpoint_scalar_rng"); + BinaryHmcCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); + ObservablesList.push_back(&Checkpoint); + + Run(argc, argv, Checkpoint); }; }; } diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index e0227b14..3e76c015 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -7,9 +7,8 @@ Source file: ./tests/Test_hmc_WilsonFermionGauge.cc Copyright (C) 2015 Author: Peter Boyle -Author: Peter Boyle Author: neo -Author: paboyle +Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +24,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution directory +See the full license in the file "LICENSE" in the top level distribution +directory *************************************************************************************/ /* END LEGAL */ #include @@ -37,6 +37,23 @@ using namespace Grid::QCD; namespace Grid { namespace QCD { +class HMCRunnerParameters : Serializable { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, + double, beta, + double, mass, + int, MaxCGIterations, + double, StoppingCondition, + bool, smearedAction, + int, SaveInterval, + std::string, format, + std::string, conf_prefix, + std::string, rng_prefix, + ); + + HMCRunnerParameters() {} +}; + // Derive from the BinaryHmcRunner (templated for gauge fields) class HmcRunner : public BinaryHmcRunner { public: @@ -62,6 +79,9 @@ class HmcRunner : public BinaryHmcRunner { WilsonGaugeActionR Waction(5.6); Real mass = -0.77; + + // Can we define an overloaded operator that does not need U and initialises + // it with zeroes? FermionAction FermOp(U, *FGrid, *FrbGrid, mass); ConjugateGradient CG(1.0e-8, 10000); @@ -82,10 +102,24 @@ class HmcRunner : public BinaryHmcRunner { TheAction.push_back(Level2); // Add observables - PlaquetteLogger PlaqLog(std::string("plaq")); - ObservablesList.push_back(&PlaqLog); + int SaveInterval = 2; + std::string format = std::string("IEEE64BIG"); + std::string conf_prefix = std::string("ckpoint_lat"); + std::string rng_prefix = std::string("ckpoint_rng"); + BinaryHmcCheckpointer Checkpoint( + conf_prefix, rng_prefix, SaveInterval, format); + // Can implement also a specific function in the hmcrunner + // AddCheckpoint (...) that takes the same parameters + a string/tag + // defining the type of the checkpointer + // with tags can be implemented by overloading and no ifs + // Then force all checkpoint to have few common functions + // return an object that is then passed to the Run function - Run(argc, argv); + PlaquetteLogger PlaqLog(std::string("Plaquette")); + ObservablesList.push_back(&PlaqLog); + ObservablesList.push_back(&Checkpoint); + + Run(argc, argv, Checkpoint); }; }; } From c68a2b9637995072670d4eb667406669b3b7baf1 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 10 Oct 2016 11:54:58 +0100 Subject: [PATCH 068/807] Minor fix --- lib/qcd/hmc/integrators/Integrator.h | 3 +-- tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index d37d9271..29c1912d 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -8,8 +8,7 @@ Copyright (C) 2015 Author: Azusa Yamaguchi Author: Peter Boyle -Author: neo -Author: paboyle +Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 3e76c015..6a5b6f52 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -102,7 +102,7 @@ class HmcRunner : public BinaryHmcRunner { TheAction.push_back(Level2); // Add observables - int SaveInterval = 2; + int SaveInterval = 1; std::string format = std::string("IEEE64BIG"); std::string conf_prefix = std::string("ckpoint_lat"); std::string rng_prefix = std::string("ckpoint_rng"); From eda4dd622e6470af3ee260a2d8568f8a2f40e985 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 11 Oct 2016 15:45:20 +0100 Subject: [PATCH 069/807] Some more edit --- lib/parallelIO/BinaryIO.h | 2 +- lib/qcd/QCD.h | 87 +++++++++++++++++++++++++++++----- lib/qcd/hmc/GenericHMCrunner.h | 11 +---- lib/tensors/Tensor_outer.h | 3 ++ 4 files changed, 82 insertions(+), 21 deletions(-) diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index f9a8ae3c..3265ba54 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -505,7 +505,7 @@ class BinaryIO { // available (how short sighted is that?) ////////////////////////////////////////////////////////// Umu = zero; - static uint32_t csum=0; + static uint32_t csum; csum=0;//static for SHMEM fobj fileObj; static sobj siteObj; // Static to place in symmetric region for SHMEM diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index 74107a3e..61313f33 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -33,6 +33,71 @@ Author: paboyle #define GRID_QCD_H namespace Grid{ +// First steps in the complete generalization of the Physics part +namespace LatticeTheories { + +template +struct LatticeTheory { + static const int Nd = Dimensions; + static const int Nds = Dimensions * 2; // double stored field + template + using iSinglet = iScalar > >; +}; + +template +struct LatticeGaugeTheory : public LatticeTheory { + static const int Nds = Dimensions * 2; + static const int Nd = Dimensions; + static const int Nc = Colours; + + template + using iColourMatrix = iScalar > >; + template + using iLorentzColourMatrix = iVector >, Nd>; + template + using iDoubleStoredColourMatrix = iVector >, Nds>; + template + using iColourVector = iScalar > >; +}; + +template +struct FermionicLatticeGaugeTheory + : public LatticeGaugeTheory { + static const int Nd = Dimensions; + static const int Nds = Dimensions * 2; + static const int Nc = Colours; + static const int Ns = Spin; + + template + using iSpinMatrix = iScalar, Ns> >; + template + using iSpinColourMatrix = iScalar, Ns> >; + template + using iSpinVector = iScalar, Ns> >; + template + using iSpinColourVector = iScalar, Ns> >; + // These 2 only is Spin is a multiple of 2 + static const int Nhs = Spin / 2; + template + using iHalfSpinVector = iScalar, Nhs> >; + template + using iHalfSpinColourVector = iScalar, Nhs> >; +}; + +struct QCD : public FermionicLatticeGaugeTheory<4, 3, 4> { + typedef FermionicLatticeGaugeTheory FLGT; + typedef FLGT::iSpinMatrix SpinMatrix; + typedef FLGT::iSpinMatrix SpinMatrixF; + typedef FLGT::iSpinMatrix SpinMatrixD; + +}; +struct QED : public FermionicLatticeGaugeTheory<4, 1, 4> {}; + +template +struct Scalar : public LatticeTheory {}; + +} // LatticeTheories + namespace QCD { @@ -355,36 +420,36 @@ namespace QCD { ////////////////////////////////////////////// template void pokeColour(Lattice &lhs, - const Lattice(lhs._odata[0],0))> & rhs, - int i) + const Lattice(lhs._odata[0],0))> & rhs, + int i) { PokeIndex(lhs,rhs,i); } template void pokeColour(Lattice &lhs, - const Lattice(lhs._odata[0],0,0))> & rhs, - int i,int j) + const Lattice(lhs._odata[0],0,0))> & rhs, + int i,int j) { PokeIndex(lhs,rhs,i,j); } template void pokeSpin(Lattice &lhs, - const Lattice(lhs._odata[0],0))> & rhs, - int i) + const Lattice(lhs._odata[0],0))> & rhs, + int i) { PokeIndex(lhs,rhs,i); } template void pokeSpin(Lattice &lhs, - const Lattice(lhs._odata[0],0,0))> & rhs, - int i,int j) + const Lattice(lhs._odata[0],0,0))> & rhs, + int i,int j) { PokeIndex(lhs,rhs,i,j); } template void pokeLorentz(Lattice &lhs, - const Lattice(lhs._odata[0],0))> & rhs, - int i) + const Lattice(lhs._odata[0],0))> & rhs, + int i) { PokeIndex(lhs,rhs,i); } @@ -500,7 +565,7 @@ namespace QCD { #include #include -// Include representations +// Include representations #include #include #include diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index 8500cfb4..d627c47b 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -111,9 +111,11 @@ template > GridParallelRNG pRNG(UGrid); Field U(UGrid); + // This outside std::vector SerSeed({1, 2, 3, 4, 5}); std::vector ParSeed({6, 7, 8, 9, 10}); + // these decisions outside NoSmearing SmearingPolicy; typedef MinimumNorm2, RepresentationsPolicy> @@ -121,15 +123,6 @@ template > IntegratorParameters MDpar(20, 1.0); IntegratorType MDynamics(UGrid, MDpar, TheAction, SmearingPolicy); - // Checkpoint strategy - /* - int SaveInterval = 1; - std::string format = std::string("IEEE64BIG"); - std::string conf_prefix = std::string("ckpoint_lat"); - std::string rng_prefix = std::string("ckpoint_rng"); - IOCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); - */ - HMCparameters HMCpar; HMCpar.StartTrajectory = StartTraj; HMCpar.Trajectories = NumTraj; diff --git a/lib/tensors/Tensor_outer.h b/lib/tensors/Tensor_outer.h index 896fb8ed..6429a190 100644 --- a/lib/tensors/Tensor_outer.h +++ b/lib/tensors/Tensor_outer.h @@ -44,6 +44,8 @@ auto outerProduct (const iVector& lhs,const iVector& rhs) -> iMatrix inline auto outerProduct (const iScalar& lhs,const iScalar& rhs) -> iScalar { @@ -53,6 +55,7 @@ auto outerProduct (const iScalar& lhs,const iScalar& rhs) -> iScalar Date: Thu, 13 Oct 2016 11:51:25 +0100 Subject: [PATCH 070/807] Adding gh-pages --- .gitignore | 6 +++++- gh-pages | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 120000 gh-pages diff --git a/.gitignore b/.gitignore index e82ecf9c..384f49d9 100644 --- a/.gitignore +++ b/.gitignore @@ -101,4 +101,8 @@ lib/fftw/* # libtool macros # ################## m4/lt* -m4/libtool.m4 \ No newline at end of file +m4/libtool.m4 + +# github pages # +################ +gh-pages/ \ No newline at end of file diff --git a/gh-pages b/gh-pages new file mode 120000 index 00000000..0f895714 --- /dev/null +++ b/gh-pages @@ -0,0 +1 @@ +../Grid_gh-pages/Grid/ \ No newline at end of file From e250e6b7bbd82abf196952f966235e6bbf17130e Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 14 Oct 2016 17:22:32 +0100 Subject: [PATCH 071/807] Moving parameters outside of the HMCrunner --- lib/qcd/hmc/GenericHMCrunner.h | 57 +++++++++++-------- lib/qcd/hmc/integrators/Integrator.h | 17 +++--- lib/qcd/smearing/APEsmearing.h | 8 +-- .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 23 +++++++- 4 files changed, 68 insertions(+), 37 deletions(-) diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index d627c47b..bad3b9cf 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -7,6 +7,7 @@ Source file: ./lib/qcd/hmc/GenericHmcRunner.h Copyright (C) 2015 Author: paboyle +Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,17 +50,39 @@ class BinaryHmcRunnerTemplate { // that can be injected from outside std::vector< HmcObservable* > ObservablesList; + IntegratorParameters MDparameters; GridCartesian *UGrid; GridCartesian *FGrid; GridRedBlackCartesian *UrbGrid; GridRedBlackCartesian *FrbGrid; + std::vector SerialSeed; + std::vector ParallelSeed; + + void RNGSeeds(std::vector S, std::vector P){ + SerialSeed = S; + ParallelSeed = P; + } + virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? -// add here the smearing implementation? -template > + // A couple of wrapper classes + template void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { + NoSmearing S; + Runner(argc, argv, Checkpoint, S); + } + + template + void Run(int argc, char **argv, IOCheckpointer &CP, SmearingPolicy &S) { + Runner(argc, argv, CP, S); + } + ////////////////////////////// + + template + void Runner(int argc, char **argv, IOCheckpointer &Checkpoint, + SmearingPolicy &Smearing) { StartType_t StartType = HotStart; std::string arg; @@ -111,17 +134,10 @@ template > GridParallelRNG pRNG(UGrid); Field U(UGrid); - // This outside - std::vector SerSeed({1, 2, 3, 4, 5}); - std::vector ParSeed({6, 7, 8, 9, 10}); - - // these decisions outside - NoSmearing SmearingPolicy; - typedef MinimumNorm2, + typedef MinimumNorm2 IntegratorType; // change here to change the algorithm - IntegratorParameters MDpar(20, 1.0); - IntegratorType MDynamics(UGrid, MDpar, TheAction, SmearingPolicy); + IntegratorType MDynamics(UGrid, MDparameters, TheAction, Smearing); HMCparameters HMCpar; HMCpar.StartTrajectory = StartTraj; @@ -131,20 +147,20 @@ template > if (StartType == HotStart) { // Hot start HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerSeed); - pRNG.SeedFixedIntegers(ParSeed); + sRNG.SeedFixedIntegers(SerialSeed); + pRNG.SeedFixedIntegers(ParallelSeed); Implementation::HotConfiguration(pRNG, U); } else if (StartType == ColdStart) { // Cold start HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerSeed); - pRNG.SeedFixedIntegers(ParSeed); + sRNG.SeedFixedIntegers(SerialSeed); + pRNG.SeedFixedIntegers(ParallelSeed); Implementation::ColdConfiguration(pRNG, U); } else if (StartType == TepidStart) { // Tepid start HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerSeed); - pRNG.SeedFixedIntegers(ParSeed); + sRNG.SeedFixedIntegers(SerialSeed); + pRNG.SeedFixedIntegers(ParallelSeed); Implementation::TepidConfiguration(pRNG, U); } else if (StartType == CheckpointStart) { HMCpar.MetropolisTest = true; @@ -152,10 +168,9 @@ template > Checkpoint.CheckpointRestore(StartTraj, U, sRNG, pRNG); } - SmearingPolicy.set_Field(U); + Smearing.set_Field(U); HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); - //HMC.AddObservable(&Checkpoint); for (int obs = 0; obs < ObservablesList.size(); obs++) HMC.AddObservable(ObservablesList[obs]); @@ -170,16 +185,12 @@ typedef BinaryHmcRunnerTemplate BinaryHmcRunner; typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; -//typedef BinaryHmcRunnerTemplate > NerscTestHmcRunner; - - template using BinaryHmcRunnerTemplateHirep = BinaryHmcRunnerTemplate; -//typedef BinaryHmcRunnerTemplate, ScalarFields> ScalarBinaryHmcRunner; typedef BinaryHmcRunnerTemplate ScalarBinaryHmcRunner; } } diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index 29c1912d..43974f48 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -46,27 +46,28 @@ namespace Grid { namespace QCD { struct IntegratorParameters { - unsigned int - Nexp; // number of terms in the Taylor expansion of the exponential unsigned int MDsteps; // number of outer steps RealD trajL; // trajectory length RealD stepsize; // trajectory stepsize - IntegratorParameters(int MDsteps_, RealD trajL_ = 1.0, - unsigned int Nexp_ = 12) - : Nexp(Nexp_), - MDsteps(MDsteps_), + IntegratorParameters(int MDsteps_ = 10, RealD trajL_ = 1.0) + : MDsteps(MDsteps_), trajL(trajL_), stepsize(trajL / MDsteps){ // empty body constructor }; + void set(int MDsteps_, RealD trajL_){ + MDsteps = MDsteps_; + trajL = trajL_; + stepsize = trajL/MDsteps; + } + + void print_parameters() { std::cout << GridLogMessage << "[Integrator] Trajectory length : " << trajL << std::endl; std::cout << GridLogMessage << "[Integrator] Number of MD steps : " << MDsteps << std::endl; std::cout << GridLogMessage << "[Integrator] Step size : " << stepsize << std::endl; - std::cout << GridLogMessage << "[Integrator] Exponential approx.: " << Nexp << std::endl; - } }; diff --git a/lib/qcd/smearing/APEsmearing.h b/lib/qcd/smearing/APEsmearing.h index 4db11338..467bf2c6 100644 --- a/lib/qcd/smearing/APEsmearing.h +++ b/lib/qcd/smearing/APEsmearing.h @@ -92,19 +92,19 @@ temp_Sigma = -rho_numu*staple*iLambda_nu; //ok //-r_numu*U_nu(x+mu)*Udag_mu(x+nu)*Udag_nu(x)*Lambda_nu(x) - Gimpl::AddGaugeLink(SigmaTerm, temp_Sigma, mu); + Gimpl::AddLink(SigmaTerm, temp_Sigma, mu); sh_field = Cshift(iLambda_nu, mu, 1);// general also for Gparity? temp_Sigma = rho_numu*sh_field*staple; //ok //r_numu*Lambda_nu(mu)*U_nu(x+mu)*Udag_mu(x+nu)*Udag_nu(x) - Gimpl::AddGaugeLink(SigmaTerm, temp_Sigma, mu); + Gimpl::AddLink(SigmaTerm, temp_Sigma, mu); sh_field = Cshift(iLambda_mu, nu, 1); temp_Sigma = -rho_munu*staple*U_nu*sh_field*adj(U_nu); //ok //-r_munu*U_nu(x+mu)*Udag_mu(x+nu)*Lambda_mu(x+nu)*Udag_nu(x) - Gimpl::AddGaugeLink(SigmaTerm, temp_Sigma, mu); + Gimpl::AddLink(SigmaTerm, temp_Sigma, mu); staple = zero; sh_field = Cshift(U_nu, mu, 1); @@ -116,7 +116,7 @@ sh_field = Cshift(u_tmp, mu, 1); temp_Sigma += -rho_numu*sh_field*adj(U_mu)*U_nu; sh_field = Cshift(temp_Sigma, nu, -1); - Gimpl::AddGaugeLink(SigmaTerm, sh_field, mu); + Gimpl::AddLink(SigmaTerm, sh_field, mu); } } diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 6a5b6f52..9024b4e2 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -49,6 +49,8 @@ class HMCRunnerParameters : Serializable { std::string, format, std::string, conf_prefix, std::string, rng_prefix, + double, rho, + int, SmearingLevels, ); HMCRunnerParameters() {} @@ -115,11 +117,21 @@ class HmcRunner : public BinaryHmcRunner { // Then force all checkpoint to have few common functions // return an object that is then passed to the Run function - PlaquetteLogger PlaqLog(std::string("Plaquette")); + PlaquetteLogger PlaqLog( + std::string("Plaquette")); ObservablesList.push_back(&PlaqLog); ObservablesList.push_back(&Checkpoint); - Run(argc, argv, Checkpoint); + // Smearing section, omit if not needed + double rho = 0.1; // smearing parameter + int Nsmear = 2; // number of smearing levels + Smear_Stout Stout(rho); + SmearedConfiguration SmearingPolicy( + UGrid, Nsmear, Stout); + /////////////////// + + // Run(argc, argv, Checkpoint, SmearingPolicy); + Run(argc, argv, Checkpoint); // no smearing }; }; } @@ -134,5 +146,12 @@ int main(int argc, char **argv) { HmcRunner TheHMC; + // Seeds for the random number generators + std::vector SerSeed({1, 2, 3, 4, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); + TheHMC.RNGSeeds(SerSeed, ParSeed); + + TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + TheHMC.BuildTheAction(argc, argv); } From 79270ef510d3d090ac0a3775d28528f23906f845 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 14 Oct 2016 17:34:26 +0100 Subject: [PATCH 072/807] Added a test for EODWF Scaled Shamir with general HMC --- tests/hmc/Make.inc | 7 +- tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 158 ++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 tests/hmc/Test_hmc_EODWFRatio_Binary.cc diff --git a/tests/hmc/Make.inc b/tests/hmc/Make.inc index e39fb40b..b37d797e 100644 --- a/tests/hmc/Make.inc +++ b/tests/hmc/Make.inc @@ -1,5 +1,8 @@ -tests: Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio -EXTRA_PROGRAMS = Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +tests: Test_hmc_EODWFRatio_Binary Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +EXTRA_PROGRAMS = Test_hmc_EODWFRatio_Binary Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio + +Test_hmc_EODWFRatio_Binary_SOURCES=Test_hmc_EODWFRatio_Binary.cc +Test_hmc_EODWFRatio_Binary_LDADD=-lGrid Test_hmc_EODWFRatio_SOURCES=Test_hmc_EODWFRatio.cc Test_hmc_EODWFRatio_LDADD=-lGrid diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc new file mode 100644 index 00000000..cd35968a --- /dev/null +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -0,0 +1,158 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_hmc_WilsonFermionGauge.cc + +Copyright (C) 2015 + +Author: Peter Boyle +Author: neo +Author: Guido Cossu + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +namespace Grid { +namespace QCD { + +class HMCRunnerParameters : Serializable { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, + double, beta, + double, mass, + int, MaxCGIterations, + double, StoppingCondition, + bool, smearedAction, + int, SaveInterval, + std::string, format, + std::string, conf_prefix, + std::string, rng_prefix, + double, rho, + int, SmearingLevels, + ); + + HMCRunnerParameters() {} +}; + +// Derive from the BinaryHmcRunner (templated for gauge fields) +class HmcRunner : public BinaryHmcRunner { + public: + void BuildTheAction(int argc, char **argv) + + { + typedef WilsonImplR ImplPolicy; + typedef ScaledShamirFermionR FermionAction; + typedef typename FermionAction::FermionField FermionField; + + const int Ls = 12; + + UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi()); + UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + FGrid = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid); + FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); + + // temporarily need a gauge field + LatticeGaugeField U(UGrid); + + // Gauge action + IwasakiGaugeActionR Iaction(4.0); + + Real mass = 0.04; + Real pv = 1.0; + RealD M5 = 1.5; + RealD scale = 2.0; + FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale); + FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale); + + ConjugateGradient CG(1.0e-8,10000); + TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); + + // Set smearing (true/false), default: false + Nf2.is_smeared = true; + + // Collect actions + // here an example of 2 level integration + ActionLevel Level1(1); + Level1.push_back(&Nf2); + + ActionLevel Level2(4); + Level2.push_back(&Iaction); + + TheAction.push_back(Level1); + TheAction.push_back(Level2); + + // Add observables + int SaveInterval = 1; + std::string format = std::string("IEEE64BIG"); + std::string conf_prefix = std::string("DWF_ckpoint_lat"); + std::string rng_prefix = std::string("DWF_ckpoint_rng"); + BinaryHmcCheckpointer Checkpoint( + conf_prefix, rng_prefix, SaveInterval, format); + // Can implement also a specific function in the hmcrunner + // AddCheckpoint (...) that takes the same parameters + a string/tag + // defining the type of the checkpointer + // with tags can be implemented by overloading and no ifs + // Then force all checkpoint to have few common functions + // return an object that is then passed to the Run function + + PlaquetteLogger PlaqLog( + std::string("Plaquette")); + ObservablesList.push_back(&PlaqLog); + ObservablesList.push_back(&Checkpoint); + + // Smearing section, omit if not needed + double rho = 0.1; // smearing parameter + int Nsmear = 2; // number of smearing levels + Smear_Stout Stout(rho); + SmearedConfiguration SmearingPolicy( + UGrid, Nsmear, Stout); + /////////////////// + + Run(argc, argv, Checkpoint, SmearingPolicy); + //Run(argc, argv, Checkpoint); // no smearing + }; +}; +} +} + +int main(int argc, char **argv) { + Grid_init(&argc, &argv); + + int threads = GridThread::GetThreads(); + std::cout << GridLogMessage << "Grid is setup to use " << threads + << " threads" << std::endl; + + HmcRunner TheHMC; + + // Seeds for the random number generators + std::vector SerSeed({1, 2, 3, 4, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); + TheHMC.RNGSeeds(SerSeed, ParSeed); + + TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + + TheHMC.BuildTheAction(argc, argv); +} From 74f1ed3bc5a051255793c9e0f2c7bff6e2c85db1 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 19 Oct 2016 10:51:13 +0100 Subject: [PATCH 073/807] Adding some documentation for HMC --- lib/qcd/action/Actions.h | 4 + lib/qcd/action/gauge/WilsonGaugeAction.h | 290 ++++++++++++++++++----- lib/qcd/hmc/UsingHMC.md | 107 +++++++++ lib/qcd/utils/WilsonLoops.h | 47 +++- tests/hmc/Make.inc | 7 +- tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 10 +- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 136 +++++++++++ 7 files changed, 531 insertions(+), 70 deletions(-) create mode 100644 lib/qcd/hmc/UsingHMC.md create mode 100644 tests/hmc/Test_hmc_WilsonGauge_Binary.cc diff --git a/lib/qcd/action/Actions.h b/lib/qcd/action/Actions.h index e45f2e0c..ef2edc97 100644 --- a/lib/qcd/action/Actions.h +++ b/lib/qcd/action/Actions.h @@ -72,6 +72,10 @@ namespace QCD { typedef WilsonGaugeAction WilsonGaugeActionR; typedef WilsonGaugeAction WilsonGaugeActionF; typedef WilsonGaugeAction WilsonGaugeActionD; +typedef VariableWilsonGaugeAction VariableWilsonGaugeActionR; +typedef VariableWilsonGaugeAction VariableWilsonGaugeActionF; +typedef VariableWilsonGaugeAction VariableWilsonGaugeActionD; + typedef PlaqPlusRectangleAction PlaqPlusRectangleActionR; typedef PlaqPlusRectangleAction PlaqPlusRectangleActionF; typedef PlaqPlusRectangleAction PlaqPlusRectangleActionD; diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/lib/qcd/action/gauge/WilsonGaugeAction.h index aff67c67..686c5470 100644 --- a/lib/qcd/action/gauge/WilsonGaugeAction.h +++ b/lib/qcd/action/gauge/WilsonGaugeAction.h @@ -1,86 +1,260 @@ - /************************************************************************************* +/************************************************************************************* - Grid physics library, www.github.com/paboyle/Grid +Grid physics library, www.github.com/paboyle/Grid - Source file: ./lib/qcd/action/gauge/WilsonGaugeAction.h +Source file: ./lib/qcd/action/gauge/WilsonGaugeAction.h - Copyright (C) 2015 +Copyright (C) 2015 Author: Azusa Yamaguchi Author: Peter Boyle Author: neo Author: paboyle - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - See the full license in the file "LICENSE" in the top level distribution directory - *************************************************************************************/ - /* END LEGAL */ +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ #ifndef QCD_WILSON_GAUGE_ACTION_H #define QCD_WILSON_GAUGE_ACTION_H -namespace Grid{ - namespace QCD{ - - //////////////////////////////////////////////////////////////////////// - // Wilson Gauge Action .. should I template the Nc etc.. - //////////////////////////////////////////////////////////////////////// - template - class WilsonGaugeAction : public Action { - public: +namespace Grid { +namespace QCD { - INHERIT_GIMPL_TYPES(Gimpl); +//////////////////////////////////////////////////////////////////////// +// Wilson Gauge Action .. should I template the Nc etc.. +//////////////////////////////////////////////////////////////////////// +template +class WilsonGaugeAction : public Action { + public: + INHERIT_GIMPL_TYPES(Gimpl); - // typedef LorentzScalar GaugeLinkField; + // typedef LorentzScalar GaugeLinkField; - private: - RealD beta; - public: - WilsonGaugeAction(RealD b):beta(b){}; + private: + RealD beta; + + public: + WilsonGaugeAction(RealD b) : beta(b){}; + + virtual void refresh(const GaugeField &U, + GridParallelRNG &pRNG){}; // noop as no pseudoferms + + virtual RealD S(const GaugeField &U) { + RealD plaq = WilsonLoops::avgPlaquette(U); + RealD vol = U._grid->gSites(); + RealD action = beta * (1.0 - plaq) * (Nd * (Nd - 1.0)) * vol * 0.5; + return action; + }; + + virtual void deriv(const GaugeField &U, GaugeField &dSdU) { + // not optimal implementation FIXME + // extend Ta to include Lorentz indexes + + // RealD factor = 0.5*beta/RealD(Nc); + RealD factor = 0.5 * beta / RealD(Nc); + + GaugeLinkField Umu(U._grid); + GaugeLinkField dSdU_mu(U._grid); + for (int mu = 0; mu < Nd; mu++) { + Umu = PeekIndex(U, mu); + + // Staple in direction mu + WilsonLoops::Staple(dSdU_mu, U, mu); + dSdU_mu = Ta(Umu * dSdU_mu) * factor; - virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) {}; // noop as no pseudoferms - - virtual RealD S(const GaugeField &U) { - RealD plaq = WilsonLoops::avgPlaquette(U); - RealD vol = U._grid->gSites(); - RealD action=beta*(1.0 -plaq)*(Nd*(Nd-1.0))*vol*0.5; - return action; - }; + PokeIndex(dSdU, dSdU_mu, mu); + } + }; +}; - virtual void deriv(const GaugeField &U,GaugeField & dSdU) { - //not optimal implementation FIXME - //extend Ta to include Lorentz indexes +template +class VariableWilsonGaugeAction : public Action { + public: + INHERIT_GIMPL_TYPES(Gimpl); - //RealD factor = 0.5*beta/RealD(Nc); - RealD factor = 0.5*beta/RealD(Nc); + private: + std::vector b_bulk;// bulk couplings + std::vector b_xdim;//extra dimension couplings + GridBase *grid; + LatticeComplex beta_xdim; + LatticeComplex beta_xdim_shifted; + LatticeComplex beta_bulk; - GaugeLinkField Umu(U._grid); - GaugeLinkField dSdU_mu(U._grid); - for (int mu=0; mu < Nd; mu++){ + public: + VariableWilsonGaugeAction(std::vector bulk, std::vector xdim, + GridBase *_grid) + : b_bulk(bulk), + b_xdim(xdim), + grid(_grid), + beta_xdim(grid), + beta_xdim_shifted(grid), + beta_bulk(grid) + { + //check that the grid is ok + //todo + int Ndim = Nd;//change later - Umu = PeekIndex(U,mu); + LatticeComplex temp(grid); - // Staple in direction mu - WilsonLoops::Staple(dSdU_mu,U,mu); - dSdU_mu = Ta(Umu*dSdU_mu)*factor; - PokeIndex(dSdU, dSdU_mu, mu); - } - }; - }; - + Lattice > coor(grid); + + LatticeCoordinate(coor, Ndim - 1); + + int Nex = grid->_fdimensions[Ndim - 1]; + assert(b_bulk.size() == Nex); + assert(b_xdim.size() == Nex); + + beta_xdim = zero; + for (int tau = 0; tau < Nex; tau++) { + temp = b_xdim[tau]; + beta_xdim = where(coor == tau, temp, beta_xdim); + } + + beta_xdim_shifted = Cshift(beta_xdim, Ndim - 1, -1); + + beta_bulk = zero; + for (int tau = 0; tau < Nex; tau++) { + temp = b_bulk[tau]; + beta_bulk = where(coor == tau, temp, beta_bulk); + } + }; + + virtual void refresh(const GaugeField &U, + GridParallelRNG &pRNG){}; // noop as no pseudoferms + + virtual RealD S(const GaugeField &Umu) { + int Ndim = Nd; // change later for generality + conformable(grid, Umu._grid); + + std::vector U(Ndim, grid); + + for (int mu = 0; mu < Ndim; mu++) { + U[mu] = PeekIndex(Umu, mu); + } + + LatticeComplex dirPlaq(grid); + LatticeComplex Plaq(grid); + + RealD OneOnNc = 1.0 / Real(Nc); + + ///////////// + // Lower dim plaquettes + ///////////// + Plaq = zero; + for (int mu = 1; mu < Ndim - 1; mu++) { + for (int nu = 0; nu < mu; nu++) { + WilsonLoops::traceDirPlaquette(dirPlaq, U, mu, nu); + Plaq = Plaq + (1.0 - dirPlaq * OneOnNc) * beta_bulk; + } + } + + ///////////// + // Extra dimension + ///////////// + { + int mu = Ndim - 1; + for (int nu = 0; nu < mu; nu++) { + WilsonLoops::traceDirPlaquette(dirPlaq, U, mu, nu); + Plaq = Plaq + (1.0 - dirPlaq * OneOnNc) * beta_xdim; + } + } + + TComplex Tp = sum(Plaq); + Complex p = TensorRemove(Tp); + RealD action = p.real(); + return action; + }; + + virtual void deriv(const GaugeField &U, GaugeField &dSdU) { + // not optimal implementation FIXME + // extend Ta to include Lorentz indexes + + // for the higher dimension plaquettes take the upper plaq of the + // 4d slice and multiply by beta[s] and the lower and multiply by beta[s-1] + // todo + // derivative of links mu = 0, ... Nd-1 inside plaq (mu,5) + // for these I need upper and lower staples separated + // each multiplied with their own beta + // derivative of links mu = 5 + // living on the same slice, share the same beta + + +conformable(grid,U._grid); +int Ndim = Nd; // change later +RealD factor = 0.5 / RealD(Nc); + +GaugeLinkField Umu(grid); +GaugeLinkField dSdU_mu(grid); +GaugeLinkField staple(grid); + +for (int mu = 0; mu < Ndim; mu++) { + Umu = PeekIndex(U, mu); + dSdU_mu = zero; + + for (int nu = 0; nu < Ndim; nu++) { + if (nu != mu) { + if ((mu < (Ndim - 1)) && (nu < (Ndim - 1))) { + // Spacelike case apply beta space + WilsonLoops::Staple(staple, U, mu, nu); + staple = staple * beta_bulk; + dSdU_mu += staple; + + } else if (mu == (Ndim - 1)) { + // nu space; mu time link + assert(nu < (Ndim - 1)); + assert(mu == (Ndim - 1)); + + // mu==tau dir link deriv, nu spatial + WilsonLoops::Staple(staple, U, mu, nu); + staple = staple * beta_xdim; + dSdU_mu += staple; + + } else { + assert(mu < (Ndim - 1)); + assert(nu == (Ndim - 1)); + + // nu time; mu space link + + // staple forwards in tau + WilsonLoops::StapleUpper(staple, U, mu, nu); + staple = staple * beta_xdim; + dSdU_mu += staple; + + // staple backwards in tau + WilsonLoops::StapleLower(staple, U, mu, nu); + staple = staple * beta_xdim_shifted; + dSdU_mu += staple; + } + } } + + dSdU_mu = Ta(Umu * dSdU_mu) * factor; + PokeIndex(dSdU, dSdU_mu, mu); + } + + + + }; +}; + + + +} } #endif diff --git a/lib/qcd/hmc/UsingHMC.md b/lib/qcd/hmc/UsingHMC.md new file mode 100644 index 00000000..da3c3c00 --- /dev/null +++ b/lib/qcd/hmc/UsingHMC.md @@ -0,0 +1,107 @@ +Using HMC in Grid version 0.5.1 + +These are the instructions to use the Generalised HMC on Grid version 0.5.1. +Disclaimer: GRID is still under active development so any information here can be changed in future releases. + + +Command line options +=================== +(relevant file GenericHMCrunner.h) +The initial configuration can be changed at the command line using +--StartType +valid choices, one among these +HotStart, ColdStart, TepidStart, CheckpointStart +default: HotStart + +example +./My_hmc_exec --StartType HotStart + +The CheckpointStart option uses the prefix for the configurations and rng seed files defined in your executable and the initial configuration is specified by +--StartTrajectory +default: 0 + +The number of trajectories for a specific run are specified at command line by +--Trajectories +default: 1 + +The number of thermalization steps (i.e. steps when the Metropolis acceptance check is turned off) is specified by +--Thermalizations +default: 10 + + +Any other parameter is defined in the source for the executable. + +HMC controls +=========== + +The lines + + std::vector SerSeed({1, 2, 3, 4, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); + +define the seeds for the serial and the parallel RNG. + +The line + + TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + +declares the number of molecular dynamics steps and the total trajectory length. + + +Actions +====== + +Action names are defined in the file +lib/qcd/Actions.h + +Gauge actions list: + +WilsonGaugeActionR; +WilsonGaugeActionF; +WilsonGaugeActionD; +PlaqPlusRectangleActionR; +PlaqPlusRectangleActionF; +PlaqPlusRectangleActionD; +IwasakiGaugeActionR; +IwasakiGaugeActionF; +IwasakiGaugeActionD; +SymanzikGaugeActionR; +SymanzikGaugeActionF; +SymanzikGaugeActionD; + + +ConjugateWilsonGaugeActionR; +ConjugateWilsonGaugeActionF; +ConjugateWilsonGaugeActionD; +ConjugatePlaqPlusRectangleActionR; +ConjugatePlaqPlusRectangleActionF; +ConjugatePlaqPlusRectangleActionD; +ConjugateIwasakiGaugeActionR; +ConjugateIwasakiGaugeActionF; +ConjugateIwasakiGaugeActionD; +ConjugateSymanzikGaugeActionR; +ConjugateSymanzikGaugeActionF; +ConjugateSymanzikGaugeActionD; + + +ScalarActionR; +ScalarActionF; +ScalarActionD; + + +each of these action accept one single parameter at creation time (beta). +Example for creating a Symanzik action with beta=4.0 + + SymanzikGaugeActionR(4.0) + +The suffixes R,F,D in the action names refer to the Real +(the precision is defined at compile time by the --enable-precision flag in the configure), +Float and Double, that force the precision of the action to be 32, 64 bit respectively. + + + + + + + + diff --git a/lib/qcd/utils/WilsonLoops.h b/lib/qcd/utils/WilsonLoops.h index 10022f50..3051f830 100644 --- a/lib/qcd/utils/WilsonLoops.h +++ b/lib/qcd/utils/WilsonLoops.h @@ -86,8 +86,7 @@ public: // sum over all x,y,z,t and over all planes of plaquette ////////////////////////////////////////////////// static RealD sumPlaquette(const GaugeLorentz &Umu) { - std::vector U(4, Umu._grid); - + std::vector U(Nd, Umu._grid); for (int mu = 0; mu < Nd; mu++) { U[mu] = PeekIndex(Umu, mu); } @@ -95,11 +94,12 @@ public: LatticeComplex Plaq(Umu._grid); sitePlaquette(Plaq, U); - TComplex Tp = sum(Plaq); Complex p = TensorRemove(Tp); return p.real(); } + + ////////////////////////////////////////////////// // average over all x,y,z,t and over all planes of plaquette ////////////////////////////////////////////////// @@ -114,7 +114,7 @@ public: // average over traced single links ////////////////////////////////////////////////// static RealD linkTrace(const GaugeLorentz &Umu) { - std::vector U(4, Umu._grid); + std::vector U(Nd, Umu._grid); LatticeComplex Tr(Umu._grid); Tr = zero; @@ -139,7 +139,7 @@ public: GridBase *grid = Umu._grid; - std::vector U(4, grid); + std::vector U(Nd, grid); for (int d = 0; d < Nd; d++) { U[d] = PeekIndex(Umu, d); } @@ -233,7 +233,7 @@ public: if (nu != mu) { GridBase *grid = Umu._grid; - std::vector U(4, grid); + std::vector U(Nd, grid); for (int d = 0; d < Nd; d++) { U[d] = PeekIndex(Umu, d); } @@ -256,6 +256,37 @@ public: } } + ////////////////////////////////////////////////// + // the sum over all staples on each site in direction mu,nu, lower part + ////////////////////////////////////////////////// + static void StapleLower(GaugeMat &staple, const GaugeLorentz &Umu, int mu, + int nu) { + staple = zero; + + if (nu != mu) { + GridBase *grid = Umu._grid; + + std::vector U(Nd, grid); + for (int d = 0; d < Nd; d++) { + U[d] = PeekIndex(Umu, d); + } + + // mu + // ^ + // |__> nu + + // __ + // | + // |__ + // + // + staple += Gimpl::ShiftStaple( + Gimpl::CovShiftBackward(U[nu], nu, + Gimpl::CovShiftBackward(U[mu], mu, U[nu])), + mu); + } + } + ////////////////////////////////////////////////////// // Similar to above for rectangle is required ////////////////////////////////////////////////////// @@ -375,8 +406,8 @@ public: // |___ ___| // - // tmp= Staple2x1* Cshift(U[mu],mu,-2); - // Stap+= Cshift(tmp,mu,1) ; + // tmp= Staple2x1* Cshift(U[mu],mu,-2); + // Stap+= Cshift(tmp,mu,1) ; Stap += Cshift(Staple2x1, mu, 1) * Cshift(U[mu], mu, -1); ; diff --git a/tests/hmc/Make.inc b/tests/hmc/Make.inc index b37d797e..f4a3603f 100644 --- a/tests/hmc/Make.inc +++ b/tests/hmc/Make.inc @@ -1,5 +1,5 @@ -tests: Test_hmc_EODWFRatio_Binary Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio -EXTRA_PROGRAMS = Test_hmc_EODWFRatio_Binary Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +tests: Test_hmc_EODWFRatio_Binary Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge_Binary Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio +EXTRA_PROGRAMS = Test_hmc_EODWFRatio_Binary Test_hmc_EODWFRatio Test_hmc_EODWFRatio_Gparity Test_hmc_EOWilsonFermionGauge Test_hmc_EOWilsonRatio Test_hmc_GparityIwasakiGauge Test_hmc_GparityWilsonGauge Test_hmc_IwasakiGauge Test_hmc_RectGauge Test_hmc_ScalarAction Test_hmc_WilsonAdjointFermionGauge Test_hmc_WilsonFermionGauge_Binary Test_hmc_WilsonFermionGauge Test_hmc_WilsonGauge_Binary Test_hmc_WilsonGauge Test_hmc_WilsonMixedRepresentationsFermionGauge Test_hmc_WilsonRatio Test_hmc_WilsonTwoIndexSymmetricFermionGauge Test_multishift_sqrt Test_remez Test_rhmc_EOWilson1p1 Test_rhmc_EOWilsonRatio Test_rhmc_Wilson1p1 Test_rhmc_WilsonRatio Test_hmc_EODWFRatio_Binary_SOURCES=Test_hmc_EODWFRatio_Binary.cc Test_hmc_EODWFRatio_Binary_LDADD=-lGrid @@ -40,6 +40,9 @@ Test_hmc_WilsonFermionGauge_Binary_LDADD=-lGrid Test_hmc_WilsonFermionGauge_SOURCES=Test_hmc_WilsonFermionGauge.cc Test_hmc_WilsonFermionGauge_LDADD=-lGrid +Test_hmc_WilsonGauge_Binary_SOURCES=Test_hmc_WilsonGauge_Binary.cc +Test_hmc_WilsonGauge_Binary_LDADD=-lGrid + Test_hmc_WilsonGauge_SOURCES=Test_hmc_WilsonGauge.cc Test_hmc_WilsonGauge_LDADD=-lGrid diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index cd35968a..a7fb4db1 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -78,7 +78,8 @@ class HmcRunner : public BinaryHmcRunner { LatticeGaugeField U(UGrid); // Gauge action - IwasakiGaugeActionR Iaction(4.0); + double beta = 4.0; + IwasakiGaugeActionR Iaction(beta); Real mass = 0.04; Real pv = 1.0; @@ -87,7 +88,9 @@ class HmcRunner : public BinaryHmcRunner { FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale); FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale); - ConjugateGradient CG(1.0e-8,10000); + double StoppingCondition = 1.0e-8; + double MaxCGIterations = 10000; + ConjugateGradient CG(StoppingCondition,MaxCGIterations); TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); // Set smearing (true/false), default: false @@ -98,6 +101,9 @@ class HmcRunner : public BinaryHmcRunner { ActionLevel Level1(1); Level1.push_back(&Nf2); + // this level will integrate with a + // step that is 4 times finer + // than the previous level ActionLevel Level2(4); Level2.push_back(&Iaction); diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc new file mode 100644 index 00000000..d6041679 --- /dev/null +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -0,0 +1,136 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_hmc_WilsonFermionGauge.cc + +Copyright (C) 2015 + +Author: Peter Boyle +Author: neo +Author: Guido Cossu + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +namespace Grid { +namespace QCD { + +class HMCRunnerParameters : Serializable { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, + double, beta, + double, mass, + int, MaxCGIterations, + double, StoppingCondition, + bool, smearedAction, + int, SaveInterval, + std::string, format, + std::string, conf_prefix, + std::string, rng_prefix, + double, rho, + int, SmearingLevels, + ); + + HMCRunnerParameters() {} +}; + +// Derive from the BinaryHmcRunner (templated for gauge fields) +class HmcRunner : public BinaryHmcRunner { + public: + void BuildTheAction(int argc, char **argv) + + { + typedef WilsonImplR ImplPolicy; + typedef WilsonFermionR FermionAction; + typedef typename FermionAction::FermionField FermionField; + + UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); + UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + FGrid = UGrid; + FrbGrid = UrbGrid; + + // temporarily need a gauge field + LatticeGaugeField U(UGrid); + + // Gauge action + int Ls = UGrid->_gdimensions[Nd - 1]; + std::vector betat(Ls,5); + std::vector betas(Ls); + betas={5,6,6,5}; + std:cout << "Betas:" << betas << std::endl; + VariableWilsonGaugeActionR Waction(betas, betat, UGrid); + //WilsonGaugeActionR Waction(5.6); + + // Collect actions + ActionLevel Level1(1); + Level1.push_back(&Waction); + TheAction.push_back(Level1); + + // Add observables + int SaveInterval = 1; + std::string format = std::string("IEEE64BIG"); + std::string conf_prefix = std::string("ckpoint_lat"); + std::string rng_prefix = std::string("ckpoint_rng"); + BinaryHmcCheckpointer Checkpoint( + conf_prefix, rng_prefix, SaveInterval, format); + // Can implement also a specific function in the hmcrunner + // AddCheckpoint (...) that takes the same parameters + a string/tag + // defining the type of the checkpointer + // with tags can be implemented by overloading and no ifs + // Then force all checkpoint to have few common functions + // return an object that is then passed to the Run function + + PlaquetteLogger PlaqLog( + std::string("Plaquette")); + ObservablesList.push_back(&PlaqLog); + ObservablesList.push_back(&Checkpoint); + + Run(argc, argv, Checkpoint); // no smearing + }; +}; +} +} + +int main(int argc, char **argv) { + Grid_init(&argc, &argv); + + int threads = GridThread::GetThreads(); + std::cout << GridLogMessage << "Grid is setup to use " << threads + << " threads" << std::endl; + + HmcRunner TheHMC; + + // Seeds for the random number generators + std::vector SerSeed({1, 2, 3, 4, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); + TheHMC.RNGSeeds(SerSeed, ParSeed); + + TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + + TheHMC.BuildTheAction(argc, argv); +} From 8c65bdf6d345314cb4ce2bcb9ac81667cd944299 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 19 Oct 2016 16:56:11 +0100 Subject: [PATCH 074/807] Printing checksum for the RNG file --- lib/parallelIO/BinaryIO.h | 4 ++++ lib/qcd/action/gauge/GaugeImpl.h | 1 + tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 2 ++ tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 2 ++ 4 files changed, 9 insertions(+) diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 3265ba54..9dab4d24 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -372,6 +372,8 @@ class BinaryIO { if (grid->IsBoss()) fout.close(); + std::cout << GridLogMessage << "RNG file checksum " << csum << std::endl; + return csum; } static inline uint32_t readRNGSerial(GridSerialRNG &serial,GridParallelRNG ¶llel,std::string file,int offset) @@ -421,6 +423,8 @@ class BinaryIO { Uint32Checksum((uint32_t *)&saved[0],bytes,csum); } + std::cout << GridLogMessage << "RNG file checksum " << csum << std::endl; + grid->Broadcast(0,(void *)&csum,sizeof(csum)); return csum; diff --git a/lib/qcd/action/gauge/GaugeImpl.h b/lib/qcd/action/gauge/GaugeImpl.h index 08fbfa68..3448062b 100644 --- a/lib/qcd/action/gauge/GaugeImpl.h +++ b/lib/qcd/action/gauge/GaugeImpl.h @@ -85,6 +85,7 @@ public: LinkField Pmu(P._grid); Pmu = zero; for (int mu = 0; mu < Nd; mu++) { + std::cout << "generating momenta " << mu << "\n"; SU::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu); PokeIndex(P, Pmu, mu); } diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index a7fb4db1..0b912c66 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -161,4 +161,6 @@ int main(int argc, char **argv) { TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); + + Grid_finalize(); } diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index d6041679..e1f1e8df 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -133,4 +133,6 @@ int main(int argc, char **argv) { TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); + + Grid_finalize(); } From 590675e2ca765f56478a75c7d6a3f9997852ea87 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 19 Oct 2016 17:26:25 +0100 Subject: [PATCH 075/807] Csum in hex format --- lib/lattice/Lattice_rng.h | 98 ++++++++++++++++++++------------------- lib/parallelIO/BinaryIO.h | 6 +-- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index 3254af30..ae61224a 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -130,14 +130,14 @@ namespace Grid { ss<<_generators[gen]; ss.seekg(0,ss.beg); for(int i=0;i>saved[i]; + ss>>saved[i]; } } void SetState(std::vector & saved,int gen){ assert(saved.size()==RngStateCount); std::stringstream ss; for(int i=0;i>_generators[gen]; @@ -178,7 +178,7 @@ namespace Grid { dist[0].reset(); for(int idx=0;idxGlobalIndexToGlobalCoor(gidx,gcoor); - _grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); + int rank,o_idx,i_idx; + _grid->GlobalIndexToGlobalCoor(gidx,gcoor); + _grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); - int l_idx=generator_idx(o_idx,i_idx); - - std::vector site_seeds(4); - for(int i=0;i<4;i++){ - site_seeds[i]= ui(pseeder); - } + int l_idx=generator_idx(o_idx,i_idx); + + std::vector site_seeds(4); + for(int i=0;i<4;i++){ + site_seeds[i]= ui(pseeder); + } - _grid->Broadcast(0,(void *)&site_seeds[0],sizeof(int)*site_seeds.size()); + _grid->Broadcast(0,(void *)&site_seeds[0],sizeof(int)*site_seeds.size()); - if( rank == _grid->ThisRank() ){ - fixedSeed ssrc(site_seeds); - typename source::result_type sinit = ssrc(); - _generators[l_idx] = RngEngine(sinit); - } + if( rank == _grid->ThisRank() ){ + fixedSeed ssrc(site_seeds); + typename source::result_type sinit = ssrc(); + _generators[l_idx] = RngEngine(sinit); + } } _seeded=1; } @@ -317,51 +317,53 @@ namespace Grid { //void SaveState(const std::string &file); //void LoadState(const std::string &file); - template inline void fill(Lattice &l,std::vector &dist){ - + template + inline void fill(Lattice &l, std::vector &dist) { typedef typename vobj::scalar_object scalar_object; typedef typename vobj::scalar_type scalar_type; typedef typename vobj::vector_type vector_type; - - int multiplicity = RNGfillable(_grid,l._grid); - int Nsimd =_grid->Nsimd(); - int osites=_grid->oSites(); - int words=sizeof(scalar_object)/sizeof(scalar_type); + int multiplicity = RNGfillable(_grid, l._grid); + int Nsimd = _grid->Nsimd(); + int osites = _grid->oSites(); + int words = sizeof(scalar_object) / sizeof(scalar_type); -PARALLEL_FOR_LOOP - for(int ss=0;ss buf(Nsimd); - for(int m=0;m buf(Nsimd); + for (int m = 0; m < multiplicity; + m++) { // Draw from same generator multiplicity times - int sm=multiplicity*ss+m; // Maps the generator site to the fine site + int sm = multiplicity * ss + + m; // Maps the generator site to the fine site - for(int si=0;si &seeds){ + void SeedFixedIntegers(const std::vector &seeds) { fixedSeed src(seeds); Seed(src); } - }; template inline void random(GridParallelRNG &rng,Lattice &l){ diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 9dab4d24..cdcb1989 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -372,8 +372,8 @@ class BinaryIO { if (grid->IsBoss()) fout.close(); - std::cout << GridLogMessage << "RNG file checksum " << csum << std::endl; - + std::cout << GridLogMessage << "RNG file checksum " << std::hex << csum << std::dec << std::endl; + return csum; } static inline uint32_t readRNGSerial(GridSerialRNG &serial,GridParallelRNG ¶llel,std::string file,int offset) @@ -423,7 +423,7 @@ class BinaryIO { Uint32Checksum((uint32_t *)&saved[0],bytes,csum); } - std::cout << GridLogMessage << "RNG file checksum " << csum << std::endl; + std::cout << GridLogMessage << "RNG file checksum " << std::hex << csum << std::dec << std::endl; grid->Broadcast(0,(void *)&csum,sizeof(csum)); From 6e4a06e180f7500df13ceea362b71294b8da74ff Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 20 Oct 2016 15:04:00 +0100 Subject: [PATCH 076/807] qed-fvol: initial commit --- Makefile.am | 2 +- configure.ac | 2 ++ programs/Makefile.am | 1 + programs/qed-fvol/Global.cc | 11 +++++++++ programs/qed-fvol/Global.hpp | 42 +++++++++++++++++++++++++++++++++++ programs/qed-fvol/Makefile.am | 9 ++++++++ programs/qed-fvol/qed-fvol.cc | 36 ++++++++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 programs/Makefile.am create mode 100644 programs/qed-fvol/Global.cc create mode 100644 programs/qed-fvol/Global.hpp create mode 100644 programs/qed-fvol/Makefile.am create mode 100644 programs/qed-fvol/qed-fvol.cc diff --git a/Makefile.am b/Makefile.am index 90c5cd71..8cc860a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # additional include paths necessary to compile the C++ library -SUBDIRS = lib benchmarks tests +SUBDIRS = lib benchmarks tests programs AM_CXXFLAGS += -I$(top_builddir)/include ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 7bcdc49f..81ced467 100644 --- a/configure.ac +++ b/configure.ac @@ -326,6 +326,8 @@ AC_CONFIG_FILES(tests/hmc/Makefile) AC_CONFIG_FILES(tests/solver/Makefile) AC_CONFIG_FILES(tests/qdpxx/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) +AC_CONFIG_FILES(programs/Makefile) +AC_CONFIG_FILES(programs/qed-fvol/Makefile) AC_OUTPUT echo " diff --git a/programs/Makefile.am b/programs/Makefile.am new file mode 100644 index 00000000..ff7f6584 --- /dev/null +++ b/programs/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = qed-fvol diff --git a/programs/qed-fvol/Global.cc b/programs/qed-fvol/Global.cc new file mode 100644 index 00000000..57ed97cc --- /dev/null +++ b/programs/qed-fvol/Global.cc @@ -0,0 +1,11 @@ +#include + +using namespace Grid; +using namespace QCD; +using namespace QedFVol; + +QedFVolLogger QedFVol::QedFVolLogError(1,"Error"); +QedFVolLogger QedFVol::QedFVolLogWarning(1,"Warning"); +QedFVolLogger QedFVol::QedFVolLogMessage(1,"Message"); +QedFVolLogger QedFVol::QedFVolLogIterative(1,"Iterative"); +QedFVolLogger QedFVol::QedFVolLogDebug(1,"Debug"); diff --git a/programs/qed-fvol/Global.hpp b/programs/qed-fvol/Global.hpp new file mode 100644 index 00000000..7f07200d --- /dev/null +++ b/programs/qed-fvol/Global.hpp @@ -0,0 +1,42 @@ +#ifndef QedFVol_Global_hpp_ +#define QedFVol_Global_hpp_ + +#include + +#define BEGIN_QEDFVOL_NAMESPACE \ +namespace Grid {\ +using namespace QCD;\ +namespace QedFVol {\ +using Grid::operator<<; +#define END_QEDFVOL_NAMESPACE }} + +/* the 'using Grid::operator<<;' statement prevents a very nasty compilation + * error with GCC (clang compiles fine without it). + */ + +BEGIN_QEDFVOL_NAMESPACE + +class QedFVolLogger: public Logger +{ +public: + QedFVolLogger(int on, std::string nm): Logger("QedFVol", on, nm, + GridLogColours, "BLACK"){}; +}; + +#define LOG(channel) std::cout << QedFVolLog##channel +#define QEDFVOL_ERROR(msg)\ +LOG(Error) << msg << " (" << __FUNCTION__ << " at " << __FILE__ << ":"\ + << __LINE__ << ")" << std::endl;\ +abort(); + +#define DEBUG_VAR(var) LOG(Debug) << #var << "= " << (var) << std::endl; + +extern QedFVolLogger QedFVolLogError; +extern QedFVolLogger QedFVolLogWarning; +extern QedFVolLogger QedFVolLogMessage; +extern QedFVolLogger QedFVolLogIterative; +extern QedFVolLogger QedFVolLogDebug; + +END_QEDFVOL_NAMESPACE + +#endif // QedFVol_Global_hpp_ diff --git a/programs/qed-fvol/Makefile.am b/programs/qed-fvol/Makefile.am new file mode 100644 index 00000000..cd762e94 --- /dev/null +++ b/programs/qed-fvol/Makefile.am @@ -0,0 +1,9 @@ +AM_CXXFLAGS += -I$(top_srcdir)/programs -I../$(top_srcdir)/programs + +bin_PROGRAMS = qed-fvol + +qed_fvol_SOURCES = \ + qed-fvol.cc \ + Global.cc + +qed_fvol_LDADD = -lGrid diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc new file mode 100644 index 00000000..bb3204c6 --- /dev/null +++ b/programs/qed-fvol/qed-fvol.cc @@ -0,0 +1,36 @@ +#include + +using namespace Grid; +using namespace QCD; +using namespace QedFVol; + +int main(int argc, char *argv[]) +{ + // parse command line + std::string parameterFileName; + + if (argc < 2) + { + std::cerr << "usage: " << argv[0] << " [Grid options]"; + std::cerr << std::endl; + std::exit(EXIT_FAILURE); + } + parameterFileName = argv[1]; + + // initialization + Grid_init(&argc, &argv); + QedFVolLogError.Active(GridLogError.isActive()); + QedFVolLogWarning.Active(GridLogWarning.isActive()); + QedFVolLogMessage.Active(GridLogMessage.isActive()); + QedFVolLogIterative.Active(GridLogIterative.isActive()); + QedFVolLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << std::endl; + + + + // epilogue + LOG(Message) << "Grid is finalizing now" << std::endl; + Grid_finalize(); + + return EXIT_SUCCESS; +} From 977d8443946a868360902c367d9488f41ce4533b Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 20 Oct 2016 17:01:59 +0100 Subject: [PATCH 077/807] Few modifications on stdout messages --- lib/parallelIO/NerscIO.h | 2 -- lib/qcd/action/gauge/GaugeImpl.h | 1 - tests/IO/Test_nersc_io.cc | 3 ++- tests/hmc/Test_hmc_WilsonFermionGauge.cc | 2 +- tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 2 +- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 6 +++--- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/parallelIO/NerscIO.h b/lib/parallelIO/NerscIO.h index ecd7527a..6fdf83ef 100644 --- a/lib/parallelIO/NerscIO.h +++ b/lib/parallelIO/NerscIO.h @@ -513,8 +513,6 @@ static inline void readRNGState(GridSerialRNG &serial,GridParallelRNG & parallel // munger is a function of uint32_t csum=BinaryIO::readRNGSerial(serial,parallel,file,offset); - std::cerr<<" Csum "<< csum << " "<< header.checksum <::GaussianFundamentalLieAlgebraMatrix(pRNG, Pmu); PokeIndex(P, Pmu, mu); } diff --git a/tests/IO/Test_nersc_io.cc b/tests/IO/Test_nersc_io.cc index 0273d02a..16514d9e 100644 --- a/tests/IO/Test_nersc_io.cc +++ b/tests/IO/Test_nersc_io.cc @@ -41,7 +41,7 @@ int main (int argc, char ** argv) std::vector simd_layout = GridDefaultSimd(4,vComplex::Nsimd()); std::vector mpi_layout = GridDefaultMpi(); - std::vector latt_size ({16,16,16,32}); + std::vector latt_size ({32,32,32,32}); std::vector clatt_size ({4,4,4,8}); int orthodir=3; int orthosz =latt_size[orthodir]; @@ -73,6 +73,7 @@ int main (int argc, char ** argv) random(sRNGb,b); std::cout << " serial RNG numbers "< Nf2(FermOp, CG, CG); // Set smearing (true/false), default: false - Nf2.is_smeared = true; + Nf2.is_smeared = false; // Collect actions ActionLevel Level1(1); diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 9024b4e2..e81c212d 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -151,7 +151,7 @@ int main(int argc, char **argv) { std::vector ParSeed({6, 7, 8, 9, 10}); TheHMC.RNGSeeds(SerSeed, ParSeed); - TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + TheHMC.MDparameters.set(5, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); } diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index e1f1e8df..098e23e4 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -82,9 +82,9 @@ class HmcRunner : public BinaryHmcRunner { std::vector betat(Ls,5); std::vector betas(Ls); betas={5,6,6,5}; - std:cout << "Betas:" << betas << std::endl; - VariableWilsonGaugeActionR Waction(betas, betat, UGrid); - //WilsonGaugeActionR Waction(5.6); + //std:cout << "Betas:" << betas << std::endl; + //VariableWilsonGaugeActionR Waction(betas, betat, UGrid); + WilsonGaugeActionR Waction(5.6); // Collect actions ActionLevel Level1(1); From deef2673b2d13de0308724db7733f61e236268f7 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 20 Oct 2016 17:24:08 +0100 Subject: [PATCH 078/807] Separating the Lattice theories stub from the QCD.h file --- lib/qcd/LatticeTheories.h | 119 ++++++++++++++++++++++++++++++++++++++ lib/qcd/QCD.h | 66 --------------------- 2 files changed, 119 insertions(+), 66 deletions(-) create mode 100644 lib/qcd/LatticeTheories.h diff --git a/lib/qcd/LatticeTheories.h b/lib/qcd/LatticeTheories.h new file mode 100644 index 00000000..981c7577 --- /dev/null +++ b/lib/qcd/LatticeTheories.h @@ -0,0 +1,119 @@ + /************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/qcd/QCD.h + + Copyright (C) 2015 + +Author: Azusa Yamaguchi +Author: Peter Boyle +Author: Peter Boyle +Author: neo +Author: paboyle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution directory + *************************************************************************************/ + /* END LEGAL */ +#ifndef GRID_LT_H +#define GRID_LT_H +namespace Grid{ + +// First steps in the complete generalization of the Physics part +namespace LatticeTheories { + +template +struct LatticeTheory { + static const int Nd = Dimensions; + static const int Nds = Dimensions * 2; // double stored field + template + using iSinglet = iScalar > >; +}; + +template +struct LatticeGaugeTheory : public LatticeTheory { + static const int Nds = Dimensions * 2; + static const int Nd = Dimensions; + static const int Nc = Colours; + + template + using iColourMatrix = iScalar > >; + template + using iLorentzColourMatrix = iVector >, Nd>; + template + using iDoubleStoredColourMatrix = iVector >, Nds>; + template + using iColourVector = iScalar > >; +}; + +template +struct FermionicLatticeGaugeTheory + : public LatticeGaugeTheory { + static const int Nd = Dimensions; + static const int Nds = Dimensions * 2; + static const int Nc = Colours; + static const int Ns = Spin; + + template + using iSpinMatrix = iScalar, Ns> >; + template + using iSpinColourMatrix = iScalar, Ns> >; + template + using iSpinVector = iScalar, Ns> >; + template + using iSpinColourVector = iScalar, Ns> >; + // These 2 only if Spin is a multiple of 2 + static const int Nhs = Spin / 2; + template + using iHalfSpinVector = iScalar, Nhs> >; + template + using iHalfSpinColourVector = iScalar, Nhs> >; +}; + +// Examples, not complete now. +struct QCD : public FermionicLatticeGaugeTheory<4, 3, 4> { + static const int Xp = 0; + static const int Yp = 1; + static const int Zp = 2; + static const int Tp = 3; + static const int Xm = 4; + static const int Ym = 5; + static const int Zm = 6; + static const int Tm = 7; + + typedef FermionicLatticeGaugeTheory FLGT; + + typedef FLGT::iColourMatrix ColourMatrix; + typedef FLGT::iColourMatrix ColourMatrixF; + typedef FLGT::iColourMatrix ColourMatrixD; + + typedef FLGT::iSpinMatrix SpinMatrix; + typedef FLGT::iSpinMatrix SpinMatrixF; + typedef FLGT::iSpinMatrix SpinMatrixD; + +}; +struct QED : public FermionicLatticeGaugeTheory<4, 1, 4> {//fill +}; + +template +struct Scalar : public LatticeTheory {}; + +}; // LatticeTheories + +} // Grid + +#endif diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index 61313f33..e08c3dc8 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -32,72 +32,6 @@ Author: paboyle #ifndef GRID_QCD_H #define GRID_QCD_H namespace Grid{ - -// First steps in the complete generalization of the Physics part -namespace LatticeTheories { - -template -struct LatticeTheory { - static const int Nd = Dimensions; - static const int Nds = Dimensions * 2; // double stored field - template - using iSinglet = iScalar > >; -}; - -template -struct LatticeGaugeTheory : public LatticeTheory { - static const int Nds = Dimensions * 2; - static const int Nd = Dimensions; - static const int Nc = Colours; - - template - using iColourMatrix = iScalar > >; - template - using iLorentzColourMatrix = iVector >, Nd>; - template - using iDoubleStoredColourMatrix = iVector >, Nds>; - template - using iColourVector = iScalar > >; -}; - -template -struct FermionicLatticeGaugeTheory - : public LatticeGaugeTheory { - static const int Nd = Dimensions; - static const int Nds = Dimensions * 2; - static const int Nc = Colours; - static const int Ns = Spin; - - template - using iSpinMatrix = iScalar, Ns> >; - template - using iSpinColourMatrix = iScalar, Ns> >; - template - using iSpinVector = iScalar, Ns> >; - template - using iSpinColourVector = iScalar, Ns> >; - // These 2 only is Spin is a multiple of 2 - static const int Nhs = Spin / 2; - template - using iHalfSpinVector = iScalar, Nhs> >; - template - using iHalfSpinColourVector = iScalar, Nhs> >; -}; - -struct QCD : public FermionicLatticeGaugeTheory<4, 3, 4> { - typedef FermionicLatticeGaugeTheory FLGT; - typedef FLGT::iSpinMatrix SpinMatrix; - typedef FLGT::iSpinMatrix SpinMatrixF; - typedef FLGT::iSpinMatrix SpinMatrixD; - -}; -struct QED : public FermionicLatticeGaugeTheory<4, 1, 4> {}; - -template -struct Scalar : public LatticeTheory {}; - -} // LatticeTheories - namespace QCD { From 392130a53738b8dda3c5cbb046f70f23b3ed2b91 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 21 Oct 2016 14:22:25 +0100 Subject: [PATCH 079/807] Working on the 5d --- lib/qcd/LatticeTheories.h | 51 ++-- lib/qcd/QCD.h | 2 +- lib/qcd/action/gauge/WilsonGaugeAction.h | 174 ++++++++------ lib/qcd/hmc/GenericHMCrunner.h | 294 ++++++++++++----------- lib/qcd/hmc/HMC.h | 1 - lib/qcd/hmc/integrators/Integrator.h | 8 - lib/qcd/utils/WilsonLoops.h | 4 +- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 14 +- 8 files changed, 286 insertions(+), 262 deletions(-) diff --git a/lib/qcd/LatticeTheories.h b/lib/qcd/LatticeTheories.h index 981c7577..74c68d83 100644 --- a/lib/qcd/LatticeTheories.h +++ b/lib/qcd/LatticeTheories.h @@ -1,10 +1,10 @@ - /************************************************************************************* +/************************************************************************************* - Grid physics library, www.github.com/paboyle/Grid +Grid physics library, www.github.com/paboyle/Grid - Source file: ./lib/qcd/QCD.h +Source file: ./lib/qcd/QCD.h - Copyright (C) 2015 +Copyright (C) 2015 Author: Azusa Yamaguchi Author: Peter Boyle @@ -12,28 +12,30 @@ Author: Peter Boyle Author: neo Author: paboyle - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - See the full license in the file "LICENSE" in the top level distribution directory - *************************************************************************************/ - /* END LEGAL */ +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ #ifndef GRID_LT_H #define GRID_LT_H namespace Grid{ // First steps in the complete generalization of the Physics part +// Design not final namespace LatticeTheories { template @@ -50,7 +52,7 @@ struct LatticeGaugeTheory : public LatticeTheory { static const int Nd = Dimensions; static const int Nc = Colours; - template + template using iColourMatrix = iScalar > >; template using iLorentzColourMatrix = iVector >, Nd>; @@ -82,6 +84,13 @@ struct FermionicLatticeGaugeTheory using iHalfSpinVector = iScalar, Nhs> >; template using iHalfSpinColourVector = iScalar, Nhs> >; + + //tests + typedef iColourMatrix ColourMatrix; + typedef iColourMatrix ColourMatrixF; + typedef iColourMatrix ColourMatrixD; + + }; // Examples, not complete now. @@ -97,10 +106,6 @@ struct QCD : public FermionicLatticeGaugeTheory<4, 3, 4> { typedef FermionicLatticeGaugeTheory FLGT; - typedef FLGT::iColourMatrix ColourMatrix; - typedef FLGT::iColourMatrix ColourMatrixF; - typedef FLGT::iColourMatrix ColourMatrixD; - typedef FLGT::iSpinMatrix SpinMatrix; typedef FLGT::iSpinMatrix SpinMatrixF; typedef FLGT::iSpinMatrix SpinMatrixD; diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index e08c3dc8..0d8c28bc 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -46,7 +46,7 @@ namespace QCD { static const int Nc=3; static const int Ns=4; - static const int Nd=4; + static const int Nd=5; static const int Nhs=2; // half spinor static const int Nds=8; // double stored gauge field static const int Ngp=2; // gparity index range diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/lib/qcd/action/gauge/WilsonGaugeAction.h index 686c5470..059fcc58 100644 --- a/lib/qcd/action/gauge/WilsonGaugeAction.h +++ b/lib/qcd/action/gauge/WilsonGaugeAction.h @@ -76,7 +76,7 @@ class WilsonGaugeAction : public Action { // Staple in direction mu WilsonLoops::Staple(dSdU_mu, U, mu); dSdU_mu = Ta(Umu * dSdU_mu) * factor; - + PokeIndex(dSdU, dSdU_mu, mu); } }; @@ -88,57 +88,70 @@ class VariableWilsonGaugeAction : public Action { INHERIT_GIMPL_TYPES(Gimpl); private: - std::vector b_bulk;// bulk couplings - std::vector b_xdim;//extra dimension couplings + std::vector b_bulk; // bulk couplings + std::vector b_xdim; // extra dimension couplings GridBase *grid; LatticeComplex beta_xdim; LatticeComplex beta_xdim_shifted; LatticeComplex beta_bulk; + int bulk_volume; + public: VariableWilsonGaugeAction(std::vector bulk, std::vector xdim, - GridBase *_grid) + GridBase *_grid, bool openBC = false) : b_bulk(bulk), b_xdim(xdim), grid(_grid), beta_xdim(grid), beta_xdim_shifted(grid), - beta_bulk(grid) - { - //check that the grid is ok - //todo - int Ndim = Nd;//change later + beta_bulk(grid) { + // check that the grid is ok + // todo + int Ndim = Nd; // change later - LatticeComplex temp(grid); + std::vector FullDim = grid->GlobalDimensions(); + bulk_volume = 1; + for (int s = 0; s < Ndim - 1; s++) bulk_volume *= FullDim[s]; - Lattice > coor(grid); + LatticeComplex temp(grid); - LatticeCoordinate(coor, Ndim - 1); + Lattice > coor(grid); - int Nex = grid->_fdimensions[Ndim - 1]; - assert(b_bulk.size() == Nex); - assert(b_xdim.size() == Nex); + LatticeCoordinate(coor, Ndim - 1); - beta_xdim = zero; - for (int tau = 0; tau < Nex; tau++) { - temp = b_xdim[tau]; - beta_xdim = where(coor == tau, temp, beta_xdim); - } + int Nex = FullDim[Ndim - 1]; + assert(b_bulk.size() == Nex); + assert(b_xdim.size() == Nex); - beta_xdim_shifted = Cshift(beta_xdim, Ndim - 1, -1); + beta_xdim = zero; + for (int tau = 0; tau < Nex - 1; tau++) { + temp = b_xdim[tau]; + beta_xdim = where(coor == tau, temp, beta_xdim); + } - beta_bulk = zero; - for (int tau = 0; tau < Nex; tau++) { - temp = b_bulk[tau]; - beta_bulk = where(coor == tau, temp, beta_bulk); - } - }; + if (!openBC) { + temp = b_xdim[Nex - 1]; + beta_xdim = where(coor == Nex - 1, temp, beta_xdim); + } + + beta_xdim_shifted = Cshift(beta_xdim, Ndim - 1, -1); + + beta_bulk = zero; + for (int tau = 0; tau < Nex; tau++) { + temp = b_bulk[tau]; + beta_bulk = where(coor == tau, temp, beta_bulk); + } + + std::cout << beta_xdim << std::endl; + std::cout << beta_xdim_shifted << std::endl; + }; virtual void refresh(const GaugeField &U, GridParallelRNG &pRNG){}; // noop as no pseudoferms virtual RealD S(const GaugeField &Umu) { - int Ndim = Nd; // change later for generality + int Ndim = Nd; // change later for generality conformable(grid, Umu._grid); std::vector U(Ndim, grid); @@ -150,19 +163,34 @@ class VariableWilsonGaugeAction : public Action { LatticeComplex dirPlaq(grid); LatticeComplex Plaq(grid); + LatticeComplex SumdirPlaq(grid); + RealD OneOnNc = 1.0 / Real(Nc); ///////////// // Lower dim plaquettes ///////////// Plaq = zero; + SumdirPlaq = zero; for (int mu = 1; mu < Ndim - 1; mu++) { for (int nu = 0; nu < mu; nu++) { WilsonLoops::traceDirPlaquette(dirPlaq, U, mu, nu); + SumdirPlaq += dirPlaq; Plaq = Plaq + (1.0 - dirPlaq * OneOnNc) * beta_bulk; } } + double faces = (1.0 * (Nd - 1) * (Nd - 2)) / 2.0; + SumdirPlaq *= OneOnNc / (RealD(bulk_volume) * faces); + + // print slices in the extra dimension + int Nex = grid->_fdimensions[Ndim - 1]; + std::vector plaq_ex(Nex); + sliceSum(SumdirPlaq, plaq_ex, Ndim - 1); + for (int ex = 0; ex < Nex; ex++) + std::cout << GridLogMessage << "Bulk plaq[" << ex + << "] = " << TensorRemove(plaq_ex[ex]).real() << std::endl; + ///////////// // Extra dimension ///////////// @@ -186,74 +214,66 @@ class VariableWilsonGaugeAction : public Action { // for the higher dimension plaquettes take the upper plaq of the // 4d slice and multiply by beta[s] and the lower and multiply by beta[s-1] - // todo // derivative of links mu = 0, ... Nd-1 inside plaq (mu,5) // for these I need upper and lower staples separated // each multiplied with their own beta // derivative of links mu = 5 // living on the same slice, share the same beta + conformable(grid, U._grid); + int Ndim = Nd; // change later + RealD factor = 0.5 / RealD(Nc); -conformable(grid,U._grid); -int Ndim = Nd; // change later -RealD factor = 0.5 / RealD(Nc); + GaugeLinkField Umu(grid); + GaugeLinkField dSdU_mu(grid); + GaugeLinkField staple(grid); -GaugeLinkField Umu(grid); -GaugeLinkField dSdU_mu(grid); -GaugeLinkField staple(grid); + for (int mu = 0; mu < Ndim; mu++) { + Umu = PeekIndex(U, mu); + dSdU_mu = zero; -for (int mu = 0; mu < Ndim; mu++) { - Umu = PeekIndex(U, mu); - dSdU_mu = zero; + for (int nu = 0; nu < Ndim; nu++) { + if (nu != mu) { + if ((mu < (Ndim - 1)) && (nu < (Ndim - 1))) { + // Spacelike case apply beta space + WilsonLoops::Staple(staple, U, mu, nu); + staple = staple * beta_bulk; + dSdU_mu += staple; - for (int nu = 0; nu < Ndim; nu++) { - if (nu != mu) { - if ((mu < (Ndim - 1)) && (nu < (Ndim - 1))) { - // Spacelike case apply beta space - WilsonLoops::Staple(staple, U, mu, nu); - staple = staple * beta_bulk; - dSdU_mu += staple; + } else if (mu == (Ndim - 1)) { + // nu space; mu time link + assert(nu < (Ndim - 1)); + assert(mu == (Ndim - 1)); - } else if (mu == (Ndim - 1)) { - // nu space; mu time link - assert(nu < (Ndim - 1)); - assert(mu == (Ndim - 1)); + // mu==tau dir link deriv, nu spatial + WilsonLoops::Staple(staple, U, mu, nu); + staple = staple * beta_xdim; + dSdU_mu += staple; - // mu==tau dir link deriv, nu spatial - WilsonLoops::Staple(staple, U, mu, nu); - staple = staple * beta_xdim; - dSdU_mu += staple; + } else { + assert(mu < (Ndim - 1)); + assert(nu == (Ndim - 1)); - } else { - assert(mu < (Ndim - 1)); - assert(nu == (Ndim - 1)); + // nu time; mu space link - // nu time; mu space link + // staple forwards in tau + WilsonLoops::StapleUpper(staple, U, mu, nu); + staple = staple * beta_xdim; + dSdU_mu += staple; - // staple forwards in tau - WilsonLoops::StapleUpper(staple, U, mu, nu); - staple = staple * beta_xdim; - dSdU_mu += staple; - - // staple backwards in tau - WilsonLoops::StapleLower(staple, U, mu, nu); - staple = staple * beta_xdim_shifted; - dSdU_mu += staple; + // staple backwards in tau + WilsonLoops::StapleLower(staple, U, mu, nu); + staple = staple * beta_xdim_shifted; + dSdU_mu += staple; + } + } } + + dSdU_mu = Ta(Umu * dSdU_mu) * factor; + PokeIndex(dSdU, dSdU_mu, mu); } - } - - dSdU_mu = Ta(Umu * dSdU_mu) * factor; - PokeIndex(dSdU, dSdU_mu, mu); - } - - - }; }; - - - } } diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index bad3b9cf..047b9c9e 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory -*************************************************************************************/ + See the full license in the file "LICENSE" in the top level distribution + directory + *************************************************************************************/ /* END LEGAL */ #ifndef GENERIC_HMC_RUNNER #define GENERIC_HMC_RUNNER @@ -33,165 +33,169 @@ directory namespace Grid { namespace QCD { -// Virtual Class for HMC specific for gauge theories -// implement a specific theory by defining the BuildTheAction -template -class BinaryHmcRunnerTemplate { - public: - INHERIT_FIELD_TYPES(Implementation); - typedef Implementation ImplPolicy; + // Virtual Class for HMC specific for gauge theories + // implement a specific theory by defining the BuildTheAction + template + class BinaryHmcRunnerTemplate { + public: + INHERIT_FIELD_TYPES(Implementation); + typedef Implementation ImplPolicy; - enum StartType_t { ColdStart, HotStart, TepidStart, CheckpointStart }; + enum StartType_t { ColdStart, + HotStart, + TepidStart, + CheckpointStart }; - ActionSet TheAction; - - // A vector of HmcObservable - // that can be injected from outside - std::vector< HmcObservable* > ObservablesList; + ActionSet TheAction; - IntegratorParameters MDparameters; + // A vector of HmcObservable + // that can be injected from outside + std::vector *> + ObservablesList; - GridCartesian *UGrid; - GridCartesian *FGrid; - GridRedBlackCartesian *UrbGrid; - GridRedBlackCartesian *FrbGrid; + IntegratorParameters MDparameters; - std::vector SerialSeed; - std::vector ParallelSeed; + GridCartesian * UGrid; + GridCartesian * FGrid; + GridRedBlackCartesian *UrbGrid; + GridRedBlackCartesian *FrbGrid; - void RNGSeeds(std::vector S, std::vector P){ - SerialSeed = S; - ParallelSeed = P; - } + std::vector SerialSeed; + std::vector ParallelSeed; - virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? + void RNGSeeds(std::vector S, std::vector P) { + SerialSeed = S; + ParallelSeed = P; + } - // A couple of wrapper classes - template - void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { - NoSmearing S; - Runner(argc, argv, Checkpoint, S); - } + virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? - template - void Run(int argc, char **argv, IOCheckpointer &CP, SmearingPolicy &S) { - Runner(argc, argv, CP, S); - } - ////////////////////////////// + // A couple of wrapper classes + template + void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { + NoSmearing S; + Runner(argc, argv, Checkpoint, S); + } - template - void Runner(int argc, char **argv, IOCheckpointer &Checkpoint, - SmearingPolicy &Smearing) { - StartType_t StartType = HotStart; + template + void Run(int argc, char **argv, IOCheckpointer &CP, SmearingPolicy &S) { + Runner(argc, argv, CP, S); + } + ////////////////////////////// - std::string arg; + template + void Runner(int argc, + char ** argv, + IOCheckpointer &Checkpoint, + SmearingPolicy &Smearing) { + StartType_t StartType = HotStart; - if (GridCmdOptionExists(argv, argv + argc, "--StartType")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--StartType"); - if (arg == "HotStart") { - StartType = HotStart; - } else if (arg == "ColdStart") { - StartType = ColdStart; - } else if (arg == "TepidStart") { - StartType = TepidStart; - } else if (arg == "CheckpointStart") { - StartType = CheckpointStart; - } else { - std::cout << GridLogError << "Unrecognized option in --StartType\n"; - std::cout - << GridLogError - << "Valid [HotStart, ColdStart, TepidStart, CheckpointStart]\n"; - assert(0); + std::string arg; + + if (GridCmdOptionExists(argv, argv + argc, "--StartType")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--StartType"); + if (arg == "HotStart") { + StartType = HotStart; + } else if (arg == "ColdStart") { + StartType = ColdStart; + } else if (arg == "TepidStart") { + StartType = TepidStart; + } else if (arg == "CheckpointStart") { + StartType = CheckpointStart; + } else { + std::cout << GridLogError << "Unrecognized option in --StartType\n"; + std::cout + << GridLogError + << "Valid [HotStart, ColdStart, TepidStart, CheckpointStart]\n"; + assert(0); + } } + + int StartTraj = 0; + if (GridCmdOptionExists(argv, argv + argc, "--StartTrajectory")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--StartTrajectory"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + StartTraj = ivec[0]; + } + + int NumTraj = 1; + if (GridCmdOptionExists(argv, argv + argc, "--Trajectories")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--Trajectories"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + NumTraj = ivec[0]; + } + + int NumThermalizations = 10; + if (GridCmdOptionExists(argv, argv + argc, "--Thermalizations")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--Thermalizations"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + NumThermalizations = ivec[0]; + } + + GridSerialRNG sRNG; + GridParallelRNG pRNG(UGrid); + Field U(UGrid); + + typedef MinimumNorm2 + IntegratorType; // change here to change the algorithm + IntegratorType MDynamics(UGrid, MDparameters, TheAction, Smearing); + + HMCparameters HMCpar; + HMCpar.StartTrajectory = StartTraj; + HMCpar.Trajectories = NumTraj; + HMCpar.NoMetropolisUntil = NumThermalizations; + + if (StartType == HotStart) { + // Hot start + HMCpar.MetropolisTest = true; + sRNG.SeedFixedIntegers(SerialSeed); + pRNG.SeedFixedIntegers(ParallelSeed); + Implementation::HotConfiguration(pRNG, U); + } else if (StartType == ColdStart) { + // Cold start + HMCpar.MetropolisTest = true; + sRNG.SeedFixedIntegers(SerialSeed); + pRNG.SeedFixedIntegers(ParallelSeed); + Implementation::ColdConfiguration(pRNG, U); + } else if (StartType == TepidStart) { + // Tepid start + HMCpar.MetropolisTest = true; + sRNG.SeedFixedIntegers(SerialSeed); + pRNG.SeedFixedIntegers(ParallelSeed); + Implementation::TepidConfiguration(pRNG, U); + } else if (StartType == CheckpointStart) { + HMCpar.MetropolisTest = true; + // CheckpointRestart + Checkpoint.CheckpointRestore(StartTraj, U, sRNG, pRNG); + } + + Smearing.set_Field(U); + + HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); + + for (int obs = 0; obs < ObservablesList.size(); obs++) + HMC.AddObservable(ObservablesList[obs]); + + // Run it + HMC.evolve(); } + }; - int StartTraj = 0; - if (GridCmdOptionExists(argv, argv + argc, "--StartTrajectory")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--StartTrajectory"); - std::vector ivec(0); - GridCmdOptionIntVector(arg, ivec); - StartTraj = ivec[0]; - } + // These are for gauge fields + typedef BinaryHmcRunnerTemplate BinaryHmcRunner; + typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; + typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; - int NumTraj = 1; - if (GridCmdOptionExists(argv, argv + argc, "--Trajectories")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--Trajectories"); - std::vector ivec(0); - GridCmdOptionIntVector(arg, ivec); - NumTraj = ivec[0]; - } + template + using BinaryHmcRunnerTemplateHirep = BinaryHmcRunnerTemplate; - int NumThermalizations = 10; - if (GridCmdOptionExists(argv, argv + argc, "--Thermalizations")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--Thermalizations"); - std::vector ivec(0); - GridCmdOptionIntVector(arg, ivec); - NumThermalizations = ivec[0]; - } - - GridSerialRNG sRNG; - GridParallelRNG pRNG(UGrid); - Field U(UGrid); - - typedef MinimumNorm2 - IntegratorType; // change here to change the algorithm - IntegratorType MDynamics(UGrid, MDparameters, TheAction, Smearing); - - HMCparameters HMCpar; - HMCpar.StartTrajectory = StartTraj; - HMCpar.Trajectories = NumTraj; - HMCpar.NoMetropolisUntil = NumThermalizations; - - if (StartType == HotStart) { - // Hot start - HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerialSeed); - pRNG.SeedFixedIntegers(ParallelSeed); - Implementation::HotConfiguration(pRNG, U); - } else if (StartType == ColdStart) { - // Cold start - HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerialSeed); - pRNG.SeedFixedIntegers(ParallelSeed); - Implementation::ColdConfiguration(pRNG, U); - } else if (StartType == TepidStart) { - // Tepid start - HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerialSeed); - pRNG.SeedFixedIntegers(ParallelSeed); - Implementation::TepidConfiguration(pRNG, U); - } else if (StartType == CheckpointStart) { - HMCpar.MetropolisTest = true; - // CheckpointRestart - Checkpoint.CheckpointRestore(StartTraj, U, sRNG, pRNG); - } - - Smearing.set_Field(U); - - HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); - - for (int obs = 0; obs < ObservablesList.size(); obs++) - HMC.AddObservable(ObservablesList[obs]); - - // Run it - HMC.evolve(); - } -}; - -// These are for gauge fields -typedef BinaryHmcRunnerTemplate BinaryHmcRunner; -typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; -typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; - -template -using BinaryHmcRunnerTemplateHirep = - BinaryHmcRunnerTemplate; - - - - typedef BinaryHmcRunnerTemplate ScalarBinaryHmcRunner; + typedef BinaryHmcRunnerTemplate + ScalarBinaryHmcRunner; } } #endif diff --git a/lib/qcd/hmc/HMC.h b/lib/qcd/hmc/HMC.h index a30242d3..e39faae0 100644 --- a/lib/qcd/hmc/HMC.h +++ b/lib/qcd/hmc/HMC.h @@ -34,7 +34,6 @@ directory * @brief Classes for Hybrid Monte Carlo update * * @author Guido Cossu - * Time-stamp: <2015-07-30 16:58:26 neo> */ //-------------------------------------------------------------------- #ifndef HMC_INCLUDED diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index 43974f48..ec3d31fe 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -29,14 +29,6 @@ directory *************************************************************************************/ /* END LEGAL */ //-------------------------------------------------------------------- -/*! @file Integrator.h - * @brief Classes for the Molecular Dynamics integrator - * - * @author Guido Cossu - * Time-stamp: <2015-07-30 16:21:29 neo> - */ -//-------------------------------------------------------------------- - #ifndef INTEGRATOR_INCLUDED #define INTEGRATOR_INCLUDED diff --git a/lib/qcd/utils/WilsonLoops.h b/lib/qcd/utils/WilsonLoops.h index 3051f830..e47040ee 100644 --- a/lib/qcd/utils/WilsonLoops.h +++ b/lib/qcd/utils/WilsonLoops.h @@ -235,7 +235,7 @@ public: std::vector U(Nd, grid); for (int d = 0; d < Nd; d++) { - U[d] = PeekIndex(Umu, d); + U[d] = PeekIndex(Umu, d);// some redundant copies } // mu @@ -268,7 +268,7 @@ public: std::vector U(Nd, grid); for (int d = 0; d < Nd; d++) { - U[d] = PeekIndex(Umu, d); + U[d] = PeekIndex(Umu, d);// some redundant copies } // mu diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 098e23e4..9a9c3e8e 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -79,12 +79,16 @@ class HmcRunner : public BinaryHmcRunner { // Gauge action int Ls = UGrid->_gdimensions[Nd - 1]; - std::vector betat(Ls,5); + std::vector betat(Ls); std::vector betas(Ls); - betas={5,6,6,5}; - //std:cout << "Betas:" << betas << std::endl; - //VariableWilsonGaugeActionR Waction(betas, betat, UGrid); - WilsonGaugeActionR Waction(5.6); + //betat={5,6,6,6,6,6,6,5}; + betat={1,1,1,0,1,1,1,1}; + //betas={5.2,5.5,5.8,6,6,5.8,5.5,5.2}; + betas={0,0,0,0,0,0,0,0}; + bool openBC = false; + std:cout << GridLogMessage << "Betas: " << betas << std::endl; + VariableWilsonGaugeActionR Waction(betas, betat, UGrid, openBC); + //WilsonGaugeActionR Waction(5.6); // Collect actions ActionLevel Level1(1); From 0d889b70410bfdaf70b5cbffe2fb92157943cc03 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Fri, 21 Oct 2016 15:21:32 +0100 Subject: [PATCH 080/807] QedFVol: first attempt at generating a QED field --- programs/qed-fvol/qed-fvol.cc | 38 ++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index bb3204c6..53e01de9 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -4,6 +4,31 @@ using namespace Grid; using namespace QCD; using namespace QedFVol; +template +class QedGimpl +{ +public: + typedef S Simd; + + template + using iImplGaugeLink = iScalar>>; + template + using iImplGaugeField = iVector>, Nd>; + + typedef iImplGaugeLink SiteGaugeLink; + typedef iImplGaugeField SiteGaugeField; + + typedef Lattice GaugeLinkField; // bit ugly naming; polarised + // gauge field, lorentz... all + // ugly + typedef Lattice GaugeField; +}; + +typedef QedGimpl QedGimplR; +typedef Photon PhotonR; +typedef PhotonR::GaugeField EmField; +typedef PhotonR::GaugeLinkField EmComp; + int main(int argc, char *argv[]) { // parse command line @@ -26,8 +51,19 @@ int main(int argc, char *argv[]) QedFVolLogDebug.Active(GridLogDebug.isActive()); LOG(Message) << "Grid initialized" << std::endl; + // QED stuff + std::vector latt_size = GridDefaultLatt(); + std::vector simd_layout = GridDefaultSimd(4, vComplex::Nsimd()); + std::vector mpi_layout = GridDefaultMpi(); + GridCartesian grid(latt_size,simd_layout,mpi_layout); + GridParallelRNG pRNG(&grid); + PhotonR photon(PhotonR::Gauge::Feynman, + PhotonR::ZmScheme::QedL); + EmField a(&grid); + + pRNG.SeedRandomDevice(); + photon.StochasticField(a, pRNG); - // epilogue LOG(Message) << "Grid is finalizing now" << std::endl; Grid_finalize(); From e6acffdfc21c5e02ac3836abc43ad7324aa534b0 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 21 Oct 2016 16:06:34 +0100 Subject: [PATCH 081/807] Fixing the plaquette computation --- lib/qcd/action/gauge/WilsonGaugeAction.h | 11 +++------- lib/qcd/utils/SUn.h | 3 +++ lib/qcd/utils/WilsonLoops.h | 12 ++++++++++ tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 28 ++++++++++-------------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/lib/qcd/action/gauge/WilsonGaugeAction.h index 059fcc58..8ac1df74 100644 --- a/lib/qcd/action/gauge/WilsonGaugeAction.h +++ b/lib/qcd/action/gauge/WilsonGaugeAction.h @@ -99,7 +99,7 @@ class VariableWilsonGaugeAction : public Action { public: VariableWilsonGaugeAction(std::vector bulk, std::vector xdim, - GridBase *_grid, bool openBC = false) + GridBase *_grid) : b_bulk(bulk), b_xdim(xdim), grid(_grid), @@ -130,11 +130,6 @@ class VariableWilsonGaugeAction : public Action { beta_xdim = where(coor == tau, temp, beta_xdim); } - if (!openBC) { - temp = b_xdim[Nex - 1]; - beta_xdim = where(coor == Nex - 1, temp, beta_xdim); - } - beta_xdim_shifted = Cshift(beta_xdim, Ndim - 1, -1); beta_bulk = zero; @@ -143,8 +138,7 @@ class VariableWilsonGaugeAction : public Action { beta_bulk = where(coor == tau, temp, beta_bulk); } - std::cout << beta_xdim << std::endl; - std::cout << beta_xdim_shifted << std::endl; + }; virtual void refresh(const GaugeField &U, @@ -180,6 +174,7 @@ class VariableWilsonGaugeAction : public Action { } } + double faces = (1.0 * (Nd - 1) * (Nd - 2)) / 2.0; SumdirPlaq *= OneOnNc / (RealD(bulk_volume) * faces); diff --git a/lib/qcd/utils/SUn.h b/lib/qcd/utils/SUn.h index 20cd1889..9ad3ca18 100644 --- a/lib/qcd/utils/SUn.h +++ b/lib/qcd/utils/SUn.h @@ -170,6 +170,7 @@ class SU { ta()()(i2, i1) = 1.0; ta = ta * 0.5; } + template static void generatorSigmaX(int su2Index, iSUnMatrix &ta) { ta = zero; @@ -194,6 +195,8 @@ class SU { ta = ta * nrm; } + + //////////////////////////////////////////////////////////////////////// // Map a su2 subgroup number to the pair of rows that are non zero //////////////////////////////////////////////////////////////////////// diff --git a/lib/qcd/utils/WilsonLoops.h b/lib/qcd/utils/WilsonLoops.h index e47040ee..19de7ab0 100644 --- a/lib/qcd/utils/WilsonLoops.h +++ b/lib/qcd/utils/WilsonLoops.h @@ -54,9 +54,21 @@ public: // resolution throughout the usage in this file, and rather defeats the // purpose of deriving // from Gimpl. + /* plaq = Gimpl::CovShiftBackward( U[mu], mu, Gimpl::CovShiftBackward( U[nu], nu, Gimpl::CovShiftForward(U[mu], mu, U[nu]))); + */ + // _ + //|< _| + plaq = Gimpl::CovShiftForward(U[mu],mu, + Gimpl::CovShiftForward(U[nu],nu, + Gimpl::CovShiftBackward(U[mu],mu, + Gimpl::CovShiftIdentityBackward(U[nu], nu)))); + + + + } ////////////////////////////////////////////////// // trace of directed plaquette oriented in mu,nu plane diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 9a9c3e8e..a3bdbe4f 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -62,32 +62,26 @@ class HmcRunner : public BinaryHmcRunner { void BuildTheAction(int argc, char **argv) { + int Ndim=5; typedef WilsonImplR ImplPolicy; typedef WilsonFermionR FermionAction; typedef typename FermionAction::FermionField FermionField; - UGrid = SpaceTimeGrid::makeFourDimGrid( - GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), - GridDefaultMpi()); - UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + std::vector simd = GridDefaultSimd(Ndim-1,vComplex::Nsimd()); + simd.push_back(1); - FGrid = UGrid; - FrbGrid = UrbGrid; - // temporarily need a gauge field - LatticeGaugeField U(UGrid); + //UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), simd, GridDefaultMpi()); + UGrid = new GridCartesian(GridDefaultLatt(),simd,GridDefaultMpi()); // Gauge action - int Ls = UGrid->_gdimensions[Nd - 1]; - std::vector betat(Ls); - std::vector betas(Ls); - //betat={5,6,6,6,6,6,6,5}; - betat={1,1,1,0,1,1,1,1}; - //betas={5.2,5.5,5.8,6,6,5.8,5.5,5.2}; - betas={0,0,0,0,0,0,0,0}; - bool openBC = false; + int Ls = UGrid->_fdimensions[Nd - 1]; + std::vector betat(Ls,6.0); + std::vector betas(Ls,5.6); + betat[Ls-1]= 0.0; + betas={5.2,5.5,5.8,6,6,5.8,5.5,5.2}; std:cout << GridLogMessage << "Betas: " << betas << std::endl; - VariableWilsonGaugeActionR Waction(betas, betat, UGrid, openBC); + VariableWilsonGaugeActionR Waction(betas, betat, UGrid); //WilsonGaugeActionR Waction(5.6); // Collect actions From cccd14b09edae68bf4cf7489ecf374fc53c200bd Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Fri, 21 Oct 2016 17:20:54 +0100 Subject: [PATCH 082/807] Small cleanup --- lib/qcd/action/Actions.h | 3 - lib/qcd/action/gauge/WilsonGaugeAction.h | 186 ----------------------- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 18 +-- 3 files changed, 3 insertions(+), 204 deletions(-) diff --git a/lib/qcd/action/Actions.h b/lib/qcd/action/Actions.h index ef2edc97..20023455 100644 --- a/lib/qcd/action/Actions.h +++ b/lib/qcd/action/Actions.h @@ -72,9 +72,6 @@ namespace QCD { typedef WilsonGaugeAction WilsonGaugeActionR; typedef WilsonGaugeAction WilsonGaugeActionF; typedef WilsonGaugeAction WilsonGaugeActionD; -typedef VariableWilsonGaugeAction VariableWilsonGaugeActionR; -typedef VariableWilsonGaugeAction VariableWilsonGaugeActionF; -typedef VariableWilsonGaugeAction VariableWilsonGaugeActionD; typedef PlaqPlusRectangleAction PlaqPlusRectangleActionR; typedef PlaqPlusRectangleAction PlaqPlusRectangleActionF; diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/lib/qcd/action/gauge/WilsonGaugeAction.h index 8ac1df74..b9216d78 100644 --- a/lib/qcd/action/gauge/WilsonGaugeAction.h +++ b/lib/qcd/action/gauge/WilsonGaugeAction.h @@ -82,193 +82,7 @@ class WilsonGaugeAction : public Action { }; }; -template -class VariableWilsonGaugeAction : public Action { - public: - INHERIT_GIMPL_TYPES(Gimpl); - private: - std::vector b_bulk; // bulk couplings - std::vector b_xdim; // extra dimension couplings - GridBase *grid; - LatticeComplex beta_xdim; - LatticeComplex beta_xdim_shifted; - LatticeComplex beta_bulk; - - int bulk_volume; - - public: - VariableWilsonGaugeAction(std::vector bulk, std::vector xdim, - GridBase *_grid) - : b_bulk(bulk), - b_xdim(xdim), - grid(_grid), - beta_xdim(grid), - beta_xdim_shifted(grid), - beta_bulk(grid) { - // check that the grid is ok - // todo - int Ndim = Nd; // change later - - std::vector FullDim = grid->GlobalDimensions(); - bulk_volume = 1; - for (int s = 0; s < Ndim - 1; s++) bulk_volume *= FullDim[s]; - - LatticeComplex temp(grid); - - Lattice > coor(grid); - - LatticeCoordinate(coor, Ndim - 1); - - int Nex = FullDim[Ndim - 1]; - assert(b_bulk.size() == Nex); - assert(b_xdim.size() == Nex); - - beta_xdim = zero; - for (int tau = 0; tau < Nex - 1; tau++) { - temp = b_xdim[tau]; - beta_xdim = where(coor == tau, temp, beta_xdim); - } - - beta_xdim_shifted = Cshift(beta_xdim, Ndim - 1, -1); - - beta_bulk = zero; - for (int tau = 0; tau < Nex; tau++) { - temp = b_bulk[tau]; - beta_bulk = where(coor == tau, temp, beta_bulk); - } - - - }; - - virtual void refresh(const GaugeField &U, - GridParallelRNG &pRNG){}; // noop as no pseudoferms - - virtual RealD S(const GaugeField &Umu) { - int Ndim = Nd; // change later for generality - conformable(grid, Umu._grid); - - std::vector U(Ndim, grid); - - for (int mu = 0; mu < Ndim; mu++) { - U[mu] = PeekIndex(Umu, mu); - } - - LatticeComplex dirPlaq(grid); - LatticeComplex Plaq(grid); - - LatticeComplex SumdirPlaq(grid); - - RealD OneOnNc = 1.0 / Real(Nc); - - ///////////// - // Lower dim plaquettes - ///////////// - Plaq = zero; - SumdirPlaq = zero; - for (int mu = 1; mu < Ndim - 1; mu++) { - for (int nu = 0; nu < mu; nu++) { - WilsonLoops::traceDirPlaquette(dirPlaq, U, mu, nu); - SumdirPlaq += dirPlaq; - Plaq = Plaq + (1.0 - dirPlaq * OneOnNc) * beta_bulk; - } - } - - - double faces = (1.0 * (Nd - 1) * (Nd - 2)) / 2.0; - SumdirPlaq *= OneOnNc / (RealD(bulk_volume) * faces); - - // print slices in the extra dimension - int Nex = grid->_fdimensions[Ndim - 1]; - std::vector plaq_ex(Nex); - sliceSum(SumdirPlaq, plaq_ex, Ndim - 1); - for (int ex = 0; ex < Nex; ex++) - std::cout << GridLogMessage << "Bulk plaq[" << ex - << "] = " << TensorRemove(plaq_ex[ex]).real() << std::endl; - - ///////////// - // Extra dimension - ///////////// - { - int mu = Ndim - 1; - for (int nu = 0; nu < mu; nu++) { - WilsonLoops::traceDirPlaquette(dirPlaq, U, mu, nu); - Plaq = Plaq + (1.0 - dirPlaq * OneOnNc) * beta_xdim; - } - } - - TComplex Tp = sum(Plaq); - Complex p = TensorRemove(Tp); - RealD action = p.real(); - return action; - }; - - virtual void deriv(const GaugeField &U, GaugeField &dSdU) { - // not optimal implementation FIXME - // extend Ta to include Lorentz indexes - - // for the higher dimension plaquettes take the upper plaq of the - // 4d slice and multiply by beta[s] and the lower and multiply by beta[s-1] - // derivative of links mu = 0, ... Nd-1 inside plaq (mu,5) - // for these I need upper and lower staples separated - // each multiplied with their own beta - // derivative of links mu = 5 - // living on the same slice, share the same beta - - conformable(grid, U._grid); - int Ndim = Nd; // change later - RealD factor = 0.5 / RealD(Nc); - - GaugeLinkField Umu(grid); - GaugeLinkField dSdU_mu(grid); - GaugeLinkField staple(grid); - - for (int mu = 0; mu < Ndim; mu++) { - Umu = PeekIndex(U, mu); - dSdU_mu = zero; - - for (int nu = 0; nu < Ndim; nu++) { - if (nu != mu) { - if ((mu < (Ndim - 1)) && (nu < (Ndim - 1))) { - // Spacelike case apply beta space - WilsonLoops::Staple(staple, U, mu, nu); - staple = staple * beta_bulk; - dSdU_mu += staple; - - } else if (mu == (Ndim - 1)) { - // nu space; mu time link - assert(nu < (Ndim - 1)); - assert(mu == (Ndim - 1)); - - // mu==tau dir link deriv, nu spatial - WilsonLoops::Staple(staple, U, mu, nu); - staple = staple * beta_xdim; - dSdU_mu += staple; - - } else { - assert(mu < (Ndim - 1)); - assert(nu == (Ndim - 1)); - - // nu time; mu space link - - // staple forwards in tau - WilsonLoops::StapleUpper(staple, U, mu, nu); - staple = staple * beta_xdim; - dSdU_mu += staple; - - // staple backwards in tau - WilsonLoops::StapleLower(staple, U, mu, nu); - staple = staple * beta_xdim_shifted; - dSdU_mu += staple; - } - } - } - - dSdU_mu = Ta(Umu * dSdU_mu) * factor; - PokeIndex(dSdU, dSdU_mu, mu); - } - }; -}; } } diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index a3bdbe4f..977ca1c8 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -62,27 +62,15 @@ class HmcRunner : public BinaryHmcRunner { void BuildTheAction(int argc, char **argv) { - int Ndim=5; typedef WilsonImplR ImplPolicy; typedef WilsonFermionR FermionAction; typedef typename FermionAction::FermionField FermionField; - std::vector simd = GridDefaultSimd(Ndim-1,vComplex::Nsimd()); - simd.push_back(1); - - - //UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), simd, GridDefaultMpi()); - UGrid = new GridCartesian(GridDefaultLatt(),simd,GridDefaultMpi()); + UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), GridDefaultMpi()); + // Gauge action - int Ls = UGrid->_fdimensions[Nd - 1]; - std::vector betat(Ls,6.0); - std::vector betas(Ls,5.6); - betat[Ls-1]= 0.0; - betas={5.2,5.5,5.8,6,6,5.8,5.5,5.2}; - std:cout << GridLogMessage << "Betas: " << betas << std::endl; - VariableWilsonGaugeActionR Waction(betas, betat, UGrid); - //WilsonGaugeActionR Waction(5.6); + WilsonGaugeActionR Waction(5.6); // Collect actions ActionLevel Level1(1); From 4b740fc8fd8b01206f1c90d12af2b005f163afc9 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Sat, 22 Oct 2016 13:06:00 +0100 Subject: [PATCH 083/807] Debugging the RNG state save --- lib/parallelIO/BinaryIO.h | 153 +++++++++++++++++++++----------------- lib/qcd/QCD.h | 2 +- 2 files changed, 87 insertions(+), 68 deletions(-) diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index cdcb1989..8b2d9223 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -6,8 +6,8 @@ Copyright (C) 2015 -Author: Peter Boyle -Author: paboyle + Author: Peter Boyle + Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -239,9 +239,9 @@ class BinaryIO { fin.read((char *)&file_object, sizeof(file_object)); bytes += sizeof(file_object); if (ieee32big) be32toh_v((void *)&file_object, sizeof(file_object)); - if (ieee32) le32toh_v((void *)&file_object, sizeof(file_object)); + if (ieee32) le32toh_v((void *)&file_object, sizeof(file_object)); if (ieee64big) be64toh_v((void *)&file_object, sizeof(file_object)); - if (ieee64) le64toh_v((void *)&file_object, sizeof(file_object)); + if (ieee64) le64toh_v((void *)&file_object, sizeof(file_object)); munge(file_object, munged, csum); } @@ -258,7 +258,7 @@ class BinaryIO { template static inline uint32_t writeObjectSerial(Lattice &Umu,std::string file,munger munge,int offset,const std::string & format) { - typedef typename vobj::scalar_object sobj; + typedef typename vobj::scalar_object sobj; GridBase *grid = Umu._grid; @@ -295,15 +295,15 @@ class BinaryIO { if ( grid->IsBoss() ) { - - if(ieee32big) htobe32_v((void *)&file_object,sizeof(file_object)); - if(ieee32) htole32_v((void *)&file_object,sizeof(file_object)); - if(ieee64big) htobe64_v((void *)&file_object,sizeof(file_object)); - if(ieee64) htole64_v((void *)&file_object,sizeof(file_object)); - // NB could gather an xstrip as an optimisation. - fout.write((char *)&file_object,sizeof(file_object)); - bytes+=sizeof(file_object); + if(ieee32big) htobe32_v((void *)&file_object,sizeof(file_object)); + if(ieee32) htole32_v((void *)&file_object,sizeof(file_object)); + if(ieee64big) htobe64_v((void *)&file_object,sizeof(file_object)); + if(ieee64) htole64_v((void *)&file_object,sizeof(file_object)); + + // NB could gather an xstrip as an optimisation. + fout.write((char *)&file_object,sizeof(file_object)); + bytes+=sizeof(file_object); } }}}} timer.Stop(); @@ -313,15 +313,14 @@ class BinaryIO { return csum; } - static inline uint32_t writeRNGSerial(GridSerialRNG &serial, - GridParallelRNG ¶llel, - std::string file, int offset) { + static inline uint32_t writeRNGSerial(GridSerialRNG &serial, GridParallelRNG ¶llel, std::string file, int offset) { typedef typename GridSerialRNG::RngStateType RngStateType; const int RngStateCount = GridSerialRNG::RngStateCount; GridBase *grid = parallel._grid; int gsites = grid->_gsites; + GridStopWatch timer; timer.Start(); ////////////////////////////////////////////////// // Serialise through node zero ////////////////////////////////////////////////// @@ -329,19 +328,21 @@ class BinaryIO { if (grid->IsBoss()) { fout.open(file, std::ios::binary | std::ios::out | std::ios::in); if (!fout.is_open()) { - std::cout << GridLogMessage << "writeRNGSerial: Error opening file " - << file << std::endl; - exit(0); + std::cout << GridLogMessage << "writeRNGSerial: Error opening file " << file << std::endl; + exit(0);// write better error handling } fout.seekp(offset); } - std::cout << GridLogMessage << "Serial RNG write I/O " << file << std::endl; + std::cout << GridLogMessage << "Serial RNG write I/O on file " << file << std::endl; uint32_t csum = 0; std::vector saved(RngStateCount); int bytes = sizeof(RngStateType) * saved.size(); + std::cout << GridLogDebug << "RngStateCount: " << RngStateCount << std::endl; + std::cout << GridLogDebug << "Type has " << bytes << " bytes" << std::endl; std::vector gcoor; + std::cout << GridLogDebug << "gsites: " << gsites << " loop" << std::endl; for (int gidx = 0; gidx < gsites; gidx++) { int rank, o_idx, i_idx; grid->GlobalIndexToGlobalCoor(gidx, gcoor); @@ -349,12 +350,10 @@ class BinaryIO { int l_idx = parallel.generator_idx(o_idx, i_idx); if (rank == grid->ThisRank()) { - // std::cout << "rank" << rank<<" Getting state for index - // "<Broadcast(rank, (void *)&saved[0], bytes); + grid->Broadcast(rank, (void *)&saved[0], bytes); + } if (grid->IsBoss()) { Uint32Checksum((uint32_t *)&saved[0], bytes, csum); @@ -367,15 +366,21 @@ class BinaryIO { Uint32Checksum((uint32_t *)&saved[0], bytes, csum); fout.write((char *)&saved[0], bytes); } + grid->Broadcast(0, (void *)&csum, sizeof(csum)); if (grid->IsBoss()) fout.close(); - std::cout << GridLogMessage << "RNG file checksum " << std::hex << csum << std::dec << std::endl; - + timer.Stop(); + + std::cout << GridLogMessage << "RNG file checksum " << std::hex << csum << std::dec << std::endl; + std::cout << GridLogMessage << "RNG state saved in " << timer.Elapsed() << " " + << timer.useconds() <<" us" <IsBoss()) { + fin.open(file, std::ios::binary | std::ios::in); + if (!fin.is_open()) { + std::cout << GridLogMessage << "readRNGSerial: Error opening file " << file << std::endl; + exit(0);// write better error handling + } + fin.seekg(offset); + } - std::ifstream fin(file,std::ios::binary|std::ios::in); - fin.seekg(offset); uint32_t csum=0; std::vector saved(RngStateCount); int bytes = sizeof(RngStateType)*saved.size(); + std::cout << GridLogDebug << "RngStateCount: " << RngStateCount << std::endl; + std::cout << GridLogDebug << "Type has " << bytes << " bytes" << std::endl; std::vector gcoor; + std::cout << GridLogDebug << "gsites: " << gsites << " loop" << std::endl; for(int gidx=0;gidxIsBoss() ) { - fin.read((char *)&saved[0],bytes); - Uint32Checksum((uint32_t *)&saved[0],bytes,csum); - } + fin.read((char *)&saved[0],bytes); + Uint32Checksum((uint32_t *)&saved[0],bytes,csum); - grid->Broadcast(0,(void *)&saved[0],bytes); + + grid->Broadcast(0,(void *)&saved[0],bytes); + } if( rank == grid->ThisRank() ){ - parallel.SetState(saved,l_idx); + parallel.SetState(saved,l_idx); } - } if ( grid->IsBoss() ) { @@ -467,15 +483,15 @@ class BinaryIO { if ( d == 0 ) parallel[d] = 0; if (parallel[d]) { - range[d] = grid->_ldimensions[d]; - start[d] = grid->_processor_coor[d]*range[d]; - ioproc[d]= grid->_processor_coor[d]; + range[d] = grid->_ldimensions[d]; + start[d] = grid->_processor_coor[d]*range[d]; + ioproc[d]= grid->_processor_coor[d]; } else { - range[d] = grid->_gdimensions[d]; - start[d] = 0; - ioproc[d]= 0; + range[d] = grid->_gdimensions[d]; + start[d] = 0; + ioproc[d]= 0; - if ( grid->_processor_coor[d] != 0 ) IOnode = 0; + if ( grid->_processor_coor[d] != 0 ) IOnode = 0; } slice_vol = slice_vol * range[d]; } @@ -486,9 +502,9 @@ class BinaryIO { std::cout<< std::dec ; std::cout<< GridLogMessage<< "Parallel read I/O to "<< file << " with " <_ndimension;d++){ - std::cout<< range[d]; - if( d< grid->_ndimension-1 ) - std::cout<< " x "; + std::cout<< range[d]; + if( d< grid->_ndimension-1 ) + std::cout<< " x "; } std::cout << std::endl; } @@ -515,7 +531,7 @@ class BinaryIO { // need to implement these loops in Nd independent way with a lexico conversion for(int tlex=0;tlex tsite(nd); // temporary mixed up site std::vector gsite(nd); std::vector lsite(nd); @@ -523,11 +539,14 @@ class BinaryIO { Lexicographic::CoorFromIndex(tsite,tlex,range); - for(int d=0;d_ldimensions[d]; // local site - gsite[d] = tsite[d]+start[d]; // global site + for(int d=0; d_ldimensions[d]; // local site + gsite[d] = tsite[d]+start[d]; // global site } + ///////////////////////// // Get the rank of owner of data ///////////////////////// @@ -539,29 +558,29 @@ class BinaryIO { // iorank reads from the seek //////////////////////////////// if (myrank == iorank) { - - fin.seekg(offset+g_idx*sizeof(fileObj)); - fin.read((char *)&fileObj,sizeof(fileObj)); - bytes+=sizeof(fileObj); - - if(ieee32big) be32toh_v((void *)&fileObj,sizeof(fileObj)); - if(ieee32) le32toh_v((void *)&fileObj,sizeof(fileObj)); - if(ieee64big) be64toh_v((void *)&fileObj,sizeof(fileObj)); - if(ieee64) le64toh_v((void *)&fileObj,sizeof(fileObj)); - - munge(fileObj,siteObj,csum); + + fin.seekg(offset+g_idx*sizeof(fileObj)); + fin.read((char *)&fileObj,sizeof(fileObj)); + bytes+=sizeof(fileObj); + + if(ieee32big) be32toh_v((void *)&fileObj,sizeof(fileObj)); + if(ieee32) le32toh_v((void *)&fileObj,sizeof(fileObj)); + if(ieee64big) be64toh_v((void *)&fileObj,sizeof(fileObj)); + if(ieee64) le64toh_v((void *)&fileObj,sizeof(fileObj)); + + munge(fileObj,siteObj,csum); } // Possibly do transport through pt2pt if ( rank != iorank ) { - if ( (myrank == rank) || (myrank==iorank) ) { - grid->SendRecvPacket((void *)&siteObj,(void *)&siteObj,iorank,rank,sizeof(siteObj)); - } + if ( (myrank == rank) || (myrank==iorank) ) { + grid->SendRecvPacket((void *)&siteObj,(void *)&siteObj,iorank,rank,sizeof(siteObj)); + } } // Poke at destination if ( myrank == rank ) { - pokeLocalSite(siteObj,Umu,lsite); + pokeLocalSite(siteObj,Umu,lsite); } grid->Barrier(); // necessary? } @@ -571,8 +590,8 @@ class BinaryIO { grid->Barrier(); timer.Stop(); - std::cout<Barrier(); // necessary? - if (IOnode) + if (IOnode) fout.close(); return csum; diff --git a/lib/qcd/QCD.h b/lib/qcd/QCD.h index 0d8c28bc..e08c3dc8 100644 --- a/lib/qcd/QCD.h +++ b/lib/qcd/QCD.h @@ -46,7 +46,7 @@ namespace QCD { static const int Nc=3; static const int Ns=4; - static const int Nd=5; + static const int Nd=4; static const int Nhs=2; // half spinor static const int Nds=8; // double stored gauge field static const int Ngp=2; // gparity index range From 3e990c9d0ac1d0546126140a798391e65d6e1cad Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Sat, 22 Oct 2016 13:26:43 +0100 Subject: [PATCH 084/807] Reverting the broadcast change --- lib/lattice/Lattice_rng.h | 4 ++-- lib/parallelIO/BinaryIO.h | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index ae61224a..52dd627f 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -130,14 +130,14 @@ namespace Grid { ss<<_generators[gen]; ss.seekg(0,ss.beg); for(int i=0;i>saved[i]; + ss>>saved[i]; } } void SetState(std::vector & saved,int gen){ assert(saved.size()==RngStateCount); std::stringstream ss; for(int i=0;i>_generators[gen]; diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 8b2d9223..75e732ad 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -348,12 +348,12 @@ class BinaryIO { grid->GlobalIndexToGlobalCoor(gidx, gcoor); grid->GlobalCoorToRankIndex(rank, o_idx, i_idx, gcoor); int l_idx = parallel.generator_idx(o_idx, i_idx); + std::cout << GridLogDebug << "l_idx "<< l_idx << " o_idx " << o_idx << " i_idx " << i_idx << std::endl; if (rank == grid->ThisRank()) { parallel.GetState(saved, l_idx); - - grid->Broadcast(rank, (void *)&saved[0], bytes); } + grid->Broadcast(rank, (void *)&saved[0], bytes); if (grid->IsBoss()) { Uint32Checksum((uint32_t *)&saved[0], bytes, csum); @@ -419,14 +419,13 @@ class BinaryIO { grid->GlobalIndexToGlobalCoor(gidx,gcoor); grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); int l_idx=parallel.generator_idx(o_idx,i_idx); + std::cout << GridLogDebug << "l_idx "<< l_idx << " o_idx " << o_idx << " i_idx " << i_idx << std::endl; if ( grid->IsBoss() ) { fin.read((char *)&saved[0],bytes); Uint32Checksum((uint32_t *)&saved[0],bytes,csum); - - - grid->Broadcast(0,(void *)&saved[0],bytes); } + grid->Broadcast(0,(void *)&saved[0],bytes); if( rank == grid->ThisRank() ){ parallel.SetState(saved,l_idx); From df67e013ca66267dc0acc0ef93af63717cea68fd Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Sat, 22 Oct 2016 13:34:17 +0100 Subject: [PATCH 085/807] More debug output for the RNG --- lib/parallelIO/BinaryIO.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 75e732ad..5410f5c9 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -356,6 +356,7 @@ class BinaryIO { grid->Broadcast(rank, (void *)&saved[0], bytes); if (grid->IsBoss()) { + std::cout << "Saved: " << saved << std::endl; Uint32Checksum((uint32_t *)&saved[0], bytes, csum); fout.write((char *)&saved[0], bytes); } @@ -429,6 +430,7 @@ class BinaryIO { if( rank == grid->ThisRank() ){ parallel.SetState(saved,l_idx); + std::cout << "Saved: " << saved << std::endl; } } From f55c16f9846f70808597bfff3792396957619c3f Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 24 Oct 2016 11:02:14 +0100 Subject: [PATCH 086/807] Adding a barrier in the RNG save --- configure.ac | 3 +- lib/lattice/Lattice_rng.h | 30 +++++++------- lib/parallelIO/BinaryIO.h | 34 +++++++++------- lib/qcd/hmc/GenericHMCrunner.h | 2 + lib/serialisation/TextIO.cc | 20 ++++++---- tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 51 ++++++++++++------------ tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 36 +++++++++-------- 7 files changed, 96 insertions(+), 80 deletions(-) diff --git a/configure.ac b/configure.ac index 7bcdc49f..0f3a3018 100644 --- a/configure.ac +++ b/configure.ac @@ -359,4 +359,5 @@ Summary of configuration for $PACKAGE v$VERSION - LIBS: `echo ${LIBS} | tr ' ' '\n' | sed 's/^-/ -/g'` ------------------------------------------------------- -" +" > grid.configure.summary +cat grid.configure.summary diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index 52dd627f..10c21d4a 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -291,24 +291,24 @@ namespace Grid { for(int gidx=0;gidxGlobalIndexToGlobalCoor(gidx,gcoor); - _grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); + int rank,o_idx,i_idx; + _grid->GlobalIndexToGlobalCoor(gidx,gcoor); + _grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); - int l_idx=generator_idx(o_idx,i_idx); - - std::vector site_seeds(4); - for(int i=0;i<4;i++){ - site_seeds[i]= ui(pseeder); - } + int l_idx=generator_idx(o_idx,i_idx); + + std::vector site_seeds(4); + for(int i=0;i<4;i++){ + site_seeds[i]= ui(pseeder); + } - _grid->Broadcast(0,(void *)&site_seeds[0],sizeof(int)*site_seeds.size()); + _grid->Broadcast(0,(void *)&site_seeds[0],sizeof(int)*site_seeds.size()); - if( rank == _grid->ThisRank() ){ - fixedSeed ssrc(site_seeds); - typename source::result_type sinit = ssrc(); - _generators[l_idx] = RngEngine(sinit); - } + if( rank == _grid->ThisRank() ){ + fixedSeed ssrc(site_seeds); + typename source::result_type sinit = ssrc(); + _generators[l_idx] = RngEngine(sinit); + } } _seeded=1; } diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 5410f5c9..abba1880 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -258,7 +258,7 @@ class BinaryIO { template static inline uint32_t writeObjectSerial(Lattice &Umu,std::string file,munger munge,int offset,const std::string & format) { - typedef typename vobj::scalar_object sobj; + typedef typename vobj::scalar_object sobj; GridBase *grid = Umu._grid; @@ -296,14 +296,14 @@ class BinaryIO { if ( grid->IsBoss() ) { - if(ieee32big) htobe32_v((void *)&file_object,sizeof(file_object)); - if(ieee32) htole32_v((void *)&file_object,sizeof(file_object)); - if(ieee64big) htobe64_v((void *)&file_object,sizeof(file_object)); - if(ieee64) htole64_v((void *)&file_object,sizeof(file_object)); + if(ieee32big) htobe32_v((void *)&file_object,sizeof(file_object)); + if(ieee32) htole32_v((void *)&file_object,sizeof(file_object)); + if(ieee64big) htobe64_v((void *)&file_object,sizeof(file_object)); + if(ieee64) htole64_v((void *)&file_object,sizeof(file_object)); - // NB could gather an xstrip as an optimisation. - fout.write((char *)&file_object,sizeof(file_object)); - bytes+=sizeof(file_object); + // NB could gather an xstrip as an optimisation. + fout.write((char *)&file_object,sizeof(file_object)); + bytes+=sizeof(file_object); } }}}} timer.Stop(); @@ -326,7 +326,7 @@ class BinaryIO { ////////////////////////////////////////////////// std::ofstream fout; if (grid->IsBoss()) { - fout.open(file, std::ios::binary | std::ios::out | std::ios::in); + fout.open(file, std::ios::binary | std::ios::out); if (!fout.is_open()) { std::cout << GridLogMessage << "writeRNGSerial: Error opening file " << file << std::endl; exit(0);// write better error handling @@ -348,20 +348,23 @@ class BinaryIO { grid->GlobalIndexToGlobalCoor(gidx, gcoor); grid->GlobalCoorToRankIndex(rank, o_idx, i_idx, gcoor); int l_idx = parallel.generator_idx(o_idx, i_idx); - std::cout << GridLogDebug << "l_idx "<< l_idx << " o_idx " << o_idx << " i_idx " << i_idx << std::endl; - + std::cout << GridLogDebug << "l_idx " << l_idx << " o_idx " << o_idx + << " i_idx " << i_idx << " rank " << rank << std::endl; if (rank == grid->ThisRank()) { parallel.GetState(saved, l_idx); } grid->Broadcast(rank, (void *)&saved[0], bytes); + grid->Barrier(); // necessary? if (grid->IsBoss()) { std::cout << "Saved: " << saved << std::endl; Uint32Checksum((uint32_t *)&saved[0], bytes, csum); fout.write((char *)&saved[0], bytes); } + grid->Barrier(); // this can be necessary } + if (grid->IsBoss()) { serial.GetState(saved, 0); Uint32Checksum((uint32_t *)&saved[0], bytes, csum); @@ -376,8 +379,7 @@ class BinaryIO { timer.Stop(); std::cout << GridLogMessage << "RNG file checksum " << std::hex << csum << std::dec << std::endl; - std::cout << GridLogMessage << "RNG state saved in " << timer.Elapsed() << " " - << timer.useconds() <<" us" <GlobalIndexToGlobalCoor(gidx,gcoor); grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); int l_idx=parallel.generator_idx(o_idx,i_idx); - std::cout << GridLogDebug << "l_idx "<< l_idx << " o_idx " << o_idx << " i_idx " << i_idx << std::endl; + std::cout << GridLogDebug << "l_idx " << l_idx << " o_idx " << o_idx + << " i_idx " << i_idx << " rank " << rank << std::endl; if ( grid->IsBoss() ) { fin.read((char *)&saved[0],bytes); + std::cout << "Saved: " << saved << std::endl; Uint32Checksum((uint32_t *)&saved[0],bytes,csum); } + grid->Broadcast(0,(void *)&saved[0],bytes); if( rank == grid->ThisRank() ){ parallel.SetState(saved,l_idx); - std::cout << "Saved: " << saved << std::endl; } } diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index 047b9c9e..fbf26156 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -139,10 +139,12 @@ namespace QCD { GridParallelRNG pRNG(UGrid); Field U(UGrid); + typedef MinimumNorm2 IntegratorType; // change here to change the algorithm + IntegratorType MDynamics(UGrid, MDparameters, TheAction, Smearing); HMCparameters HMCpar; diff --git a/lib/serialisation/TextIO.cc b/lib/serialisation/TextIO.cc index 39b987d0..9d733099 100644 --- a/lib/serialisation/TextIO.cc +++ b/lib/serialisation/TextIO.cc @@ -6,8 +6,9 @@ Copyright (C) 2015 -Author: Antonin Portelli -Author: paboyle + Author: Antonin Portelli + Author: paboyle + Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,14 +51,19 @@ void TextWriter::indent(void) { for (int i = 0; i < level_; ++i) { - file_ << '\t'; + file_ << '\t';//is this portable? } }; // Reader implementation /////////////////////////////////////////////////////// -TextReader::TextReader(const string &fileName) -: file_(fileName, ios::in) -{} +TextReader::TextReader(const string &fileName) +{ + file_.open(fileName, ios::in); + if (!file_.is_open()) { + std::cout << GridLogMessage << "TextReader: Error opening file " << fileName << std::endl; + exit(0);// write better error handling + } +} void TextReader::push(const string &s) { @@ -78,7 +84,7 @@ void TextReader::checkIndent(void) file_.get(c); if (c != '\t') { - cerr << "mismatch on tab " << c << " level " << level_; + cerr << "TextReader: mismatch on tab " << c << " level " << level_; cerr << " i "<< i << endl; abort(); } diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index 0b912c66..44d4f44b 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -37,28 +37,28 @@ using namespace Grid::QCD; namespace Grid { namespace QCD { -class HMCRunnerParameters : Serializable { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, - double, beta, - double, mass, - int, MaxCGIterations, - double, StoppingCondition, - bool, smearedAction, - int, SaveInterval, - std::string, format, - std::string, conf_prefix, - std::string, rng_prefix, - double, rho, - int, SmearingLevels, - ); + class HMCRunnerParameters : Serializable { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, + double, beta, + double, mass, + int, MaxCGIterations, + double, StoppingCondition, + bool, smearedAction, + int, SaveInterval, + std::string, format, + std::string, conf_prefix, + std::string, rng_prefix, + double, rho, + int, SmearingLevels, + ); - HMCRunnerParameters() {} -}; + HMCRunnerParameters() {} + }; // Derive from the BinaryHmcRunner (templated for gauge fields) class HmcRunner : public BinaryHmcRunner { - public: +public: void BuildTheAction(int argc, char **argv) { @@ -70,7 +70,7 @@ class HmcRunner : public BinaryHmcRunner { UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi()); UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); - + FGrid = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid); FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); @@ -87,12 +87,12 @@ class HmcRunner : public BinaryHmcRunner { RealD scale = 2.0; FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale); FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale); - + double StoppingCondition = 1.0e-8; double MaxCGIterations = 10000; ConjugateGradient CG(StoppingCondition,MaxCGIterations); TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); - + // Set smearing (true/false), default: false Nf2.is_smeared = true; @@ -115,8 +115,7 @@ class HmcRunner : public BinaryHmcRunner { std::string format = std::string("IEEE64BIG"); std::string conf_prefix = std::string("DWF_ckpoint_lat"); std::string rng_prefix = std::string("DWF_ckpoint_rng"); - BinaryHmcCheckpointer Checkpoint( - conf_prefix, rng_prefix, SaveInterval, format); + BinaryHmcCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); // Can implement also a specific function in the hmcrunner // AddCheckpoint (...) that takes the same parameters + a string/tag // defining the type of the checkpointer @@ -124,8 +123,7 @@ class HmcRunner : public BinaryHmcRunner { // Then force all checkpoint to have few common functions // return an object that is then passed to the Run function - PlaquetteLogger PlaqLog( - std::string("Plaquette")); + PlaquetteLogger PlaqLog(std::string("Plaquette")); ObservablesList.push_back(&PlaqLog); ObservablesList.push_back(&Checkpoint); @@ -139,7 +137,7 @@ class HmcRunner : public BinaryHmcRunner { Run(argc, argv, Checkpoint, SmearingPolicy); //Run(argc, argv, Checkpoint); // no smearing - }; +}; }; } } @@ -153,6 +151,7 @@ int main(int argc, char **argv) { HmcRunner TheHMC; + // Seeds for the random number generators std::vector SerSeed({1, 2, 3, 4, 5}); std::vector ParSeed({6, 7, 8, 9, 10}); diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 977ca1c8..aed66d20 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -37,20 +37,22 @@ using namespace Grid::QCD; namespace Grid { namespace QCD { +//Change here the type of reader +typedef Grid::TextReader InputFileReader; + + class HMCRunnerParameters : Serializable { public: GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, double, beta, - double, mass, - int, MaxCGIterations, - double, StoppingCondition, - bool, smearedAction, + int, MDsteps, + double, TrajectorLength, int, SaveInterval, std::string, format, std::string, conf_prefix, std::string, rng_prefix, - double, rho, - int, SmearingLevels, + std::string, serial_seeds, + std::string, parallel_seeds, ); HMCRunnerParameters() {} @@ -59,7 +61,8 @@ class HMCRunnerParameters : Serializable { // Derive from the BinaryHmcRunner (templated for gauge fields) class HmcRunner : public BinaryHmcRunner { public: - void BuildTheAction(int argc, char **argv) + HMCRunnerParameters HMCPar; + void BuildTheAction(int argc, char **argv) { typedef WilsonImplR ImplPolicy; @@ -70,7 +73,7 @@ class HmcRunner : public BinaryHmcRunner { // Gauge action - WilsonGaugeActionR Waction(5.6); + WilsonGaugeActionR Waction(HMCPar.beta); // Collect actions ActionLevel Level1(1); @@ -78,12 +81,8 @@ class HmcRunner : public BinaryHmcRunner { TheAction.push_back(Level1); // Add observables - int SaveInterval = 1; - std::string format = std::string("IEEE64BIG"); - std::string conf_prefix = std::string("ckpoint_lat"); - std::string rng_prefix = std::string("ckpoint_rng"); BinaryHmcCheckpointer Checkpoint( - conf_prefix, rng_prefix, SaveInterval, format); + HMCPar.conf_prefix, HMCPar.rng_prefix, HMCPar.SaveInterval, HMCPar.format); // Can implement also a specific function in the hmcrunner // AddCheckpoint (...) that takes the same parameters + a string/tag // defining the type of the checkpointer @@ -110,13 +109,18 @@ int main(int argc, char **argv) { << " threads" << std::endl; HmcRunner TheHMC; + InputFileReader Reader("input.wilson_gauge.params"); + read(Reader, "HMC", TheHMC.HMCPar); + + std::cout << GridLogMessage << TheHMC.HMCPar << std::endl; // Seeds for the random number generators - std::vector SerSeed({1, 2, 3, 4, 5}); - std::vector ParSeed({6, 7, 8, 9, 10}); + std::vector SerSeed = strToVec(TheHMC.HMCPar.serial_seeds); + std::vector ParSeed = strToVec(TheHMC.HMCPar.parallel_seeds); + TheHMC.RNGSeeds(SerSeed, ParSeed); - TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + TheHMC.MDparameters.set(TheHMC.HMCPar.MDsteps, TheHMC.HMCPar.TrajectorLength); TheHMC.BuildTheAction(argc, argv); From f415db583a701297dcddb789933928f000dff945 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 24 Oct 2016 15:48:22 +0100 Subject: [PATCH 087/807] Adding ILDG format --- configure.ac | 7 ++ lib/Grid.h | 5 +- lib/parallelIO/BinaryIO.h | 38 ++++--- lib/parallelIO/IldgIO.h | 194 +++++++++++++++++++++++++++++++++++ lib/parallelIO/IldgIOtypes.h | 74 +++++++++++++ lib/parallelIO/NerscIO.h | 4 +- 6 files changed, 302 insertions(+), 20 deletions(-) create mode 100644 lib/parallelIO/IldgIO.h create mode 100644 lib/parallelIO/IldgIOtypes.h diff --git a/configure.ac b/configure.ac index 0f3a3018..33a94004 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,13 @@ AC_CHECK_LIB([fftw3],[fftw_execute], CXXFLAGS=$CXXFLAGS_CPY LDFLAGS=$LDFLAGS_CPY +AC_CHECK_LIB([lime],[limeCreateReader], + [LIBS="$LIBS -llime"], + [AC_MSG_ERROR(C-LIME library was not found in your system. +Please install or provide the correct path to your installation [default search path ~/lime/] +Info at: http://usqcd.jlab.org/usqcd-docs/c-lime/)]) + + ############### SIMD instruction selection AC_ARG_ENABLE([simd],[AC_HELP_STRING([--enable-simd=SSE4|AVX|AVXFMA4|AVXFMA|AVX2|AVX512|AVX512MIC|IMCI|KNL|KNC],\ [Select instructions to be SSE4.0, AVX 1.0, AVX 2.0+FMA, AVX 512, IMCI])],\ diff --git a/lib/Grid.h b/lib/Grid.h index d2e12d29..5db4a0d2 100644 --- a/lib/Grid.h +++ b/lib/Grid.h @@ -76,10 +76,13 @@ Author: paboyle #include #include #include -#include #include +#include +#include +#include #include + #include #include diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index abba1880..3b2a8912 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -348,8 +348,8 @@ class BinaryIO { grid->GlobalIndexToGlobalCoor(gidx, gcoor); grid->GlobalCoorToRankIndex(rank, o_idx, i_idx, gcoor); int l_idx = parallel.generator_idx(o_idx, i_idx); - std::cout << GridLogDebug << "l_idx " << l_idx << " o_idx " << o_idx - << " i_idx " << i_idx << " rank " << rank << std::endl; + //std::cout << GridLogDebug << "l_idx " << l_idx << " o_idx " << o_idx + // << " i_idx " << i_idx << " rank " << rank << std::endl; if (rank == grid->ThisRank()) { parallel.GetState(saved, l_idx); } @@ -357,7 +357,6 @@ class BinaryIO { grid->Barrier(); // necessary? if (grid->IsBoss()) { - std::cout << "Saved: " << saved << std::endl; Uint32Checksum((uint32_t *)&saved[0], bytes, csum); fout.write((char *)&saved[0], bytes); } @@ -422,12 +421,11 @@ class BinaryIO { grid->GlobalIndexToGlobalCoor(gidx,gcoor); grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); int l_idx=parallel.generator_idx(o_idx,i_idx); - std::cout << GridLogDebug << "l_idx " << l_idx << " o_idx " << o_idx - << " i_idx " << i_idx << " rank " << rank << std::endl; + //std::cout << GridLogDebug << "l_idx " << l_idx << " o_idx " << o_idx + // << " i_idx " << i_idx << " rank " << rank << std::endl; if ( grid->IsBoss() ) { fin.read((char *)&saved[0],bytes); - std::cout << "Saved: " << saved << std::endl; Uint32Checksum((uint32_t *)&saved[0],bytes,csum); } @@ -608,7 +606,8 @@ class BinaryIO { static inline uint32_t writeObjectParallel(Lattice &Umu, std::string file, munger munge, int offset, - const std::string &format) { + const std::string &format, + ILDGtype ILDG = ILDGtype()) { typedef typename vobj::scalar_object sobj; GridBase *grid = Umu._grid; @@ -682,13 +681,15 @@ class BinaryIO { // Ideally one reader/writer per xy plane and read these contiguously // with comms from nominated I/O nodes. std::ofstream fout; - if (IOnode){ - fout.open(file, std::ios::binary | std::ios::in | std::ios::out); - if (!fout.is_open()) { - std::cout << GridLogMessage << "writeObjectParallel: Error opening file " << file - << std::endl; - exit(0); - } + if (!ILDG.is_ILDG){ + if (IOnode){ + fout.open(file, std::ios::binary | std::ios::in | std::ios::out); + if (!fout.is_open()) { + std::cout << GridLogMessage << "writeObjectParallel: Error opening file " << file + << std::endl; + exit(0); + } + } } ////////////////////////////////////////////////////////// @@ -752,8 +753,13 @@ class BinaryIO { if (ieee64big) htobe64_v((void *)&fileObj, sizeof(fileObj)); if (ieee64) htole64_v((void *)&fileObj, sizeof(fileObj)); - fout.seekp(offset + g_idx * sizeof(fileObj)); - fout.write((char *)&fileObj, sizeof(fileObj)); + if (ILDG.is_ILDG){ + size_t sizeFO = sizeof(fileObj); + int status = limeWriteRecordData((char*)&fileObj, &sizeFO, ILDG.LW); + } else{ + fout.seekp(offset + g_idx * sizeof(fileObj)); + fout.write((char *)&fileObj, sizeof(fileObj)); + } bytes += sizeof(fileObj); } } diff --git a/lib/parallelIO/IldgIO.h b/lib/parallelIO/IldgIO.h new file mode 100644 index 00000000..e723d3f8 --- /dev/null +++ b/lib/parallelIO/IldgIO.h @@ -0,0 +1,194 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./lib/parallelIO/IldgIO.h + +Copyright (C) 2015 + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#ifndef GRID_ILDG_IO_H +#define GRID_ILDG_IO_H + +#include +#include +#include +#include +#include + +#include +#include +#include + +extern "C" { // for linkage +#include "lime.h" +} + +namespace Grid { +namespace QCD { + +inline void ILDGGrid(GridBase *grid, ILDGField &header) { + assert(grid->_ndimension == 4); // emit error if not + header.dimension.resize(4); + header.boundary.resize(4); + for (int d = 0; d < 4; d++) { + header.dimension[d] = grid->_fdimensions[d]; + // Read boundary conditions from ... ? + header.boundary[d] = std::string("periodic"); + } +} + +inline void ILDGChecksum(uint32_t *buf, uint32_t buf_size_bytes, + uint32_t &csum) { + BinaryIO::Uint32Checksum(buf, buf_size_bytes, csum); +} + +////////////////////////////////////////////////////////////////////// +// Utilities ; these are QCD aware +////////////////////////////////////////////////////////////////////// +template +inline void ILDGStatistics(GaugeField &data, ILDGField &header) { + // How to convert data precision etc... + header.link_trace = Grid::QCD::WilsonLoops::linkTrace(data); + header.plaquette = Grid::QCD::WilsonLoops::avgPlaquette(data); + // header.polyakov = +} + +// Forcing QCD here +template +struct ILDGMunger { + void operator()(fobj &in, sobj &out, uint32_t &csum) { + for (int mu = 0; mu < 4; mu++) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + out(mu)()(i, j) = in(mu)()(i, j); + } + } + } + ILDGChecksum((uint32_t *)&in, sizeof(in), csum); + }; +}; + +template +struct ILDGSimpleUnmunger { + void operator()(sobj &in, fobj &out, uint32_t &csum) { + for (int mu = 0; mu < 4; mu++) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + out(mu)()(i, j) = in(mu)()(i, j); + } + } + } + ILDGChecksum((uint32_t *)&out, sizeof(out), csum); + }; +}; + +//////////////////////////////////////////////////////////////////////////////// +// Write and read from fstream; compute header offset for payload +//////////////////////////////////////////////////////////////////////////////// +class ILDGIO : public BinaryIO { + FILE *outFile; + LimeWriter *LimeW; + LimeRecordHeader *LimeHeader; + + public: + ILDGIO(std::string file) { + outFile = fopen(file.c_str(), "w"); + // check if opened correctly + + LimeW = limeCreateWriter(outFile); + } + + ~ILDGIO() { fclose(outFile); } + + unsigned int writeHeader(ILDGField &header) { + // write header in LIME + n_uint64_t nbytes; + int MB_flag = 1, ME_flag = 0; + + char message[] = "ildg-format"; + nbytes = strlen(message); + LimeHeader = limeCreateHeader(MB_flag, ME_flag, message, nbytes); + limeWriteRecordHeader(LimeHeader, LimeW); + limeDestroyHeader(LimeHeader); + // save the xml header here + // use the xml_writer to c++ streams in pugixml + // and convert to char message + // limeWriteRecordData(message, &nbytes, LimeW); + limeWriterCloseRecord(LimeW); + + return 0; + } + + unsigned int readHeader(std::string file, GridBase *grid, ILDGField &field) { + return 0; + } + + template + int readConfiguration(Lattice > &Umu, + ILDGField &header, std::string file) { + typedef Lattice > GaugeField; + + return 0; + } + + template + int writeConfiguration(Lattice > &Umu, + ILDGField &header, std::string file) { + typedef Lattice > GaugeField; + typedef iLorentzColourMatrix vobj; + typedef typename vobj::scalar_object sobj; + typedef LorentzColourMatrixD fobj; + + ILDGSimpleUnmunger munge; + unsigned int offset = writeHeader(header); + + BinaryIO::Uint32Checksum(Umu, munge, header.checksum); + + // Write record header + LimeRecordHeader *h; + std::cout << GridLogDebug << "ILDG Creating Header" << std::endl; + char message[] = "ildg-binary-data"; + h = limeCreateHeader(1, 1, message, strlen(message)); + + std::cout << GridLogDebug << "ILDG Writing Header" << std::endl; + int status = limeWriteRecordHeader(h, LimeW); + + if (status < 0) { + std::cerr << "ILDG Header error\n"; + return 1; + } + + limeDestroyHeader(h); + + ILDGtype ILDGt(true, LimeW); + uint32_t csum = BinaryIO::writeObjectParallel( + Umu, file, munge, offset, header.floating_point, ILDGt); + + limeWriterCloseRecord(LimeW); + + return 0; + } + + // format for RNG? +}; +} +} +#endif diff --git a/lib/parallelIO/IldgIOtypes.h b/lib/parallelIO/IldgIOtypes.h new file mode 100644 index 00000000..bbee2a53 --- /dev/null +++ b/lib/parallelIO/IldgIOtypes.h @@ -0,0 +1,74 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./lib/parallelIO/IldgIO.h + +Copyright (C) 2015 + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#ifndef GRID_ILDGTYPES_IO_H +#define GRID_ILDGTYPES_IO_H + +extern "C" { // for linkage +#include "lime.h" +} + +namespace Grid { + + struct ILDGtype{ + bool is_ILDG; + LimeWriter* LW; + + ILDGtype(bool is, LimeWriter* L):is_ILDG(is),LW(L){} + ILDGtype():is_ILDG(false),LW(NULL){} + }; + + + + + class ILDGField { + public: + // header strings (not in order) + std::vector dimension; + std::vector boundary; + int data_start; + std::string hdr_version; + std::string storage_format; + // Checks on data + double link_trace; + double plaquette; + uint32_t checksum; + unsigned int sequence_number; + std::string data_type; + std::string ensemble_id ; + std::string ensemble_label ; + std::string creator ; + std::string creator_hardware ; + std::string creation_date ; + std::string archive_date ; + std::string floating_point; + }; + + + + +} +#endif diff --git a/lib/parallelIO/NerscIO.h b/lib/parallelIO/NerscIO.h index 6fdf83ef..91e622db 100644 --- a/lib/parallelIO/NerscIO.h +++ b/lib/parallelIO/NerscIO.h @@ -397,9 +397,7 @@ static inline void writeConfiguration(Lattice > &Umu typedef LorentzColourMatrixD fobj3D; typedef LorentzColour2x3D fobj2D; - //typedef LorentzColourMatrixF fobj3f; - //typedef LorentzColour2x3F fobj2f; - + GridBase *grid = Umu._grid; NerscGrid(grid,header); From 47c7159177a6a341bcd273d592e0b0c75346ffb9 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 24 Oct 2016 21:57:54 +0100 Subject: [PATCH 088/807] ILDG reader/writer works Fill the xml header with the required information, todo. --- lib/Grid.h | 1 + lib/parallelIO/BinaryIO.h | 46 +++++---- lib/parallelIO/IldgIO.h | 115 +++++++++++++++------ lib/parallelIO/IldgIOtypes.h | 18 ++-- lib/parallelIO/NerscIO.h | 7 +- lib/qcd/hmc/ILDGCheckpointer.h | 121 +++++++++++++++++++++++ tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 2 +- 7 files changed, 248 insertions(+), 62 deletions(-) create mode 100644 lib/qcd/hmc/ILDGCheckpointer.h diff --git a/lib/Grid.h b/lib/Grid.h index 5db4a0d2..03921400 100644 --- a/lib/Grid.h +++ b/lib/Grid.h @@ -87,6 +87,7 @@ Author: paboyle #include #include +#include #include #include diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 3b2a8912..2b7747ba 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -449,10 +449,13 @@ class BinaryIO { return csum; } - - template - static inline uint32_t readObjectParallel(Lattice &Umu,std::string file,munger munge,int offset,const std::string &format) - { + template + static inline uint32_t readObjectParallel(Lattice &Umu, + std::string file, + munger munge, + int offset, + const std::string &format, + ILDGtype ILDG = ILDGtype()) { typedef typename vobj::scalar_object sobj; GridBase *grid = Umu._grid; @@ -518,9 +521,10 @@ class BinaryIO { int myrank = grid->ThisRank(); int iorank = grid->RankFromProcessorCoor(ioproc); - if ( IOnode ) { - fin.open(file,std::ios::binary|std::ios::in); - } + if (!ILDG.is_ILDG) + if ( IOnode ) { + fin.open(file,std::ios::binary|std::ios::in); + } ////////////////////////////////////////////////////////// // Find the location of each site and send to primary node @@ -562,8 +566,15 @@ class BinaryIO { //////////////////////////////// if (myrank == iorank) { - fin.seekg(offset+g_idx*sizeof(fileObj)); - fin.read((char *)&fileObj,sizeof(fileObj)); + if (ILDG.is_ILDG){ + // use C-LIME to populate the record + size_t sizeFO = sizeof(fileObj); + limeReaderSeek(ILDG.LR, g_idx*sizeFO, SEEK_SET); + int status = limeReaderReadData((void *)&fileObj, &sizeFO, ILDG.LR); + } else{ + fin.seekg(offset+g_idx*sizeof(fileObj)); + fin.read((char *)&fileObj,sizeof(fileObj)); + } bytes+=sizeof(fileObj); if(ieee32big) be32toh_v((void *)&fileObj,sizeof(fileObj)); @@ -681,7 +692,7 @@ class BinaryIO { // Ideally one reader/writer per xy plane and read these contiguously // with comms from nominated I/O nodes. std::ofstream fout; - if (!ILDG.is_ILDG){ + if (!ILDG.is_ILDG) if (IOnode){ fout.open(file, std::ios::binary | std::ios::in | std::ios::out); if (!fout.is_open()) { @@ -690,7 +701,7 @@ class BinaryIO { exit(0); } } - } + ////////////////////////////////////////////////////////// // Find the location of each site and send to primary node @@ -753,12 +764,13 @@ class BinaryIO { if (ieee64big) htobe64_v((void *)&fileObj, sizeof(fileObj)); if (ieee64) htole64_v((void *)&fileObj, sizeof(fileObj)); - if (ILDG.is_ILDG){ - size_t sizeFO = sizeof(fileObj); - int status = limeWriteRecordData((char*)&fileObj, &sizeFO, ILDG.LW); - } else{ - fout.seekp(offset + g_idx * sizeof(fileObj)); - fout.write((char *)&fileObj, sizeof(fileObj)); + if (ILDG.is_ILDG) { + size_t sizeFO = sizeof(fileObj); + limeWriterSeek(ILDG.LW, g_idx*sizeFO, SEEK_SET); + int status = limeWriteRecordData((void *)&fileObj, &sizeFO, ILDG.LW); + } else { + fout.seekp(offset + g_idx * sizeof(fileObj)); + fout.write((char *)&fileObj, sizeof(fileObj)); } bytes += sizeof(fileObj); } diff --git a/lib/parallelIO/IldgIO.h b/lib/parallelIO/IldgIO.h index e723d3f8..ad8fcfd3 100644 --- a/lib/parallelIO/IldgIO.h +++ b/lib/parallelIO/IldgIO.h @@ -87,7 +87,7 @@ struct ILDGMunger { }; template -struct ILDGSimpleUnmunger { +struct ILDGUnmunger { void operator()(sobj &in, fobj &out, uint32_t &csum) { for (int mu = 0; mu < 4; mu++) { for (int i = 0; i < 3; i++) { @@ -103,20 +103,45 @@ struct ILDGSimpleUnmunger { //////////////////////////////////////////////////////////////////////////////// // Write and read from fstream; compute header offset for payload //////////////////////////////////////////////////////////////////////////////// +enum ILDGstate {ILDGread, ILDGwrite}; + class ILDGIO : public BinaryIO { - FILE *outFile; + FILE *File; LimeWriter *LimeW; LimeRecordHeader *LimeHeader; + LimeReader *LimeR; + std::string filename; + public: - ILDGIO(std::string file) { - outFile = fopen(file.c_str(), "w"); - // check if opened correctly + ILDGIO(std::string file, ILDGstate RW) { + filename = file; + if (RW == ILDGwrite){ + File = fopen(file.c_str(), "w"); + // check if opened correctly - LimeW = limeCreateWriter(outFile); + LimeW = limeCreateWriter(File); + } else { + File = fopen(file.c_str(), "r"); + // check if opened correctly + + LimeR = limeCreateReader(File); + } } - ~ILDGIO() { fclose(outFile); } + ~ILDGIO() { fclose(File); } + + int createHeader(std::string message, int MB, int ME, size_t PayloadSize, LimeWriter* L){ + LimeRecordHeader *h; + h = limeCreateHeader(MB, ME, const_cast(message.c_str()), PayloadSize); + int status = limeWriteRecordHeader(h, L); + if (status < 0) { + std::cerr << "ILDG Header error\n"; + return status; + } + limeDestroyHeader(h); + return LIME_SUCCESS; + } unsigned int writeHeader(ILDGField &header) { // write header in LIME @@ -131,60 +156,86 @@ class ILDGIO : public BinaryIO { // save the xml header here // use the xml_writer to c++ streams in pugixml // and convert to char message - // limeWriteRecordData(message, &nbytes, LimeW); + limeWriteRecordData(message, &nbytes, LimeW); limeWriterCloseRecord(LimeW); return 0; } - unsigned int readHeader(std::string file, GridBase *grid, ILDGField &field) { + unsigned int readHeader(ILDGField &header) { return 0; } template - int readConfiguration(Lattice > &Umu, - ILDGField &header, std::string file) { + uint32_t readConfiguration(Lattice > &Umu) { typedef Lattice > GaugeField; + typedef LorentzColourMatrixD sobjd; + typedef LorentzColourMatrixF sobjf; + typedef iLorentzColourMatrix itype; + typedef LorentzColourMatrix sobj; + GridBase *grid = Umu._grid; - return 0; + ILDGField header; + readHeader(header); + + // now just the conf, ignore the header + std::string format = std::string("IEEE64BIG"); + do {limeReaderNextRecord(LimeR);} + while (strncmp(limeReaderType(LimeR), "ildg-binary-data",16)); + + n_uint64_t nbytes = limeReaderBytes(LimeR);//size of this record (configuration) + + + ILDGtype ILDGt(true, LimeR); + // this is special for double prec data, just for the moment + uint32_t csum = BinaryIO::readObjectParallel< itype, sobjd >( + Umu, filename, ILDGMunger(), 0, format, ILDGt); + + // Check configuration + // todo + + return csum; } template - int writeConfiguration(Lattice > &Umu, - ILDGField &header, std::string file) { + uint32_t writeConfiguration(Lattice > &Umu, std::string format) { typedef Lattice > GaugeField; typedef iLorentzColourMatrix vobj; typedef typename vobj::scalar_object sobj; typedef LorentzColourMatrixD fobj; - ILDGSimpleUnmunger munge; + ILDGField header; + // fill the header + header.floating_point = format; + + ILDGUnmunger munge; unsigned int offset = writeHeader(header); BinaryIO::Uint32Checksum(Umu, munge, header.checksum); - // Write record header - LimeRecordHeader *h; - std::cout << GridLogDebug << "ILDG Creating Header" << std::endl; - char message[] = "ildg-binary-data"; - h = limeCreateHeader(1, 1, message, strlen(message)); - - std::cout << GridLogDebug << "ILDG Writing Header" << std::endl; - int status = limeWriteRecordHeader(h, LimeW); - - if (status < 0) { - std::cerr << "ILDG Header error\n"; - return 1; - } - - limeDestroyHeader(h); + // Write data record header + n_uint64_t PayloadSize = sizeof(fobj) * Umu._grid->_gsites; + createHeader("ildg-binary-data", 0, 1, PayloadSize, LimeW); ILDGtype ILDGt(true, LimeW); uint32_t csum = BinaryIO::writeObjectParallel( - Umu, file, munge, offset, header.floating_point, ILDGt); + Umu, filename, munge, 0, header.floating_point, ILDGt); limeWriterCloseRecord(LimeW); - return 0; + // Last record + // the logical file name LNF + // look into documentation on how to generate this string + std::string LNF = "empty"; + + + PayloadSize = sizeof(LNF); + createHeader("ildg-binary-lfn", 1 , 1, PayloadSize, LimeW); + limeWriteRecordData(const_cast(LNF.c_str()), &PayloadSize, LimeW); + + limeWriterCloseRecord(LimeW); + + return csum; } // format for RNG? diff --git a/lib/parallelIO/IldgIOtypes.h b/lib/parallelIO/IldgIOtypes.h index bbee2a53..455fef41 100644 --- a/lib/parallelIO/IldgIOtypes.h +++ b/lib/parallelIO/IldgIOtypes.h @@ -33,14 +33,16 @@ extern "C" { // for linkage namespace Grid { - struct ILDGtype{ - bool is_ILDG; - LimeWriter* LW; - - ILDGtype(bool is, LimeWriter* L):is_ILDG(is),LW(L){} - ILDGtype():is_ILDG(false),LW(NULL){} - }; - + struct ILDGtype{ + bool is_ILDG; + LimeWriter* LW; + LimeReader* LR; + + ILDGtype(bool is, LimeWriter* L):is_ILDG(is),LW(L),LR(NULL){} + ILDGtype(bool is, LimeReader* L):is_ILDG(is),LW(NULL),LR(L){} + ILDGtype():is_ILDG(false),LW(NULL),LR(NULL){} + }; + diff --git a/lib/parallelIO/NerscIO.h b/lib/parallelIO/NerscIO.h index 91e622db..0c64f414 100644 --- a/lib/parallelIO/NerscIO.h +++ b/lib/parallelIO/NerscIO.h @@ -424,8 +424,8 @@ static inline void writeConfiguration(Lattice > &Umu //int csum1=BinaryIO::writeObjectSerial(Umu,file1,munge,offset,header.floating_point); - std::cout << GridLogMessage << " TESTING PARALLEL WRITE offsets " << offset1 << " "<< offset << std::endl; - std::cout << GridLogMessage << " TESTING PARALLEL WRITE csums " << csum1 << " "< > &Umu NerscSimpleUnmunger munge; BinaryIO::Uint32Checksum(Umu, munge,header.checksum); offset = writeHeader(header,file); - // csum=BinaryIO::writeObjectSerial(Umu,file,munge,offset,header.floating_point); csum=BinaryIO::writeObjectParallel(Umu,file,munge,offset,header.floating_point); } - std::cout< +#include +#include + +namespace Grid { +namespace QCD { + +// Only for Gauge fields +template +class ILDGHmcCheckpointer + : public HmcObservable { + private: + std::string configStem; + std::string rngStem; + int SaveInterval; + std::string format; + + public: + INHERIT_GIMPL_TYPES(Implementation); // + + ILDGHmcCheckpointer(std::string cf, std::string rn, int savemodulo, + std::string form = "IEEE64BIG") { + configStem = cf; + rngStem = rn; + SaveInterval = savemodulo; + format = form; + + // check here that the format is valid + int ieee32big = (format == std::string("IEEE32BIG")); + int ieee32 = (format == std::string("IEEE32")); + int ieee64big = (format == std::string("IEEE64BIG")); + int ieee64 = (format == std::string("IEEE64")); + + if (!(ieee64big ^ ieee32 ^ ieee32big ^ ieee64)) { + std::cout << GridLogMessage << "Invalid format: " << format << std::endl; + exit(0); + } + }; + + void TrajectoryComplete(int traj, GaugeField &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + if ((traj % SaveInterval) == 0) { + std::string rng; + { + std::ostringstream os; + os << rngStem << "." << traj; + rng = os.str(); + } + std::string config; + { + std::ostringstream os; + os << configStem << "." << traj; + config = os.str(); + } + + ILDGIO IO(config, ILDGwrite); + BinaryIO::writeRNGSerial(sRNG, pRNG, rng, 0); + uint32_t csum = IO.writeConfiguration(U, format); + + std::cout << GridLogMessage << "Written ILDG Configuration on " << config + << " checksum " << std::hex << csum << std::dec << std::endl; + } + }; + + void CheckpointRestore(int traj, GaugeField &U, GridSerialRNG &sRNG, + GridParallelRNG &pRNG) { + std::string rng; + { + std::ostringstream os; + os << rngStem << "." << traj; + rng = os.str(); + } + std::string config; + { + std::ostringstream os; + os << configStem << "." << traj; + config = os.str(); + } + + ILDGIO IO(config, ILDGread); + BinaryIO::readRNGSerial(sRNG, pRNG, rng, 0); + uint32_t csum = IO.readConfiguration(U);// format from the header + + std::cout << GridLogMessage << "Read ILDG Configuration from " << config + << " checksum " << std::hex << csum << std::dec << std::endl; + }; +}; +} +} +#endif diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index aed66d20..65b055ef 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -81,7 +81,7 @@ class HmcRunner : public BinaryHmcRunner { TheAction.push_back(Level1); // Add observables - BinaryHmcCheckpointer Checkpoint( + ILDGHmcCheckpointer Checkpoint( HMCPar.conf_prefix, HMCPar.rng_prefix, HMCPar.SaveInterval, HMCPar.format); // Can implement also a specific function in the hmcrunner // AddCheckpoint (...) that takes the same parameters + a string/tag From 3ab4c8c0bbde6a572d41074405c2baa8e9a0119c Mon Sep 17 00:00:00 2001 From: James Harrison Date: Tue, 25 Oct 2016 13:32:02 +0100 Subject: [PATCH 089/807] QedFVol: calculate plaquette and 2x2 Wilson loop of stochastic QED field --- programs/qed-fvol/WilsonLoops.h | 167 ++++++++++++++++++++++++++++++++ programs/qed-fvol/qed-fvol.cc | 45 +++++++++ 2 files changed, 212 insertions(+) create mode 100644 programs/qed-fvol/WilsonLoops.h diff --git a/programs/qed-fvol/WilsonLoops.h b/programs/qed-fvol/WilsonLoops.h new file mode 100644 index 00000000..610fdc7b --- /dev/null +++ b/programs/qed-fvol/WilsonLoops.h @@ -0,0 +1,167 @@ +#ifndef QEDFVOL_WILSONLOOPS_H +#define QEDFVOL_WILSONLOOPS_H + +#include + +BEGIN_QEDFVOL_NAMESPACE + +template class WilsonLoops : public Gimpl { +public: + INHERIT_GIMPL_TYPES(Gimpl); + + typedef typename Gimpl::GaugeLinkField GaugeMat; + typedef typename Gimpl::GaugeField GaugeLorentz; + + ////////////////////////////////////////////////// + // directed plaquette oriented in mu,nu plane + ////////////////////////////////////////////////// + static void dirPlaquette(GaugeMat &plaq, const std::vector &U, + const int mu, const int nu) { + // Annoyingly, must use either scope resolution to find dependent base + // class, + // or this-> ; there is no "this" in a static method. This forces explicit + // Gimpl scope + // resolution throughout the usage in this file, and rather defeats the + // purpose of deriving + // from Gimpl. + plaq = Gimpl::CovShiftBackward( + U[mu], mu, Gimpl::CovShiftBackward( + U[nu], nu, Gimpl::CovShiftForward(U[mu], mu, U[nu]))); + } + ////////////////////////////////////////////////// + // trace of directed plaquette oriented in mu,nu plane + ////////////////////////////////////////////////// + static void traceDirPlaquette(LatticeComplex &plaq, + const std::vector &U, const int mu, + const int nu) { + GaugeMat sp(U[0]._grid); + dirPlaquette(sp, U, mu, nu); + plaq = trace(sp); + } + ////////////////////////////////////////////////// + // sum over all planes of plaquette + ////////////////////////////////////////////////// + static void sitePlaquette(LatticeComplex &Plaq, + const std::vector &U) { + LatticeComplex sitePlaq(U[0]._grid); + Plaq = zero; + for (int mu = 1; mu < Nd; mu++) { + for (int nu = 0; nu < mu; nu++) { + traceDirPlaquette(sitePlaq, U, mu, nu); + Plaq = Plaq + sitePlaq; + } + } + } + ////////////////////////////////////////////////// + // sum over all x,y,z,t and over all planes of plaquette + ////////////////////////////////////////////////// + static RealD sumPlaquette(const GaugeLorentz &Umu) { + std::vector U(4, Umu._grid); + + for (int mu = 0; mu < Nd; mu++) { + U[mu] = PeekIndex(Umu, mu); + } + + LatticeComplex Plaq(Umu._grid); + + sitePlaquette(Plaq, U); + + TComplex Tp = sum(Plaq); + Complex p = TensorRemove(Tp); + return p.real(); + } + ////////////////////////////////////////////////// + // average over all x,y,z,t and over all planes of plaquette + ////////////////////////////////////////////////// + static RealD avgPlaquette(const GaugeLorentz &Umu) { + RealD sumplaq = sumPlaquette(Umu); + double vol = Umu._grid->gSites(); + double faces = (1.0 * Nd * (Nd - 1)) / 2.0; + return sumplaq / vol / faces / Nc; // Nd , Nc dependent... FIXME + } + + ////////////////////////////////////////////////// + // Wilson loop of size (R1, R2), oriented in mu,nu plane + ////////////////////////////////////////////////// + static void wilsonLoop(GaugeMat &wl, const std::vector &U, + const int Rmu, const int Rnu, + const int mu, const int nu) { + wl = U[nu]; + + for(int i = 0; i < Rnu-1; i++){ + wl = Gimpl::CovShiftForward(U[nu], nu, wl); + } + + for(int i = 0; i < Rmu; i++){ + wl = Gimpl::CovShiftForward(U[mu], mu, wl); + } + + for(int i = 0; i < Rnu; i++){ + wl = Gimpl::CovShiftBackward(U[nu], nu, wl); + } + + for(int i = 0; i < Rmu; i++){ + wl = Gimpl::CovShiftBackward(U[mu], mu, wl); + } + } + ////////////////////////////////////////////////// + // trace of Wilson Loop oriented in mu,nu plane + ////////////////////////////////////////////////// + static void traceWilsonLoop(LatticeComplex &wl, + const std::vector &U, + const int Rmu, const int Rnu, + const int mu, const int nu) { + GaugeMat sp(U[0]._grid); + WilsonLoop(sp, U, Rmu, Rnu, mu, nu); + wl = trace(sp); + } + ////////////////////////////////////////////////// + // sum over all planes of Wilson loop + ////////////////////////////////////////////////// + static void siteWilsonLoop(LatticeComplex &Wl, + const std::vector &U + const int R1, const int R2) { + LatticeComplex siteWl(U[0]._grid); + Wl = zero; + for (int mu = 1; mu < Nd; mu++) { + for (int nu = 0; nu < mu; nu++) { + traceWilsonLoop(siteWl, U, R1, R2, mu, nu); + Wl = Wl + siteWl; + traceWilsonLoop(siteWl, U, R2, R1, mu, nu); + Wl = Wl + siteWl; + } + } + } + ////////////////////////////////////////////////// + // sum over all x,y,z,t and over all planes of Wilson loop + ////////////////////////////////////////////////// + static RealD sumWilsonLoop(const GaugeLorentz &Umu, + const int R1, const int R2) { + std::vector U(4, Umu._grid); + + for (int mu = 0; mu < Nd; mu++) { + U[mu] = PeekIndex(Umu, mu); + } + + LatticeComplex Wl(Umu._grid); + + siteWilsonLoop(Wl, U, R1, R2); + + TComplex Tp = sum(Wl); + Complex p = TensorRemove(Tp); + return p.real(); + } + ////////////////////////////////////////////////// + // average over all x,y,z,t and over all planes of Wilson loop + ////////////////////////////////////////////////// + static RealD avgPlaquette(const GaugeLorentz &Umu, + const int R1, const int R2) { + RealD sumWl = sumWilsonLoop(Umu); + double vol = Umu._grid->gSites(); + double faces = 1.0 * Nd * (Nd - 1); + return sumWl / vol / faces / Nc; // Nd , Nc dependent... FIXME + } + +END_QEDFVOL_NAMESPACE + +#endif // QEDFVOL_WILSONLOOPS_H \ No newline at end of file diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index 53e01de9..02c36a67 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -64,6 +64,51 @@ int main(int argc, char *argv[]) pRNG.SeedRandomDevice(); photon.StochasticField(a, pRNG); + // Calculate log of plaquette + EmComp plaqA(&grid); + EmComp wlA(&grid); + EmComp tmp(&grid); + std::vector a_comp(4, &grid); + + for (int dir = 0; dir < Nd; dir++) { + a_comp[dir] = PeekIndex(a, dir); + } + + plaqA = zero; + wlA = zero; + + for(int mu = 1; mu < Nd; mu++) { + for(int nu = 0; nu < mu; nu++) { + tmp = a_comp[mu] + Cshift(a_comp[nu], mu, 1) - Cshift(a_comp[mu], nu, 1) - a_comp[nu]; + plaqA = plaqA + cos(tmp); + + tmp = a_comp[mu] + Cshift(a_comp[mu], mu, 1) + + Cshift(a_comp[nu], mu, 2) + Cshift(Cshift(a_comp[nu], mu, 2), nu, 1) + - Cshift(Cshift(a_comp[mu], nu, 2), mu, 1) - Cshift(a_comp[mu], nu, 2) + - Cshift(a_comp[nu], nu, 1) - a_comp[nu]; + wlA = wlA + cos(tmp); + } + } + + double vol = grid.gSites(); + double faces = (1.0 * Nd * (Nd - 1)) / 2.0; + + Complex avgPlaqA = sum(trace(plaqA)); + avgPlaqA = avgPlaqA / vol / faces; + + Complex avgWlA = sum(trace(wlA)); + avgWlA = avgWlA / vol / faces; + + TComplex tplaqsite; + LatticeComplex plaqtrace = trace(plaqA); + std::vector site0 = {0,0,0,0}; + peekSite(tplaqsite, plaqtrace, site0); + Complex plaqsite = TensorRemove(tplaqsite); + + LOG(Message) << "Plaquette average: " << avgPlaqA << std::endl; + LOG(Message) << "2x2 Wilson Loop average: " << avgWlA << std::endl; + LOG(Message) << "Plaquette (one site): " << plaqsite / faces << std::endl; + // epilogue LOG(Message) << "Grid is finalizing now" << std::endl; Grid_finalize(); From d50055cd96dac81ab5364ebb33a210dd67d34e98 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 26 Oct 2016 09:48:01 +0100 Subject: [PATCH 090/807] Making the ILDG support optional --- configure.ac | 7 ++- lib/parallelIO/BinaryIO.h | 9 ++- lib/parallelIO/IldgIO.h | 8 ++- lib/parallelIO/IldgIOtypes.h | 78 +++++++++++++----------- lib/qcd/hmc/GenericHMCrunner.h | 1 + lib/qcd/hmc/ILDGCheckpointer.h | 15 ++++- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 4 ++ 7 files changed, 78 insertions(+), 44 deletions(-) diff --git a/configure.ac b/configure.ac index 33a94004..5d5c60f1 100644 --- a/configure.ac +++ b/configure.ac @@ -131,9 +131,11 @@ CXXFLAGS=$CXXFLAGS_CPY LDFLAGS=$LDFLAGS_CPY AC_CHECK_LIB([lime],[limeCreateReader], + [AC_DEFINE([HAVE_LIME],[1],[Define to 1 if you have the `LIME' library (-llime).])] + [have_lime=true] [LIBS="$LIBS -llime"], - [AC_MSG_ERROR(C-LIME library was not found in your system. -Please install or provide the correct path to your installation [default search path ~/lime/] + [AC_MSG_WARN(C-LIME library was not found in your system. +In order to use ILGG file format please install or provide the correct path to your installation [default search path ~/lime/] Info at: http://usqcd.jlab.org/usqcd-docs/c-lime/)]) @@ -355,6 +357,7 @@ Summary of configuration for $PACKAGE v$VERSION - RNG choice : ${ac_RNG} - GMP : `if test "x$have_gmp" = xtrue; then echo yes; else echo no; fi` - LAPACK : ${ac_LAPACK} +- ILDG support (LIME) : `if test "x$have_lime" = xtrue; then echo yes; else echo no; fi` - FFTW : `if test "x$have_fftw" = xtrue; then echo yes; else echo no; fi` - build DOXYGEN documentation : `if test "x$enable_doc" = xyes; then echo yes; else echo no; fi` - graphs and diagrams : `if test "x$enable_dot" = xyes; then echo yes; else echo no; fi` diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index 2b7747ba..b5b684f6 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -568,9 +568,11 @@ class BinaryIO { if (ILDG.is_ILDG){ // use C-LIME to populate the record + #ifdef HAVE_LIME size_t sizeFO = sizeof(fileObj); limeReaderSeek(ILDG.LR, g_idx*sizeFO, SEEK_SET); int status = limeReaderReadData((void *)&fileObj, &sizeFO, ILDG.LR); + #endif } else{ fin.seekg(offset+g_idx*sizeof(fileObj)); fin.read((char *)&fileObj,sizeof(fileObj)); @@ -764,11 +766,16 @@ class BinaryIO { if (ieee64big) htobe64_v((void *)&fileObj, sizeof(fileObj)); if (ieee64) htole64_v((void *)&fileObj, sizeof(fileObj)); + if (ILDG.is_ILDG) { + #ifdef HAVE_LIME size_t sizeFO = sizeof(fileObj); limeWriterSeek(ILDG.LW, g_idx*sizeFO, SEEK_SET); int status = limeWriteRecordData((void *)&fileObj, &sizeFO, ILDG.LW); - } else { + #endif + } + + else { fout.seekp(offset + g_idx * sizeof(fileObj)); fout.write((char *)&fileObj, sizeof(fileObj)); } diff --git a/lib/parallelIO/IldgIO.h b/lib/parallelIO/IldgIO.h index ad8fcfd3..0912e2f6 100644 --- a/lib/parallelIO/IldgIO.h +++ b/lib/parallelIO/IldgIO.h @@ -37,6 +37,8 @@ directory #include #include +#ifdef HAVE_LIME + extern "C" { // for linkage #include "lime.h" } @@ -238,8 +240,12 @@ class ILDGIO : public BinaryIO { return csum; } - // format for RNG? + // format for RNG? Now just binary out }; } } + +//HAVE_LIME +#endif + #endif diff --git a/lib/parallelIO/IldgIOtypes.h b/lib/parallelIO/IldgIOtypes.h index 455fef41..4c7a1edd 100644 --- a/lib/parallelIO/IldgIOtypes.h +++ b/lib/parallelIO/IldgIOtypes.h @@ -27,50 +27,54 @@ directory #ifndef GRID_ILDGTYPES_IO_H #define GRID_ILDGTYPES_IO_H +#ifdef HAVE_LIME extern "C" { // for linkage #include "lime.h" } namespace Grid { - struct ILDGtype{ - bool is_ILDG; - LimeWriter* LW; - LimeReader* LR; - - ILDGtype(bool is, LimeWriter* L):is_ILDG(is),LW(L),LR(NULL){} - ILDGtype(bool is, LimeReader* L):is_ILDG(is),LW(NULL),LR(L){} - ILDGtype():is_ILDG(false),LW(NULL),LR(NULL){} - }; - - - - - class ILDGField { - public: - // header strings (not in order) - std::vector dimension; - std::vector boundary; - int data_start; - std::string hdr_version; - std::string storage_format; - // Checks on data - double link_trace; - double plaquette; - uint32_t checksum; - unsigned int sequence_number; - std::string data_type; - std::string ensemble_id ; - std::string ensemble_label ; - std::string creator ; - std::string creator_hardware ; - std::string creation_date ; - std::string archive_date ; - std::string floating_point; - }; - - +struct ILDGtype { + bool is_ILDG; + LimeWriter* LW; + LimeReader* LR; + ILDGtype(bool is, LimeWriter* L) : is_ILDG(is), LW(L), LR(NULL) {} + ILDGtype(bool is, LimeReader* L) : is_ILDG(is), LW(NULL), LR(L) {} + ILDGtype() : is_ILDG(false), LW(NULL), LR(NULL) {} +}; +class ILDGField { + public: + // header strings (not in order) + std::vector dimension; + std::vector boundary; + int data_start; + std::string hdr_version; + std::string storage_format; + // Checks on data + double link_trace; + double plaquette; + uint32_t checksum; + unsigned int sequence_number; + std::string data_type; + std::string ensemble_id; + std::string ensemble_label; + std::string creator; + std::string creator_hardware; + std::string creation_date; + std::string archive_date; + std::string floating_point; +}; } +#else +namespace Grid { + +struct ILDGtype { + bool is_ILDG; + ILDGtype() : is_ILDG(false) {} +}; +} + +#endif #endif diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index fbf26156..114595b1 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -83,6 +83,7 @@ namespace QCD { } ////////////////////////////// + template void Runner(int argc, char ** argv, diff --git a/lib/qcd/hmc/ILDGCheckpointer.h b/lib/qcd/hmc/ILDGCheckpointer.h index 9c65bef2..5dd3120f 100644 --- a/lib/qcd/hmc/ILDGCheckpointer.h +++ b/lib/qcd/hmc/ILDGCheckpointer.h @@ -29,6 +29,8 @@ directory #ifndef ILDG_CHECKPOINTER #define ILDG_CHECKPOINTER +#ifdef HAVE_LIME + #include #include #include @@ -47,7 +49,7 @@ class ILDGHmcCheckpointer std::string format; public: - INHERIT_GIMPL_TYPES(Implementation); // + INHERIT_GIMPL_TYPES(Implementation); ILDGHmcCheckpointer(std::string cf, std::string rn, int savemodulo, std::string form = "IEEE64BIG") { @@ -62,8 +64,13 @@ class ILDGHmcCheckpointer int ieee64big = (format == std::string("IEEE64BIG")); int ieee64 = (format == std::string("IEEE64")); - if (!(ieee64big ^ ieee32 ^ ieee32big ^ ieee64)) { - std::cout << GridLogMessage << "Invalid format: " << format << std::endl; + if (!(ieee64big || ieee32 || ieee32big || ieee64)) { + std::cout << GridLogError << "Unrecognized file format " << format + << std::endl; + std::cout << GridLogError + << "Allowed: IEEE32BIG | IEEE32 | IEEE64BIG | IEEE64" + << std::endl; + exit(0); } }; @@ -118,4 +125,6 @@ class ILDGHmcCheckpointer }; } } + +#endif #endif diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 65b055ef..01a6a0e9 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -81,6 +81,10 @@ class HmcRunner : public BinaryHmcRunner { TheAction.push_back(Level1); // Add observables + // options for checkpointers + //BinaryHmcCheckpointer + //ILDGHmcCheckpointer + //NerscHmcCheckpointer ILDGHmcCheckpointer Checkpoint( HMCPar.conf_prefix, HMCPar.rng_prefix, HMCPar.SaveInterval, HMCPar.format); // Can implement also a specific function in the hmcrunner From 1d666771f9c7c2e6d41622ffdcea4d4d92acafde Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 26 Oct 2016 16:08:23 +0100 Subject: [PATCH 091/807] Debugging the RNG, eliminate the barrier after broadcast --- lib/parallelIO/BinaryIO.h | 2 +- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h index b5b684f6..83b183c6 100644 --- a/lib/parallelIO/BinaryIO.h +++ b/lib/parallelIO/BinaryIO.h @@ -355,7 +355,7 @@ class BinaryIO { } grid->Broadcast(rank, (void *)&saved[0], bytes); - grid->Barrier(); // necessary? + //grid->Barrier(); // necessary? if (grid->IsBoss()) { Uint32Checksum((uint32_t *)&saved[0], bytes, csum); fout.write((char *)&saved[0], bytes); diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 01a6a0e9..60035135 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -85,7 +85,7 @@ class HmcRunner : public BinaryHmcRunner { //BinaryHmcCheckpointer //ILDGHmcCheckpointer //NerscHmcCheckpointer - ILDGHmcCheckpointer Checkpoint( + NerscHmcCheckpointer Checkpoint( HMCPar.conf_prefix, HMCPar.rng_prefix, HMCPar.SaveInterval, HMCPar.format); // Can implement also a specific function in the hmcrunner // AddCheckpoint (...) that takes the same parameters + a string/tag From 78c7bcee36f7d937c8f5c6afe0f2088f85ebda51 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Tue, 1 Nov 2016 13:30:11 +0000 Subject: [PATCH 092/807] QedFVol: Change variables of type "double" to type "Real". --- programs/qed-fvol/qed-fvol.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index 02c36a67..fd780edf 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -90,8 +90,8 @@ int main(int argc, char *argv[]) } } - double vol = grid.gSites(); - double faces = (1.0 * Nd * (Nd - 1)) / 2.0; + Real vol = grid.gSites(); + Real faces = (1.0 * Nd * (Nd - 1)) / 2.0; Complex avgPlaqA = sum(trace(plaqA)); avgPlaqA = avgPlaqA / vol / faces; From c30d96ea5097ab1760a3f0a6ea1aed8ac1e6142b Mon Sep 17 00:00:00 2001 From: James Harrison Date: Wed, 9 Nov 2016 11:06:20 +0000 Subject: [PATCH 093/807] QedFVol: x86intrin.h namespace fix --- lib/PerfCount.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/PerfCount.h b/lib/PerfCount.h index 9ac58883..5ab07c02 100644 --- a/lib/PerfCount.h +++ b/lib/PerfCount.h @@ -43,6 +43,9 @@ Author: paboyle #else #include #endif +#ifdef __x86_64__ +#include +#endif namespace Grid { @@ -86,7 +89,6 @@ inline uint64_t cyclecount(void){ return tmp; } #elif defined __x86_64__ -#include inline uint64_t cyclecount(void){ return __rdtsc(); // unsigned int dummy; From 19b85d84862df3fb39a81446ce8e0e216e7c759c Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 10 Nov 2016 17:55:58 +0000 Subject: [PATCH 094/807] Some comments in the hmc files --- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 60035135..2becb37c 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -58,6 +58,7 @@ class HMCRunnerParameters : Serializable { HMCRunnerParameters() {} }; + // Derive from the BinaryHmcRunner (templated for gauge fields) class HmcRunner : public BinaryHmcRunner { public: @@ -65,15 +66,21 @@ class HmcRunner : public BinaryHmcRunner { void BuildTheAction(int argc, char **argv) { + // Typedefs to simplify notation + typedef WilsonGaugeActionR GaugeAction; typedef WilsonImplR ImplPolicy; typedef WilsonFermionR FermionAction; typedef typename FermionAction::FermionField FermionField; - UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), GridDefaultMpi()); + // this can be simplified too. MakeDefaultGrid(Nd) + UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), + GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); // Gauge action - WilsonGaugeActionR Waction(HMCPar.beta); + GaugeAction Waction(HMCPar.beta); // Collect actions ActionLevel Level1(1); @@ -113,12 +120,14 @@ int main(int argc, char **argv) { << " threads" << std::endl; HmcRunner TheHMC; + // make input file name general InputFileReader Reader("input.wilson_gauge.params"); read(Reader, "HMC", TheHMC.HMCPar); std::cout << GridLogMessage << TheHMC.HMCPar << std::endl; // Seeds for the random number generators + // generalise std::vector SerSeed = strToVec(TheHMC.HMCPar.serial_seeds); std::vector ParSeed = strToVec(TheHMC.HMCPar.parallel_seeds); From 1aa695cd78839f15c968c131574bed620421bac8 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 10 Nov 2016 18:38:30 +0000 Subject: [PATCH 095/807] Hadrons: merge typo --- programs/Hadrons/Module.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 2ea1cf21..21f374e0 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -128,7 +128,7 @@ Module

::Module(const std::string name) template void Module

::parseParameters(XmlReader &reader, const std::string name) { - read(reader, name, par_);read(reader, name, par_); + read(reader, name, par_); } template From 4e1ffdd17c2c95c88867d48966d1ad3e8a600bb7 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 10 Nov 2016 18:44:36 +0000 Subject: [PATCH 096/807] Adding git info to the configure output --- configure.ac | 8 ++++++++ scripts/configure.commit | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100755 scripts/configure.commit diff --git a/configure.ac b/configure.ac index 46fda677..944e53ef 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,9 @@ AC_CONFIG_SRCDIR([lib/Grid.h]) AC_CONFIG_HEADERS([lib/Config.h]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +################ Get git info +#AC_REVISION([m4_esyscmd_s([./scripts/configure.commit])]) + ############### Checks for programs CXXFLAGS="-O3 $CXXFLAGS" AC_PROG_CXX @@ -379,10 +382,15 @@ AC_CONFIG_FILES(tests/qdpxx/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) AC_OUTPUT +git_commit=`cd $srcdir && ./scripts/configure.commit` + echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Summary of configuration for $PACKAGE v$VERSION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +----- GIT VERSION ------------------------------------- +$git_commit + ----- PLATFORM ---------------------------------------- architecture (build) : $build_cpu os (build) : $build_os diff --git a/scripts/configure.commit b/scripts/configure.commit new file mode 100755 index 00000000..77991392 --- /dev/null +++ b/scripts/configure.commit @@ -0,0 +1,19 @@ + + +#! /bin/sh +# Display the SHA1 of the commit in which configure.ac was last modified. +# If it's not checked in yet, use the SHA1 of HEAD plus -dirty. + +# + +if [ ! -d .git ] ; then + # if no .git directory, assume they're not using Git + printf 'unknown commit' +elif git diff --quiet HEAD -- configure.ac ; then + # configure.ac is not modified + printf 'commit: %s\n' `git rev-parse --short HEAD -- configure.ac` + printf 'branch: %s\n' `git rev-parse --abbrev-ref HEAD` +else # configure.ac is modified + printf 'commit: %s-dirty\n' `git rev-parse --short HEAD` + printf 'branch: %s\n' `git rev-parse --abbrev-ref HEAD` + fi \ No newline at end of file From 6f8b771a37f4ea2a78ba8a439f46a3db68774da3 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 10 Nov 2016 18:52:00 +0000 Subject: [PATCH 097/807] Adding date of the last commit --- scripts/configure.commit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/configure.commit b/scripts/configure.commit index 77991392..afc662eb 100755 --- a/scripts/configure.commit +++ b/scripts/configure.commit @@ -1,5 +1,3 @@ - - #! /bin/sh # Display the SHA1 of the commit in which configure.ac was last modified. # If it's not checked in yet, use the SHA1 of HEAD plus -dirty. @@ -13,7 +11,9 @@ elif git diff --quiet HEAD -- configure.ac ; then # configure.ac is not modified printf 'commit: %s\n' `git rev-parse --short HEAD -- configure.ac` printf 'branch: %s\n' `git rev-parse --abbrev-ref HEAD` + printf 'date : %s\n' `git log -1 --date=short --pretty=format:%cd` else # configure.ac is modified printf 'commit: %s-dirty\n' `git rev-parse --short HEAD` printf 'branch: %s\n' `git rev-parse --abbrev-ref HEAD` + printf 'date : %s\n' `git log -1 --date=short --pretty=format:%cd` fi \ No newline at end of file From cf167d0cd1c561bed3557eaf89350b8d8eb8d9b1 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Mon, 14 Nov 2016 17:02:29 +0000 Subject: [PATCH 098/807] QedFVol: implement exponentiation of photon field --- programs/qed-fvol/WilsonLoops.h | 19 ++++++++++--------- programs/qed-fvol/qed-fvol.cc | 32 +++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/programs/qed-fvol/WilsonLoops.h b/programs/qed-fvol/WilsonLoops.h index 610fdc7b..c40fbaf3 100644 --- a/programs/qed-fvol/WilsonLoops.h +++ b/programs/qed-fvol/WilsonLoops.h @@ -5,7 +5,7 @@ BEGIN_QEDFVOL_NAMESPACE -template class WilsonLoops : public Gimpl { +template class NewWilsonLoops : public Gimpl { public: INHERIT_GIMPL_TYPES(Gimpl); @@ -55,7 +55,7 @@ public: ////////////////////////////////////////////////// // sum over all x,y,z,t and over all planes of plaquette ////////////////////////////////////////////////// - static RealD sumPlaquette(const GaugeLorentz &Umu) { + static Real sumPlaquette(const GaugeLorentz &Umu) { std::vector U(4, Umu._grid); for (int mu = 0; mu < Nd; mu++) { @@ -73,8 +73,8 @@ public: ////////////////////////////////////////////////// // average over all x,y,z,t and over all planes of plaquette ////////////////////////////////////////////////// - static RealD avgPlaquette(const GaugeLorentz &Umu) { - RealD sumplaq = sumPlaquette(Umu); + static Real avgPlaquette(const GaugeLorentz &Umu) { + Real sumplaq = sumPlaquette(Umu); double vol = Umu._grid->gSites(); double faces = (1.0 * Nd * (Nd - 1)) / 2.0; return sumplaq / vol / faces / Nc; // Nd , Nc dependent... FIXME @@ -112,14 +112,14 @@ public: const int Rmu, const int Rnu, const int mu, const int nu) { GaugeMat sp(U[0]._grid); - WilsonLoop(sp, U, Rmu, Rnu, mu, nu); + wilsonLoop(sp, U, Rmu, Rnu, mu, nu); wl = trace(sp); } ////////////////////////////////////////////////// // sum over all planes of Wilson loop ////////////////////////////////////////////////// static void siteWilsonLoop(LatticeComplex &Wl, - const std::vector &U + const std::vector &U, const int R1, const int R2) { LatticeComplex siteWl(U[0]._grid); Wl = zero; @@ -135,7 +135,7 @@ public: ////////////////////////////////////////////////// // sum over all x,y,z,t and over all planes of Wilson loop ////////////////////////////////////////////////// - static RealD sumWilsonLoop(const GaugeLorentz &Umu, + static Real sumWilsonLoop(const GaugeLorentz &Umu, const int R1, const int R2) { std::vector U(4, Umu._grid); @@ -154,13 +154,14 @@ public: ////////////////////////////////////////////////// // average over all x,y,z,t and over all planes of Wilson loop ////////////////////////////////////////////////// - static RealD avgPlaquette(const GaugeLorentz &Umu, + static Real avgWilsonLoop(const GaugeLorentz &Umu, const int R1, const int R2) { - RealD sumWl = sumWilsonLoop(Umu); + Real sumWl = sumWilsonLoop(Umu, R1, R2); double vol = Umu._grid->gSites(); double faces = 1.0 * Nd * (Nd - 1); return sumWl / vol / faces / Nc; // Nd , Nc dependent... FIXME } +}; END_QEDFVOL_NAMESPACE diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index fd780edf..68705b8f 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -1,4 +1,5 @@ #include +#include using namespace Grid; using namespace QCD; @@ -24,10 +25,11 @@ public: typedef Lattice GaugeField; }; -typedef QedGimpl QedGimplR; -typedef Photon PhotonR; -typedef PhotonR::GaugeField EmField; -typedef PhotonR::GaugeLinkField EmComp; +typedef QedGimpl QedGimplR; +typedef PeriodicGaugeImpl QedPeriodicGimplR; +typedef Photon PhotonR; +typedef PhotonR::GaugeField EmField; +typedef PhotonR::GaugeLinkField EmComp; int main(int argc, char *argv[]) { @@ -60,11 +62,18 @@ int main(int argc, char *argv[]) PhotonR photon(PhotonR::Gauge::Feynman, PhotonR::ZmScheme::QedL); EmField a(&grid); + EmField expA(&grid); + + Real avgPlaqAexp, avgWl2x2Aexp; pRNG.SeedRandomDevice(); photon.StochasticField(a, pRNG); - // Calculate log of plaquette + // Exponentiate photon field + Complex imag_unit(0, 1); + expA = exp(imag_unit*0.5*(a+conjugate(a))); + + // Calculate plaquette from photon field EmComp plaqA(&grid); EmComp wlA(&grid); EmComp tmp(&grid); @@ -105,8 +114,17 @@ int main(int argc, char *argv[]) peekSite(tplaqsite, plaqtrace, site0); Complex plaqsite = TensorRemove(tplaqsite); - LOG(Message) << "Plaquette average: " << avgPlaqA << std::endl; - LOG(Message) << "2x2 Wilson Loop average: " << avgWlA << std::endl; + // Calculate plaquette from exponentiated photon field + avgPlaqAexp = NewWilsonLoops::avgPlaquette(expA); + avgWl2x2Aexp = NewWilsonLoops::avgWilsonLoop(expA, 2, 2); + + avgPlaqAexp = avgPlaqAexp*3; + avgWl2x2Aexp = avgWl2x2Aexp*3; + + LOG(Message) << "Plaquette average (from A): " << avgPlaqA << std::endl; + LOG(Message) << "Plaquette average (from exp(A)): " << avgPlaqAexp << std::endl; + LOG(Message) << "2x2 Wilson Loop average (from A): " << avgWlA << std::endl; + LOG(Message) << "2x2 Wilson Loop average (from exp(A)): " << avgWl2x2Aexp << std::endl; LOG(Message) << "Plaquette (one site): " << plaqsite / faces << std::endl; // epilogue From f4ebea3381046026276864f3f908cb10b114d6a5 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Mon, 14 Nov 2016 17:51:53 +0000 Subject: [PATCH 099/807] QedFVol: add functions for computing spatial and timelike Wilson loops --- programs/qed-fvol/WilsonLoops.h | 117 +++++++++++++++++++++++++++++--- programs/qed-fvol/qed-fvol.cc | 8 ++- 2 files changed, 114 insertions(+), 11 deletions(-) diff --git a/programs/qed-fvol/WilsonLoops.h b/programs/qed-fvol/WilsonLoops.h index c40fbaf3..98db6b7a 100644 --- a/programs/qed-fvol/WilsonLoops.h +++ b/programs/qed-fvol/WilsonLoops.h @@ -45,7 +45,7 @@ public: const std::vector &U) { LatticeComplex sitePlaq(U[0]._grid); Plaq = zero; - for (int mu = 1; mu < Nd; mu++) { + for (int mu = 1; mu < U[0]._grid->_ndimension; mu++) { for (int nu = 0; nu < mu; nu++) { traceDirPlaquette(sitePlaq, U, mu, nu); Plaq = Plaq + sitePlaq; @@ -58,7 +58,7 @@ public: static Real sumPlaquette(const GaugeLorentz &Umu) { std::vector U(4, Umu._grid); - for (int mu = 0; mu < Nd; mu++) { + for (int mu = 0; mu < Umu._grid->_ndimension; mu++) { U[mu] = PeekIndex(Umu, mu); } @@ -74,10 +74,11 @@ public: // average over all x,y,z,t and over all planes of plaquette ////////////////////////////////////////////////// static Real avgPlaquette(const GaugeLorentz &Umu) { + int ndim = Umu._grid->_ndimension; Real sumplaq = sumPlaquette(Umu); - double vol = Umu._grid->gSites(); - double faces = (1.0 * Nd * (Nd - 1)) / 2.0; - return sumplaq / vol / faces / Nc; // Nd , Nc dependent... FIXME + Real vol = Umu._grid->gSites(); + Real faces = (1.0 * ndim * (ndim - 1)) / 2.0; + return sumplaq / vol / faces / Nc; // Nc dependent... FIXME } ////////////////////////////////////////////////// @@ -123,7 +124,42 @@ public: const int R1, const int R2) { LatticeComplex siteWl(U[0]._grid); Wl = zero; - for (int mu = 1; mu < Nd; mu++) { + for (int mu = 1; mu < U[0]._grid->_ndimension; mu++) { + for (int nu = 0; nu < mu; nu++) { + traceWilsonLoop(siteWl, U, R1, R2, mu, nu); + Wl = Wl + siteWl; + traceWilsonLoop(siteWl, U, R2, R1, mu, nu); + Wl = Wl + siteWl; + } + } + } + ////////////////////////////////////////////////// + // sum over planes of Wilson loop with length R1 + // in the time direction + ////////////////////////////////////////////////// + static void siteTimelikeWilsonLoop(LatticeComplex &Wl, + const std::vector &U, + const int R1, const int R2) { + LatticeComplex siteWl(U[0]._grid); + + int ndim = U[0]._grid->_ndimension; + + Wl = zero; + for (int nu = 0; nu < ndim - 1; nu++) { + traceWilsonLoop(siteWl, U, R1, R2, ndim-1, nu); + Wl = Wl + siteWl; + } + } + ////////////////////////////////////////////////// + // sum Wilson loop over all planes orthogonal to the time direction + ////////////////////////////////////////////////// + static void siteSpatialWilsonLoop(LatticeComplex &Wl, + const std::vector &U, + const int R1, const int R2) { + LatticeComplex siteWl(U[0]._grid); + + Wl = zero; + for (int mu = 1; mu < U[0]._grid->_ndimension - 1; mu++) { for (int nu = 0; nu < mu; nu++) { traceWilsonLoop(siteWl, U, R1, R2, mu, nu); Wl = Wl + siteWl; @@ -139,7 +175,7 @@ public: const int R1, const int R2) { std::vector U(4, Umu._grid); - for (int mu = 0; mu < Nd; mu++) { + for (int mu = 0; mu < Umu._grid->_ndimension; mu++) { U[mu] = PeekIndex(Umu, mu); } @@ -152,14 +188,75 @@ public: return p.real(); } ////////////////////////////////////////////////// + // sum over all x,y,z,t and over all planes of timelike Wilson loop + ////////////////////////////////////////////////// + static Real sumTimelikeWilsonLoop(const GaugeLorentz &Umu, + const int R1, const int R2) { + std::vector U(4, Umu._grid); + + for (int mu = 0; mu < Umu._grid->_ndimension; mu++) { + U[mu] = PeekIndex(Umu, mu); + } + + LatticeComplex Wl(Umu._grid); + + siteTimelikeWilsonLoop(Wl, U, R1, R2); + + TComplex Tp = sum(Wl); + Complex p = TensorRemove(Tp); + return p.real(); + } + ////////////////////////////////////////////////// + // sum over all x,y,z,t and over all planes of spatial Wilson loop + ////////////////////////////////////////////////// + static Real sumSpatialWilsonLoop(const GaugeLorentz &Umu, + const int R1, const int R2) { + std::vector U(4, Umu._grid); + + for (int mu = 0; mu < Umu._grid->_ndimension; mu++) { + U[mu] = PeekIndex(Umu, mu); + } + + LatticeComplex Wl(Umu._grid); + + siteSpatialWilsonLoop(Wl, U, R1, R2); + + TComplex Tp = sum(Wl); + Complex p = TensorRemove(Tp); + return p.real(); + } + ////////////////////////////////////////////////// // average over all x,y,z,t and over all planes of Wilson loop ////////////////////////////////////////////////// static Real avgWilsonLoop(const GaugeLorentz &Umu, const int R1, const int R2) { + int ndim = Umu._grid->_ndimension; Real sumWl = sumWilsonLoop(Umu, R1, R2); - double vol = Umu._grid->gSites(); - double faces = 1.0 * Nd * (Nd - 1); - return sumWl / vol / faces / Nc; // Nd , Nc dependent... FIXME + Real vol = Umu._grid->gSites(); + Real faces = 1.0 * ndim * (ndim - 1); + return sumWl / vol / faces / Nc; // Nc dependent... FIXME + } + ////////////////////////////////////////////////// + // average over all x,y,z,t and over all planes of timelike Wilson loop + ////////////////////////////////////////////////// + static Real avgTimelikeWilsonLoop(const GaugeLorentz &Umu, + const int R1, const int R2) { + int ndim = Umu._grid->_ndimension; + Real sumWl = sumTimelikeWilsonLoop(Umu, R1, R2); + Real vol = Umu._grid->gSites(); + Real faces = 1.0 * (ndim - 1); + return sumWl / vol / faces / Nc; // Nc dependent... FIXME + } + ////////////////////////////////////////////////// + // average over all x,y,z,t and over all planes of spatial Wilson loop + ////////////////////////////////////////////////// + static Real avgSpatialWilsonLoop(const GaugeLorentz &Umu, + const int R1, const int R2) { + int ndim = Umu._grid->_ndimension; + Real sumWl = sumSpatialWilsonLoop(Umu, R1, R2); + Real vol = Umu._grid->gSites(); + Real faces = 1.0 * (ndim - 1) * (ndim - 2); + return sumWl / vol / faces / Nc; // Nc dependent... FIXME } }; diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index 68705b8f..d026057e 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) EmField a(&grid); EmField expA(&grid); - Real avgPlaqAexp, avgWl2x2Aexp; + Real avgPlaqAexp, avgWl2x2Aexp, avgWl2x2Aexp_time, avgWl2x2Aexp_space; pRNG.SeedRandomDevice(); photon.StochasticField(a, pRNG); @@ -117,14 +117,20 @@ int main(int argc, char *argv[]) // Calculate plaquette from exponentiated photon field avgPlaqAexp = NewWilsonLoops::avgPlaquette(expA); avgWl2x2Aexp = NewWilsonLoops::avgWilsonLoop(expA, 2, 2); + avgWl2x2Aexp_time = NewWilsonLoops::avgTimelikeWilsonLoop(expA, 2, 2); + avgWl2x2Aexp_space = NewWilsonLoops::avgSpatialWilsonLoop(expA, 2, 2); avgPlaqAexp = avgPlaqAexp*3; avgWl2x2Aexp = avgWl2x2Aexp*3; + avgWl2x2Aexp_time = avgWl2x2Aexp_time*3; + avgWl2x2Aexp_space = avgWl2x2Aexp_space*3; LOG(Message) << "Plaquette average (from A): " << avgPlaqA << std::endl; LOG(Message) << "Plaquette average (from exp(A)): " << avgPlaqAexp << std::endl; LOG(Message) << "2x2 Wilson Loop average (from A): " << avgWlA << std::endl; LOG(Message) << "2x2 Wilson Loop average (from exp(A)): " << avgWl2x2Aexp << std::endl; + LOG(Message) << "2x2 Wilson Loop timelike average (from exp(A)): " << avgWl2x2Aexp_time << std::endl; + LOG(Message) << "2x2 Wilson Loop spatial average (from exp(A)): " << avgWl2x2Aexp_space << std::endl; LOG(Message) << "Plaquette (one site): " << plaqsite / faces << std::endl; // epilogue From 92ec3404f8a404e7d6420ebfa0f113af5eb6ec6d Mon Sep 17 00:00:00 2001 From: James Harrison Date: Mon, 14 Nov 2016 17:59:02 +0000 Subject: [PATCH 100/807] Set imaginary part of stochastic QED field to zero after FFT into position space --- lib/qcd/action/gauge/Photon.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/qcd/action/gauge/Photon.h b/lib/qcd/action/gauge/Photon.h index 852ecb3e..ca0a8d40 100644 --- a/lib/qcd/action/gauge/Photon.h +++ b/lib/qcd/action/gauge/Photon.h @@ -172,6 +172,8 @@ namespace QCD{ pokeLorentz(aTilde, r, mu); } fft.FFT_all_dim(out, aTilde, FFT::backward); + + out = 0.5*(out + conjugate(out)); } // template // void Photon::FeynmanGaugeMomentumSpacePropagator_L(GaugeField &out, From a71b69389b6fc7360dbebbf5ed8d4fa3a6952016 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Mon, 14 Nov 2016 18:23:04 +0000 Subject: [PATCH 101/807] QedFVol: calculate square Wilson loops up to 10x10 --- programs/qed-fvol/qed-fvol.cc | 74 +++++++---------------------------- 1 file changed, 14 insertions(+), 60 deletions(-) diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index d026057e..31312b1e 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -64,75 +64,29 @@ int main(int argc, char *argv[]) EmField a(&grid); EmField expA(&grid); - Real avgPlaqAexp, avgWl2x2Aexp, avgWl2x2Aexp_time, avgWl2x2Aexp_space; + Real wlA, logWlA; pRNG.SeedRandomDevice(); photon.StochasticField(a, pRNG); // Exponentiate photon field Complex imag_unit(0, 1); - expA = exp(imag_unit*0.5*(a+conjugate(a))); + expA = exp(imag_unit*a); - // Calculate plaquette from photon field - EmComp plaqA(&grid); - EmComp wlA(&grid); - EmComp tmp(&grid); - std::vector a_comp(4, &grid); - - for (int dir = 0; dir < Nd; dir++) { - a_comp[dir] = PeekIndex(a, dir); + // Calculate Wilson loops + for(int i=1; i<=10; i++){ + LOG(Message) << i << 'x' << i << " Wilson loop" << std::endl; + wlA = NewWilsonLoops::avgWilsonLoop(expA, i, i) * 3; + logWlA = -2*log(wlA); + LOG(Message) << "-2log(W) average: " << logWlA << std::endl; + wlA = NewWilsonLoops::avgTimelikeWilsonLoop(expA, i, i) * 3; + logWlA = -2*log(wlA); + LOG(Message) << "-2log(W) timelike: " << logWlA << std::endl; + wlA = NewWilsonLoops::avgSpatialWilsonLoop(expA, i, i) * 3; + logWlA = -2*log(wlA); + LOG(Message) << "-2log(W) spatial: " << logWlA << std::endl; } - plaqA = zero; - wlA = zero; - - for(int mu = 1; mu < Nd; mu++) { - for(int nu = 0; nu < mu; nu++) { - tmp = a_comp[mu] + Cshift(a_comp[nu], mu, 1) - Cshift(a_comp[mu], nu, 1) - a_comp[nu]; - plaqA = plaqA + cos(tmp); - - tmp = a_comp[mu] + Cshift(a_comp[mu], mu, 1) - + Cshift(a_comp[nu], mu, 2) + Cshift(Cshift(a_comp[nu], mu, 2), nu, 1) - - Cshift(Cshift(a_comp[mu], nu, 2), mu, 1) - Cshift(a_comp[mu], nu, 2) - - Cshift(a_comp[nu], nu, 1) - a_comp[nu]; - wlA = wlA + cos(tmp); - } - } - - Real vol = grid.gSites(); - Real faces = (1.0 * Nd * (Nd - 1)) / 2.0; - - Complex avgPlaqA = sum(trace(plaqA)); - avgPlaqA = avgPlaqA / vol / faces; - - Complex avgWlA = sum(trace(wlA)); - avgWlA = avgWlA / vol / faces; - - TComplex tplaqsite; - LatticeComplex plaqtrace = trace(plaqA); - std::vector site0 = {0,0,0,0}; - peekSite(tplaqsite, plaqtrace, site0); - Complex plaqsite = TensorRemove(tplaqsite); - - // Calculate plaquette from exponentiated photon field - avgPlaqAexp = NewWilsonLoops::avgPlaquette(expA); - avgWl2x2Aexp = NewWilsonLoops::avgWilsonLoop(expA, 2, 2); - avgWl2x2Aexp_time = NewWilsonLoops::avgTimelikeWilsonLoop(expA, 2, 2); - avgWl2x2Aexp_space = NewWilsonLoops::avgSpatialWilsonLoop(expA, 2, 2); - - avgPlaqAexp = avgPlaqAexp*3; - avgWl2x2Aexp = avgWl2x2Aexp*3; - avgWl2x2Aexp_time = avgWl2x2Aexp_time*3; - avgWl2x2Aexp_space = avgWl2x2Aexp_space*3; - - LOG(Message) << "Plaquette average (from A): " << avgPlaqA << std::endl; - LOG(Message) << "Plaquette average (from exp(A)): " << avgPlaqAexp << std::endl; - LOG(Message) << "2x2 Wilson Loop average (from A): " << avgWlA << std::endl; - LOG(Message) << "2x2 Wilson Loop average (from exp(A)): " << avgWl2x2Aexp << std::endl; - LOG(Message) << "2x2 Wilson Loop timelike average (from exp(A)): " << avgWl2x2Aexp_time << std::endl; - LOG(Message) << "2x2 Wilson Loop spatial average (from exp(A)): " << avgWl2x2Aexp_space << std::endl; - LOG(Message) << "Plaquette (one site): " << plaqsite / faces << std::endl; - // epilogue LOG(Message) << "Grid is finalizing now" << std::endl; Grid_finalize(); From 454302414db4a5803fd84065b41b2ae3cae66c58 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 15 Nov 2016 12:31:13 +0000 Subject: [PATCH 102/807] Small modif at the test hmc --- gh-pages | 1 - tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 gh-pages diff --git a/gh-pages b/gh-pages deleted file mode 120000 index 0f895714..00000000 --- a/gh-pages +++ /dev/null @@ -1 +0,0 @@ -../Grid_gh-pages/Grid/ \ No newline at end of file diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index e81c212d..65007673 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -86,12 +86,12 @@ class HmcRunner : public BinaryHmcRunner { // it with zeroes? FermionAction FermOp(U, *FGrid, *FrbGrid, mass); - ConjugateGradient CG(1.0e-8, 10000); + ConjugateGradient CG(1.0e-8, 2000); TwoFlavourPseudoFermionAction Nf2(FermOp, CG, CG); // Set smearing (true/false), default: false - Nf2.is_smeared = true; + Nf2.is_smeared = false; // Collect actions ActionLevel Level1(1); From 739c2308b5ce9a9464dbbd9057dbe49f6b04cf59 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Tue, 15 Nov 2016 13:07:52 +0000 Subject: [PATCH 103/807] Set imaginary part of stochastic QED field to zero using real() instead of conjugate(). --- lib/qcd/action/gauge/Photon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qcd/action/gauge/Photon.h b/lib/qcd/action/gauge/Photon.h index ca0a8d40..b6c1b76f 100644 --- a/lib/qcd/action/gauge/Photon.h +++ b/lib/qcd/action/gauge/Photon.h @@ -173,7 +173,7 @@ namespace QCD{ } fft.FFT_all_dim(out, aTilde, FFT::backward); - out = 0.5*(out + conjugate(out)); + out = real(out); } // template // void Photon::FeynmanGaugeMomentumSpacePropagator_L(GaugeField &out, From 3834feb4b744c2b2732aebb014bf860fce5ccd9e Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 16 Nov 2016 16:46:49 +0000 Subject: [PATCH 104/807] Adding action names --- lib/qcd/action/ActionBase.h | 1 + lib/qcd/action/gauge/PlaqPlusRectangleAction.h | 18 ++++++++++-------- lib/qcd/action/gauge/WilsonGaugeAction.h | 4 +++- .../pseudofermion/OneFlavourEvenOddRational.h | 2 ++ .../OneFlavourEvenOddRationalRatio.h | 2 ++ .../action/pseudofermion/OneFlavourRational.h | 2 ++ .../pseudofermion/OneFlavourRationalRatio.h | 2 ++ lib/qcd/action/pseudofermion/TwoFlavour.h | 7 ++++++- .../action/pseudofermion/TwoFlavourEvenOdd.h | 2 ++ .../pseudofermion/TwoFlavourEvenOddRatio.h | 2 ++ lib/qcd/action/pseudofermion/TwoFlavourRatio.h | 2 ++ lib/qcd/hmc/integrators/Integrator.h | 8 +++++--- .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 4 +++- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 1 + 14 files changed, 43 insertions(+), 14 deletions(-) diff --git a/lib/qcd/action/ActionBase.h b/lib/qcd/action/ActionBase.h index 7911462e..371ccd24 100644 --- a/lib/qcd/action/ActionBase.h +++ b/lib/qcd/action/ActionBase.h @@ -42,6 +42,7 @@ class Action { virtual RealD S(const GaugeField& U) = 0; // evaluate the action virtual void deriv(const GaugeField& U, GaugeField& dSdU) = 0; // evaluate the action derivative + virtual std::string action_name() = 0; // return the action name virtual ~Action(){}; }; diff --git a/lib/qcd/action/gauge/PlaqPlusRectangleAction.h b/lib/qcd/action/gauge/PlaqPlusRectangleAction.h index 6193bedb..b78ed939 100644 --- a/lib/qcd/action/gauge/PlaqPlusRectangleAction.h +++ b/lib/qcd/action/gauge/PlaqPlusRectangleAction.h @@ -47,6 +47,8 @@ namespace Grid{ public: PlaqPlusRectangleAction(RealD b,RealD c): c_plaq(b),c_rect(c){}; + + virtual std::string action_name(){return "PlaqPlusRectangleAction";} virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) {}; // noop as no pseudoferms @@ -108,32 +110,32 @@ namespace Grid{ class RBCGaugeAction : public PlaqPlusRectangleAction { public: INHERIT_GIMPL_TYPES(Gimpl); - RBCGaugeAction(RealD beta,RealD c1) : PlaqPlusRectangleAction(beta*(1.0-8.0*c1), beta*c1) { - }; + RBCGaugeAction(RealD beta,RealD c1) : PlaqPlusRectangleAction(beta*(1.0-8.0*c1), beta*c1) {}; + virtual std::string action_name(){return "RBCGaugeAction";} }; template class IwasakiGaugeAction : public RBCGaugeAction { public: INHERIT_GIMPL_TYPES(Gimpl); - IwasakiGaugeAction(RealD beta) : RBCGaugeAction(beta,-0.331) { - }; + IwasakiGaugeAction(RealD beta) : RBCGaugeAction(beta,-0.331) {}; + virtual std::string action_name(){return "IwasakiGaugeAction";} }; template class SymanzikGaugeAction : public RBCGaugeAction { public: INHERIT_GIMPL_TYPES(Gimpl); - SymanzikGaugeAction(RealD beta) : RBCGaugeAction(beta,-1.0/12.0) { - }; + SymanzikGaugeAction(RealD beta) : RBCGaugeAction(beta,-1.0/12.0) {}; + virtual std::string action_name(){return "SymanzikGaugeAction";} }; template class DBW2GaugeAction : public RBCGaugeAction { public: INHERIT_GIMPL_TYPES(Gimpl); - DBW2GaugeAction(RealD beta) : RBCGaugeAction(beta,-1.4067) { - }; + DBW2GaugeAction(RealD beta) : RBCGaugeAction(beta,-1.4067) {}; + virtual std::string action_name(){return "DBW2GaugeAction";} }; } diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/lib/qcd/action/gauge/WilsonGaugeAction.h index b9216d78..aa61abf2 100644 --- a/lib/qcd/action/gauge/WilsonGaugeAction.h +++ b/lib/qcd/action/gauge/WilsonGaugeAction.h @@ -51,6 +51,8 @@ class WilsonGaugeAction : public Action { public: WilsonGaugeAction(RealD b) : beta(b){}; + virtual std::string action_name(){return "WilsonGaugeAction";} + virtual void refresh(const GaugeField &U, GridParallelRNG &pRNG){}; // noop as no pseudoferms @@ -65,7 +67,6 @@ class WilsonGaugeAction : public Action { // not optimal implementation FIXME // extend Ta to include Lorentz indexes - // RealD factor = 0.5*beta/RealD(Nc); RealD factor = 0.5 * beta / RealD(Nc); GaugeLinkField Umu(U._grid); @@ -79,6 +80,7 @@ class WilsonGaugeAction : public Action { PokeIndex(dSdU, dSdU_mu, mu); } + }; }; diff --git a/lib/qcd/action/pseudofermion/OneFlavourEvenOddRational.h b/lib/qcd/action/pseudofermion/OneFlavourEvenOddRational.h index 080b1be2..ec3fa9e2 100644 --- a/lib/qcd/action/pseudofermion/OneFlavourEvenOddRational.h +++ b/lib/qcd/action/pseudofermion/OneFlavourEvenOddRational.h @@ -90,6 +90,8 @@ class OneFlavourEvenOddRationalPseudoFermionAction PowerNegQuarter.Init(remez, param.tolerance, true); }; + virtual std::string action_name(){return "OneFlavourEvenOddRationalPseudoFermionAction";} + virtual void refresh(const GaugeField &U, GridParallelRNG &pRNG) { // P(phi) = e^{- phi^dag (MpcdagMpc)^-1/2 phi} // = e^{- phi^dag (MpcdagMpc)^-1/4 (MpcdagMpc)^-1/4 phi} diff --git a/lib/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h b/lib/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h index 735cb284..65eaabae 100644 --- a/lib/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h +++ b/lib/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h @@ -87,6 +87,8 @@ namespace Grid{ PowerQuarter.Init(remez,param.tolerance,false); PowerNegQuarter.Init(remez,param.tolerance,true); }; + + virtual std::string action_name(){return "OneFlavourEvenOddRatioRationalPseudoFermionAction";} virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) { diff --git a/lib/qcd/action/pseudofermion/OneFlavourRational.h b/lib/qcd/action/pseudofermion/OneFlavourRational.h index 65a99afa..aebcea3d 100644 --- a/lib/qcd/action/pseudofermion/OneFlavourRational.h +++ b/lib/qcd/action/pseudofermion/OneFlavourRational.h @@ -83,6 +83,8 @@ namespace Grid{ PowerQuarter.Init(remez,param.tolerance,false); PowerNegQuarter.Init(remez,param.tolerance,true); }; + + virtual std::string action_name(){return "OneFlavourRationalPseudoFermionAction";} virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) { diff --git a/lib/qcd/action/pseudofermion/OneFlavourRationalRatio.h b/lib/qcd/action/pseudofermion/OneFlavourRationalRatio.h index 2207e119..244eba7a 100644 --- a/lib/qcd/action/pseudofermion/OneFlavourRationalRatio.h +++ b/lib/qcd/action/pseudofermion/OneFlavourRationalRatio.h @@ -81,6 +81,8 @@ namespace Grid{ PowerQuarter.Init(remez,param.tolerance,false); PowerNegQuarter.Init(remez,param.tolerance,true); }; + + virtual std::string action_name(){return "OneFlavourRatioRationalPseudoFermionAction";} virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) { diff --git a/lib/qcd/action/pseudofermion/TwoFlavour.h b/lib/qcd/action/pseudofermion/TwoFlavour.h index 6b65a95d..79fad380 100644 --- a/lib/qcd/action/pseudofermion/TwoFlavour.h +++ b/lib/qcd/action/pseudofermion/TwoFlavour.h @@ -62,6 +62,9 @@ class TwoFlavourPseudoFermionAction : public Action { ActionSolver(AS), Phi(Op.FermionGrid()){}; + + virtual std::string action_name(){return "TwoFlavourPseudoFermionAction";} + ////////////////////////////////////////////////////////////////////////////////////// // Push the gauge field in to the dops. Assume any BC's and smearing already // applied @@ -81,7 +84,9 @@ class TwoFlavourPseudoFermionAction : public Action { // in the Phi integral, and thus is only an irrelevant prefactor for // the partition function. // - RealD scale = std::sqrt(0.5); + + RealD scale = std::sqrt(0.5); + FermionField eta(FermOp.FermionGrid()); gaussian(pRNG, eta); diff --git a/lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h b/lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h index 5af1761e..009899ea 100644 --- a/lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h +++ b/lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h @@ -64,6 +64,8 @@ class TwoFlavourEvenOddPseudoFermionAction PhiEven(Op.FermionRedBlackGrid()), PhiOdd(Op.FermionRedBlackGrid()) {}; + + virtual std::string action_name(){return "TwoFlavourEvenOddPseudoFermionAction";} ////////////////////////////////////////////////////////////////////////////////////// // Push the gauge field in to the dops. Assume any BC's and smearing already applied diff --git a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h b/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h index 5e3b80d9..a8bd9fe7 100644 --- a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h +++ b/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h @@ -67,6 +67,8 @@ namespace Grid{ conformable(_NumOp.GaugeGrid(), _DenOp.GaugeGrid()); conformable(_NumOp.GaugeRedBlackGrid(), _DenOp.GaugeRedBlackGrid()); }; + + virtual std::string action_name(){return "TwoFlavourEvenOddRatioPseudoFermionAction";} virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) { diff --git a/lib/qcd/action/pseudofermion/TwoFlavourRatio.h b/lib/qcd/action/pseudofermion/TwoFlavourRatio.h index 26d21094..03d5fe07 100644 --- a/lib/qcd/action/pseudofermion/TwoFlavourRatio.h +++ b/lib/qcd/action/pseudofermion/TwoFlavourRatio.h @@ -57,6 +57,8 @@ namespace Grid{ OperatorFunction & AS ) : NumOp(_NumOp), DenOp(_DenOp), DerivativeSolver(DS), ActionSolver(AS), Phi(_NumOp.FermionGrid()) {}; + virtual std::string action_name(){return "TwoFlavourRatioPseudoFermionAction";} + virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) { // P(phi) = e^{- phi^dag V (MdagM)^-1 Vdag phi} diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index ec3d31fe..6f1e5c45 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -57,7 +57,7 @@ struct IntegratorParameters { void print_parameters() { - std::cout << GridLogMessage << "[Integrator] Trajectory length : " << trajL << std::endl; + std::cout << GridLogMessage << "[Integrator] Trajectory length : " << trajL << std::endl; std::cout << GridLogMessage << "[Integrator] Number of MD steps : " << MDsteps << std::endl; std::cout << GridLogMessage << "[Integrator] Step size : " << stepsize << std::endl; } @@ -101,8 +101,9 @@ class Integrator { repr_set.at(a)->deriv(Rep.U, forceR); GF force = Rep.RtoFundamentalProject(forceR); // Ta for the fundamental rep + Real force_abs = std::sqrt(norm2(force)); std::cout << GridLogIntegrator << "Hirep Force average: " - << norm2(force) / (U._grid->gSites()) << std::endl; + << force_abs / (U._grid->gSites()) << std::endl; Mom -= force * ep ; } } @@ -121,8 +122,9 @@ class Integrator { << std::endl; if (as[level].actions.at(a)->is_smeared) Smearer.smeared_force(force); force = FieldImplementation::projectForce(force); // Ta for gauge fields + Real force_abs = std::sqrt(norm2(force)); std::cout << GridLogIntegrator - << "Force average: " << norm2(force) / (U._grid->gSites()) + << "Force average: " << force_abs / (U._grid->gSites()) << std::endl; Mom -= force * ep; } diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 65007673..42a903d6 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -123,11 +123,13 @@ class HmcRunner : public BinaryHmcRunner { ObservablesList.push_back(&Checkpoint); // Smearing section, omit if not needed + /* double rho = 0.1; // smearing parameter int Nsmear = 2; // number of smearing levels Smear_Stout Stout(rho); SmearedConfiguration SmearingPolicy( UGrid, Nsmear, Stout); + */ /////////////////// // Run(argc, argv, Checkpoint, SmearingPolicy); @@ -151,7 +153,7 @@ int main(int argc, char **argv) { std::vector ParSeed({6, 7, 8, 9, 10}); TheHMC.RNGSeeds(SerSeed, ParSeed); - TheHMC.MDparameters.set(5, 1.0);// MDsteps, traj length + TheHMC.MDparameters.set(10, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); } diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 2becb37c..4c650357 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -80,6 +80,7 @@ class HmcRunner : public BinaryHmcRunner { // Gauge action + std::cout << GridLogMessage << "Beta: " << HMCPar.beta << std::endl; GaugeAction Waction(HMCPar.beta); // Collect actions From 62749d05a6269b56c96c1bd0f553e40dc00832d7 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 17 Nov 2016 12:26:20 +0000 Subject: [PATCH 105/807] Naming the scalar action --- lib/qcd/action/scalar/ScalarAction.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/qcd/action/scalar/ScalarAction.h b/lib/qcd/action/scalar/ScalarAction.h index 048cde8d..b3e14109 100644 --- a/lib/qcd/action/scalar/ScalarAction.h +++ b/lib/qcd/action/scalar/ScalarAction.h @@ -51,6 +51,8 @@ class ScalarAction : public Action { public: ScalarAction(RealD ms, RealD l) : mass_square(ms), lambda(l){}; + virtual std::string action_name(){return "ScalarAction";} + virtual void refresh(const Field &U, GridParallelRNG &pRNG){}; // noop as no pseudoferms @@ -74,4 +76,4 @@ class ScalarAction : public Action { } } -#endif \ No newline at end of file +#endif From a8843c9af672013797624b79e873e5c64f6208f3 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 27 Nov 2016 16:47:22 +0900 Subject: [PATCH 106/807] Code cleaning, the fermion implementation can be sepcified using the macro FIMPL --- lib/Log.h | 4 ++-- programs/Hadrons/Application.cc | 2 +- programs/Hadrons/Environment.cc | 4 ++-- programs/Hadrons/Environment.hpp | 17 +++++++---------- programs/Hadrons/Global.hpp | 5 +++++ programs/Hadrons/Module.hpp | 4 ---- programs/Hadrons/Modules/ADWF.hpp | 2 ++ programs/Hadrons/Modules/AWilson.hpp | 2 ++ programs/Hadrons/Modules/MQuark.cc | 2 +- programs/Hadrons/Modules/MQuark.hpp | 7 +++++-- programs/Hadrons/Modules/SolRBPrecCG.cc | 4 ++-- programs/Hadrons/Modules/SolRBPrecCG.hpp | 4 ++++ 12 files changed, 33 insertions(+), 24 deletions(-) diff --git a/lib/Log.h b/lib/Log.h index d7422ca9..8dce0acd 100644 --- a/lib/Log.h +++ b/lib/Log.h @@ -110,8 +110,8 @@ public: friend std::ostream& operator<< (std::ostream& stream, Logger& log){ if ( log.active ) { - stream << log.background()<< log.topName << log.background()<< " : "; - stream << log.colour() < ModPt; typedef std::unique_ptr GridPt; typedef std::unique_ptr GridRbPt; - typedef FermionOperator FMat; - typedef std::unique_ptr FMatPt; - typedef std::function Solver; typedef std::unique_ptr RngPt; typedef std::unique_ptr LatticePt; private: @@ -194,24 +190,21 @@ private: std::map moduleAddress_; // lattice store std::map lattice_; - // fermion matrix store - std::map fMat_; - // solver store & solver/action map - std::map solver_; - std::map solverAction_; // object store std::vector object_; std::map objectAddress_; }; /****************************************************************************** - * template implementation * + * Holder template implementation * ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// template Holder::Holder(T *pt) : objPt_(pt) {} +// access ////////////////////////////////////////////////////////////////////// template T & Holder::get(void) const { @@ -230,6 +223,10 @@ void Holder::reset(T *pt) objPt_.reset(pt); } +/****************************************************************************** + * Environment template implementation * + ******************************************************************************/ +// module management /////////////////////////////////////////////////////////// template M * Environment::getModule(const unsigned int address) const { diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 21e7ac7c..3f60122c 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -43,6 +43,11 @@ using Grid::operator<<; * error with GCC (clang compiles fine without it). */ +// FIXME: find a way to do that in a more general fashion +#ifndef FIMPL +#define FIMPL WilsonImplR +#endif + BEGIN_HADRONS_NAMESPACE class HadronsLogger: public Logger diff --git a/programs/Hadrons/Module.hpp b/programs/Hadrons/Module.hpp index 21f374e0..1a219c59 100644 --- a/programs/Hadrons/Module.hpp +++ b/programs/Hadrons/Module.hpp @@ -55,10 +55,6 @@ static mod##ModuleRegistrar mod##ModuleRegistrarInstance; // base class class ModuleBase { -public: - // convenient type shortcuts - typedef Environment::FMat FMat; - typedef Environment::Solver Solver; public: // constructor ModuleBase(const std::string name); diff --git a/programs/Hadrons/Modules/ADWF.hpp b/programs/Hadrons/Modules/ADWF.hpp index 0f4f5402..6e2da691 100644 --- a/programs/Hadrons/Modules/ADWF.hpp +++ b/programs/Hadrons/Modules/ADWF.hpp @@ -49,6 +49,8 @@ public: class ADWF: public Module { +public: + typedef FermionOperator FMat; public: // constructor ADWF(const std::string name); diff --git a/programs/Hadrons/Modules/AWilson.hpp b/programs/Hadrons/Modules/AWilson.hpp index cb35525e..dd5708ea 100644 --- a/programs/Hadrons/Modules/AWilson.hpp +++ b/programs/Hadrons/Modules/AWilson.hpp @@ -47,6 +47,8 @@ public: class AWilson: public Module { +public: + typedef FermionOperator FMat; public: // constructor AWilson(const std::string name); diff --git a/programs/Hadrons/Modules/MQuark.cc b/programs/Hadrons/Modules/MQuark.cc index a1940771..195b558f 100644 --- a/programs/Hadrons/Modules/MQuark.cc +++ b/programs/Hadrons/Modules/MQuark.cc @@ -76,7 +76,7 @@ void MQuark::execute(void) << std::endl; LatticePropagator &prop = *env().createLattice(propName); LatticePropagator &fullSrc = *env().getObject(par().source); - Environment::Solver &solver = *env().getObject(par().solver); + Solver &solver = *env().getObject(par().solver); if (Ls_ > 1) { env().createLattice(getName()); diff --git a/programs/Hadrons/Modules/MQuark.hpp b/programs/Hadrons/Modules/MQuark.hpp index 0080090b..f28a49a8 100644 --- a/programs/Hadrons/Modules/MQuark.hpp +++ b/programs/Hadrons/Modules/MQuark.hpp @@ -47,6 +47,9 @@ public: class MQuark: public Module { +public: + typedef FIMPL::FermionField FermionField; + typedef std::function Solver; public: // constructor MQuark(const std::string name); @@ -60,8 +63,8 @@ public: // execution virtual void execute(void); private: - unsigned int Ls_; - Environment::Solver *solver_{nullptr}; + unsigned int Ls_; + Solver *solver_{nullptr}; }; MODULE_REGISTER(MQuark); diff --git a/programs/Hadrons/Modules/SolRBPrecCG.cc b/programs/Hadrons/Modules/SolRBPrecCG.cc index 8a1c7449..d93b39a8 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.cc +++ b/programs/Hadrons/Modules/SolRBPrecCG.cc @@ -66,7 +66,7 @@ void SolRBPrecCG::setup(void) // execution /////////////////////////////////////////////////////////////////// void SolRBPrecCG::execute(void) { - auto &mat = *(env().getObject(par().action)); + auto &mat = *(env().getObject(par().action)); auto solver = [&mat, this](LatticeFermion &sol, const LatticeFermion &source) { @@ -79,5 +79,5 @@ void SolRBPrecCG::execute(void) LOG(Message) << "setting up Schur red-black preconditioned CG for" << " action '" << par().action << "' with residual " << par().residual << std::endl; - env().setObject(getName(), new Environment::Solver(solver)); + env().setObject(getName(), new Solver(solver)); } diff --git a/programs/Hadrons/Modules/SolRBPrecCG.hpp b/programs/Hadrons/Modules/SolRBPrecCG.hpp index b987eb95..39f241dc 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.hpp +++ b/programs/Hadrons/Modules/SolRBPrecCG.hpp @@ -47,6 +47,10 @@ public: class SolRBPrecCG: public Module { +public: + typedef FermionOperator FMat; + typedef FIMPL::FermionField FermionField; + typedef std::function Solver; public: // constructor SolRBPrecCG(const std::string name); From fabcd4179d49aff6f047b46445fba099dcc38094 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 28 Nov 2016 14:02:10 +0900 Subject: [PATCH 107/807] Hadrons: propagator type coming from the fermion implementation --- lib/qcd/action/fermion/FermionOperatorImpl.h | 17 +++++++++++++++-- programs/Hadrons/Global.hpp | 7 +++++++ programs/Hadrons/Modules/ADWF.hpp | 2 -- programs/Hadrons/Modules/AWilson.hpp | 2 -- programs/Hadrons/Modules/CMeson.cc | 4 ++-- programs/Hadrons/Modules/MQuark.hpp | 3 --- programs/Hadrons/Modules/SolRBPrecCG.hpp | 4 ---- programs/Hadrons/Modules/SrcPoint.cc | 4 ++-- programs/Hadrons/Modules/SrcZ2.cc | 4 ++-- 9 files changed, 28 insertions(+), 19 deletions(-) diff --git a/lib/qcd/action/fermion/FermionOperatorImpl.h b/lib/qcd/action/fermion/FermionOperatorImpl.h index 0800dea6..07eee6be 100644 --- a/lib/qcd/action/fermion/FermionOperatorImpl.h +++ b/lib/qcd/action/fermion/FermionOperatorImpl.h @@ -48,8 +48,10 @@ namespace QCD { // typedef typename XXX GaugeField; // typedef typename XXX GaugeActField; // typedef typename XXX FermionField; + // typedef typename XXX PropagatorField; // typedef typename XXX DoubledGaugeField; // typedef typename XXX SiteSpinor; + // typedef typename XXX SitePropagator; // typedef typename XXX SiteHalfSpinor; // typedef typename XXX Compressor; // @@ -95,13 +97,15 @@ namespace QCD { #define INHERIT_FIMPL_TYPES(Impl)\ typedef typename Impl::FermionField FermionField; \ + typedef typename Impl::PropagatorField PropagatorField; \ typedef typename Impl::DoubledGaugeField DoubledGaugeField; \ typedef typename Impl::SiteSpinor SiteSpinor; \ + typedef typename Impl::SitePropagator SitePropagator; \ typedef typename Impl::SiteHalfSpinor SiteHalfSpinor; \ typedef typename Impl::Compressor Compressor; \ typedef typename Impl::StencilImpl StencilImpl; \ - typedef typename Impl::ImplParams ImplParams; \ - typedef typename Impl::Coeff_t Coeff_t; + typedef typename Impl::ImplParams ImplParams; \ + typedef typename Impl::Coeff_t Coeff_t; \ #define INHERIT_IMPL_TYPES(Base) \ INHERIT_GIMPL_TYPES(Base) \ @@ -127,14 +131,17 @@ namespace QCD { INHERIT_GIMPL_TYPES(Gimpl); template using iImplSpinor = iScalar, Ns> >; + template using iImplPropagator = iScalar, Ns> >; template using iImplHalfSpinor = iScalar, Nhs> >; template using iImplDoubledGaugeField = iVector >, Nds>; typedef iImplSpinor SiteSpinor; + typedef iImplPropagator SitePropagator; typedef iImplHalfSpinor SiteHalfSpinor; typedef iImplDoubledGaugeField SiteDoubledGaugeField; typedef Lattice FermionField; + typedef Lattice PropagatorField; typedef Lattice DoubledGaugeField; typedef WilsonCompressor Compressor; @@ -216,14 +223,17 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres INHERIT_GIMPL_TYPES(Gimpl); template using iImplSpinor = iScalar, Ns> >; + template using iImplPropagator = iScalar, Ns> >; template using iImplHalfSpinor = iScalar, Nhs> >; template using iImplDoubledGaugeField = iVector >, Nds>; template using iImplGaugeField = iVector >, Nd>; template using iImplGaugeLink = iScalar > >; typedef iImplSpinor SiteSpinor; + typedef iImplPropagator SitePropagator; typedef iImplHalfSpinor SiteHalfSpinor; typedef Lattice FermionField; + typedef Lattice PropagatorField; // Make the doubled gauge field a *scalar* typedef iImplDoubledGaugeField SiteDoubledGaugeField; // This is a scalar @@ -315,14 +325,17 @@ class GparityWilsonImpl : public ConjugateGaugeImpl using iImplSpinor = iVector, Ns>, Ngp>; + template using iImplPropagator = iVector, Ns>, Ngp >; template using iImplHalfSpinor = iVector, Nhs>, Ngp>; template using iImplDoubledGaugeField = iVector >, Nds>, Ngp>; typedef iImplSpinor SiteSpinor; + typedef iImplPropagator SitePropagator; typedef iImplHalfSpinor SiteHalfSpinor; typedef iImplDoubledGaugeField SiteDoubledGaugeField; typedef Lattice FermionField; + typedef Lattice PropagatorField; typedef Lattice DoubledGaugeField; typedef WilsonCompressor Compressor; diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp index 3f60122c..0936f3ba 100644 --- a/programs/Hadrons/Global.hpp +++ b/programs/Hadrons/Global.hpp @@ -50,6 +50,13 @@ using Grid::operator<<; BEGIN_HADRONS_NAMESPACE +// type aliases +typedef FermionOperator FMat; +typedef FIMPL::FermionField FermionField; +typedef FIMPL::PropagatorField PropagatorField; +typedef std::function Solver; + +// logger class HadronsLogger: public Logger { public: diff --git a/programs/Hadrons/Modules/ADWF.hpp b/programs/Hadrons/Modules/ADWF.hpp index 6e2da691..0f4f5402 100644 --- a/programs/Hadrons/Modules/ADWF.hpp +++ b/programs/Hadrons/Modules/ADWF.hpp @@ -49,8 +49,6 @@ public: class ADWF: public Module { -public: - typedef FermionOperator FMat; public: // constructor ADWF(const std::string name); diff --git a/programs/Hadrons/Modules/AWilson.hpp b/programs/Hadrons/Modules/AWilson.hpp index dd5708ea..cb35525e 100644 --- a/programs/Hadrons/Modules/AWilson.hpp +++ b/programs/Hadrons/Modules/AWilson.hpp @@ -47,8 +47,6 @@ public: class AWilson: public Module { -public: - typedef FermionOperator FMat; public: // constructor AWilson(const std::string name); diff --git a/programs/Hadrons/Modules/CMeson.cc b/programs/Hadrons/Modules/CMeson.cc index 5e8d6d0c..c1cf153e 100644 --- a/programs/Hadrons/Modules/CMeson.cc +++ b/programs/Hadrons/Modules/CMeson.cc @@ -62,8 +62,8 @@ void CMeson::execute(void) << std::endl; XmlWriter writer(par().output); - LatticePropagator &q1 = *env().getObject(par().q1); - LatticePropagator &q2 = *env().getObject(par().q2); + PropagatorField &q1 = *env().getObject(par().q1); + PropagatorField &q2 = *env().getObject(par().q2); LatticeComplex c(env().getGrid()); SpinMatrix g[Ns*Ns], g5; std::vector buf; diff --git a/programs/Hadrons/Modules/MQuark.hpp b/programs/Hadrons/Modules/MQuark.hpp index f28a49a8..526815ef 100644 --- a/programs/Hadrons/Modules/MQuark.hpp +++ b/programs/Hadrons/Modules/MQuark.hpp @@ -47,9 +47,6 @@ public: class MQuark: public Module { -public: - typedef FIMPL::FermionField FermionField; - typedef std::function Solver; public: // constructor MQuark(const std::string name); diff --git a/programs/Hadrons/Modules/SolRBPrecCG.hpp b/programs/Hadrons/Modules/SolRBPrecCG.hpp index 39f241dc..b987eb95 100644 --- a/programs/Hadrons/Modules/SolRBPrecCG.hpp +++ b/programs/Hadrons/Modules/SolRBPrecCG.hpp @@ -47,10 +47,6 @@ public: class SolRBPrecCG: public Module { -public: - typedef FermionOperator FMat; - typedef FIMPL::FermionField FermionField; - typedef std::function Solver; public: // constructor SolRBPrecCG(const std::string name); diff --git a/programs/Hadrons/Modules/SrcPoint.cc b/programs/Hadrons/Modules/SrcPoint.cc index 34f1825e..ca9c1345 100644 --- a/programs/Hadrons/Modules/SrcPoint.cc +++ b/programs/Hadrons/Modules/SrcPoint.cc @@ -56,7 +56,7 @@ std::vector SrcPoint::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void SrcPoint::setup(void) { - env().registerLattice(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -67,7 +67,7 @@ void SrcPoint::execute(void) LOG(Message) << "Creating point source at position [" << par().position << "]" << std::endl; - LatticePropagator &src = *env().createLattice(getName()); + PropagatorField &src = *env().createLattice(getName()); id = 1.; src = zero; pokeSite(id, src, position); diff --git a/programs/Hadrons/Modules/SrcZ2.cc b/programs/Hadrons/Modules/SrcZ2.cc index a614526d..74e3add0 100644 --- a/programs/Hadrons/Modules/SrcZ2.cc +++ b/programs/Hadrons/Modules/SrcZ2.cc @@ -56,7 +56,7 @@ std::vector SrcZ2::getOutput(void) // setup /////////////////////////////////////////////////////////////////////// void SrcZ2::setup(void) { - env().registerLattice(getName()); + env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// @@ -77,7 +77,7 @@ void SrcZ2::execute(void) LOG(Message) << "Generating Z_2 band for " << par().tA << " <= t <= " << par().tB << std::endl; } - LatticePropagator &src = *env().createLattice(getName()); + PropagatorField &src = *env().createLattice(getName()); LatticeCoordinate(t, Tp); bernoulli(*env().get4dRng(), eta); eta = (2.*eta - shift)*(1./::sqrt(2.)); From 43928846f2512088625644af060d9c22f83ce77b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 28 Nov 2016 16:02:15 +0900 Subject: [PATCH 108/807] first steps to make Hadrons a library --- lib/Hadrons | 1 + programs/Hadrons/Application.cc | 36 ++++++++++++----- programs/Hadrons/Application.hpp | 50 ++++++++++++------------ programs/Hadrons/Environment.cc | 33 ++++++++++------ programs/Hadrons/Environment.hpp | 36 ++++++++++++++--- programs/Hadrons/Factory.hpp | 2 +- programs/Hadrons/GeneticScheduler.hpp | 4 +- programs/Hadrons/Global.cc | 2 +- programs/Hadrons/Graph.hpp | 2 +- programs/Hadrons/Hadrons.cc | 2 +- programs/Hadrons/Makefile.am | 27 +++++++++---- programs/Hadrons/Module.cc | 2 +- programs/Hadrons/Module.hpp | 4 +- programs/Hadrons/ModuleFactory.hpp | 6 +-- programs/Hadrons/Modules/ADWF.cc | 2 +- programs/Hadrons/Modules/ADWF.hpp | 6 +-- programs/Hadrons/Modules/AWilson.cc | 2 +- programs/Hadrons/Modules/AWilson.hpp | 6 +-- programs/Hadrons/Modules/CMeson.cc | 2 +- programs/Hadrons/Modules/CMeson.hpp | 6 +-- programs/Hadrons/Modules/GLoad.cc | 2 +- programs/Hadrons/Modules/GLoad.hpp | 6 +-- programs/Hadrons/Modules/GRandom.cc | 2 +- programs/Hadrons/Modules/GRandom.hpp | 6 +-- programs/Hadrons/Modules/GUnit.cc | 2 +- programs/Hadrons/Modules/GUnit.hpp | 6 +-- programs/Hadrons/Modules/MQuark.cc | 2 +- programs/Hadrons/Modules/MQuark.hpp | 6 +-- programs/Hadrons/Modules/SolRBPrecCG.cc | 2 +- programs/Hadrons/Modules/SolRBPrecCG.hpp | 6 +-- programs/Hadrons/Modules/SrcPoint.cc | 2 +- programs/Hadrons/Modules/SrcPoint.hpp | 6 +-- programs/Hadrons/Modules/SrcZ2.cc | 2 +- programs/Hadrons/Modules/SrcZ2.hpp | 6 +-- programs/Hadrons/make_module_list.sh | 8 +++- programs/Hadrons/modules.inc | 15 ++++++- 36 files changed, 194 insertions(+), 116 deletions(-) create mode 120000 lib/Hadrons 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 + From 6ad73145bc9754a5f26093eee5a34473ba0cff82 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Wed, 30 Nov 2016 15:17:22 +0000 Subject: [PATCH 109/807] Calculate Wilson loop average over multiple configurations. --- programs/qed-fvol/qed-fvol.cc | 47 +++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/programs/qed-fvol/qed-fvol.cc b/programs/qed-fvol/qed-fvol.cc index 31312b1e..f0f5079f 100644 --- a/programs/qed-fvol/qed-fvol.cc +++ b/programs/qed-fvol/qed-fvol.cc @@ -31,6 +31,9 @@ typedef Photon PhotonR; typedef PhotonR::GaugeField EmField; typedef PhotonR::GaugeLinkField EmComp; +const int NCONFIGS = 10; +const int NWILSON = 10; + int main(int argc, char *argv[]) { // parse command line @@ -64,27 +67,39 @@ int main(int argc, char *argv[]) EmField a(&grid); EmField expA(&grid); - Real wlA, logWlA; + Complex imag_unit(0, 1); + + Real wlA; + std::vector logWlAvg(NWILSON, 0.0), logWlTime(NWILSON, 0.0), logWlSpace(NWILSON, 0.0); pRNG.SeedRandomDevice(); - photon.StochasticField(a, pRNG); - // Exponentiate photon field - Complex imag_unit(0, 1); - expA = exp(imag_unit*a); + LOG(Message) << "Wilson loop calculation beginning" << std::endl; + for(int ic = 0; ic < NCONFIGS; ic++){ + LOG(Message) << "Configuration " << ic <::avgWilsonLoop(expA, iw, iw) * 3; + logWlAvg[iw-1] -= 2*log(wlA); + wlA = NewWilsonLoops::avgTimelikeWilsonLoop(expA, iw, iw) * 3; + logWlTime[iw-1] -= 2*log(wlA); + wlA = NewWilsonLoops::avgSpatialWilsonLoop(expA, iw, iw) * 3; + logWlSpace[iw-1] -= 2*log(wlA); + } + } + LOG(Message) << "Wilson loop calculation completed" << std::endl; + // Calculate Wilson loops - for(int i=1; i<=10; i++){ - LOG(Message) << i << 'x' << i << " Wilson loop" << std::endl; - wlA = NewWilsonLoops::avgWilsonLoop(expA, i, i) * 3; - logWlA = -2*log(wlA); - LOG(Message) << "-2log(W) average: " << logWlA << std::endl; - wlA = NewWilsonLoops::avgTimelikeWilsonLoop(expA, i, i) * 3; - logWlA = -2*log(wlA); - LOG(Message) << "-2log(W) timelike: " << logWlA << std::endl; - wlA = NewWilsonLoops::avgSpatialWilsonLoop(expA, i, i) * 3; - logWlA = -2*log(wlA); - LOG(Message) << "-2log(W) spatial: " << logWlA << std::endl; + for(int iw=1; iw<=10; iw++){ + LOG(Message) << iw << 'x' << iw << " Wilson loop" << std::endl; + LOG(Message) << "-2log(W) average: " << logWlAvg[iw-1]/NCONFIGS << std::endl; + LOG(Message) << "-2log(W) timelike: " << logWlTime[iw-1]/NCONFIGS << std::endl; + LOG(Message) << "-2log(W) spatial: " << logWlSpace[iw-1]/NCONFIGS << std::endl; } // epilogue From d8b716d2cdc958d238c7f31a211decbef3cbe87f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 1 Dec 2016 15:43:16 +0900 Subject: [PATCH 110/807] Hadrons: static initialisation fixed --- programs/Hadrons/Application.hpp | 1 + programs/Hadrons/Modules.hpp | 10 ++++++++++ programs/Hadrons/make_module_list.sh | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 programs/Hadrons/Modules.hpp diff --git a/programs/Hadrons/Application.hpp b/programs/Hadrons/Application.hpp index 2ce8d694..dd26a5b8 100644 --- a/programs/Hadrons/Application.hpp +++ b/programs/Hadrons/Application.hpp @@ -31,6 +31,7 @@ directory. #include #include #include +#include BEGIN_HADRONS_NAMESPACE diff --git a/programs/Hadrons/Modules.hpp b/programs/Hadrons/Modules.hpp new file mode 100644 index 00000000..a7a88710 --- /dev/null +++ b/programs/Hadrons/Modules.hpp @@ -0,0 +1,10 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/programs/Hadrons/make_module_list.sh b/programs/Hadrons/make_module_list.sh index 0733efcb..ddc56ff6 100755 --- a/programs/Hadrons/make_module_list.sh +++ b/programs/Hadrons/make_module_list.sh @@ -6,3 +6,7 @@ echo '' >> modules.inc echo 'modules_hpp =\' >> modules.inc find Modules -name '*.hpp' -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> modules.inc echo '' >> modules.inc +rm -f Modules.hpp +for f in `find Modules -name '*.hpp'`; do + echo "#include " >> Modules.hpp +done From 9ad3d3453e2b9b2c79fc11e2904236ed44422ddb Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 1 Dec 2016 21:36:29 +0900 Subject: [PATCH 111/807] Hadrons is now a library, the previous XML driven program is now a test --- Makefile.am | 2 +- configure.ac | 5 +- {programs => extras}/Hadrons/Application.cc | 0 {programs => extras}/Hadrons/Application.hpp | 0 {programs => extras}/Hadrons/Environment.cc | 0 {programs => extras}/Hadrons/Environment.hpp | 0 {programs => extras}/Hadrons/Factory.hpp | 0 .../Hadrons/GeneticScheduler.hpp | 0 {programs => extras}/Hadrons/Global.cc | 0 {programs => extras}/Hadrons/Global.hpp | 0 {programs => extras}/Hadrons/Graph.hpp | 0 {programs => extras}/Hadrons/Hadrons.cc | 0 extras/Hadrons/Makefile.am | 22 +++++++ {programs => extras}/Hadrons/Module.cc | 0 .../Hadrons/Module.cc.template | 0 {programs => extras}/Hadrons/Module.hpp | 0 .../Hadrons/Module.hpp.template | 0 .../Hadrons/ModuleFactory.hpp | 0 {programs => extras}/Hadrons/Modules.hpp | 0 {programs => extras}/Hadrons/Modules/ADWF.cc | 0 {programs => extras}/Hadrons/Modules/ADWF.hpp | 0 .../Hadrons/Modules/AWilson.cc | 0 .../Hadrons/Modules/AWilson.hpp | 0 .../Hadrons/Modules/CMeson.cc | 0 .../Hadrons/Modules/CMeson.hpp | 0 {programs => extras}/Hadrons/Modules/GLoad.cc | 0 .../Hadrons/Modules/GLoad.hpp | 0 .../Hadrons/Modules/GRandom.cc | 0 .../Hadrons/Modules/GRandom.hpp | 0 {programs => extras}/Hadrons/Modules/GUnit.cc | 0 .../Hadrons/Modules/GUnit.hpp | 0 .../Hadrons/Modules/MQuark.cc | 0 .../Hadrons/Modules/MQuark.hpp | 0 .../Hadrons/Modules/SolRBPrecCG.cc | 0 .../Hadrons/Modules/SolRBPrecCG.hpp | 0 .../Hadrons/Modules/SrcPoint.cc | 0 .../Hadrons/Modules/SrcPoint.hpp | 0 {programs => extras}/Hadrons/Modules/SrcZ2.cc | 0 .../Hadrons/Modules/SrcZ2.hpp | 0 {programs => extras}/Hadrons/add_module.sh | 0 .../Hadrons/make_module_list.sh | 0 {programs => extras}/Hadrons/modules.inc | 0 {programs => extras}/Makefile.am | 0 lib/Hadrons | 2 +- programs/Hadrons/Make.inc | 4 -- programs/Hadrons/Makefile.am | 26 -------- scripts/filelist | 5 +- tests/hadrons/Makefile.am | 3 + tests/hadrons/Test_hadrons_xmldriven.cc | 66 +++++++++++++++++++ 49 files changed, 99 insertions(+), 36 deletions(-) rename {programs => extras}/Hadrons/Application.cc (100%) rename {programs => extras}/Hadrons/Application.hpp (100%) rename {programs => extras}/Hadrons/Environment.cc (100%) rename {programs => extras}/Hadrons/Environment.hpp (100%) rename {programs => extras}/Hadrons/Factory.hpp (100%) rename {programs => extras}/Hadrons/GeneticScheduler.hpp (100%) rename {programs => extras}/Hadrons/Global.cc (100%) rename {programs => extras}/Hadrons/Global.hpp (100%) rename {programs => extras}/Hadrons/Graph.hpp (100%) rename {programs => extras}/Hadrons/Hadrons.cc (100%) create mode 100644 extras/Hadrons/Makefile.am rename {programs => extras}/Hadrons/Module.cc (100%) rename {programs => extras}/Hadrons/Module.cc.template (100%) rename {programs => extras}/Hadrons/Module.hpp (100%) rename {programs => extras}/Hadrons/Module.hpp.template (100%) rename {programs => extras}/Hadrons/ModuleFactory.hpp (100%) rename {programs => extras}/Hadrons/Modules.hpp (100%) rename {programs => extras}/Hadrons/Modules/ADWF.cc (100%) rename {programs => extras}/Hadrons/Modules/ADWF.hpp (100%) rename {programs => extras}/Hadrons/Modules/AWilson.cc (100%) rename {programs => extras}/Hadrons/Modules/AWilson.hpp (100%) rename {programs => extras}/Hadrons/Modules/CMeson.cc (100%) rename {programs => extras}/Hadrons/Modules/CMeson.hpp (100%) rename {programs => extras}/Hadrons/Modules/GLoad.cc (100%) rename {programs => extras}/Hadrons/Modules/GLoad.hpp (100%) rename {programs => extras}/Hadrons/Modules/GRandom.cc (100%) rename {programs => extras}/Hadrons/Modules/GRandom.hpp (100%) rename {programs => extras}/Hadrons/Modules/GUnit.cc (100%) rename {programs => extras}/Hadrons/Modules/GUnit.hpp (100%) rename {programs => extras}/Hadrons/Modules/MQuark.cc (100%) rename {programs => extras}/Hadrons/Modules/MQuark.hpp (100%) rename {programs => extras}/Hadrons/Modules/SolRBPrecCG.cc (100%) rename {programs => extras}/Hadrons/Modules/SolRBPrecCG.hpp (100%) rename {programs => extras}/Hadrons/Modules/SrcPoint.cc (100%) rename {programs => extras}/Hadrons/Modules/SrcPoint.hpp (100%) rename {programs => extras}/Hadrons/Modules/SrcZ2.cc (100%) rename {programs => extras}/Hadrons/Modules/SrcZ2.hpp (100%) rename {programs => extras}/Hadrons/add_module.sh (100%) rename {programs => extras}/Hadrons/make_module_list.sh (100%) rename {programs => extras}/Hadrons/modules.inc (100%) rename {programs => extras}/Makefile.am (100%) delete mode 100644 programs/Hadrons/Make.inc delete mode 100644 programs/Hadrons/Makefile.am create mode 100644 tests/hadrons/Makefile.am create mode 100644 tests/hadrons/Test_hadrons_xmldriven.cc diff --git a/Makefile.am b/Makefile.am index fd9671cc..d3401c48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # additional include paths necessary to compile the C++ library -SUBDIRS = lib benchmarks tests programs +SUBDIRS = lib benchmarks tests extras include $(top_srcdir)/doxygen.inc diff --git a/configure.ac b/configure.ac index 00ef6fdc..19e3f105 100644 --- a/configure.ac +++ b/configure.ac @@ -381,12 +381,13 @@ AC_CONFIG_FILES(tests/IO/Makefile) AC_CONFIG_FILES(tests/core/Makefile) AC_CONFIG_FILES(tests/debug/Makefile) AC_CONFIG_FILES(tests/forces/Makefile) +AC_CONFIG_FILES(tests/hadrons/Makefile) AC_CONFIG_FILES(tests/hmc/Makefile) AC_CONFIG_FILES(tests/solver/Makefile) AC_CONFIG_FILES(tests/qdpxx/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) -AC_CONFIG_FILES(programs/Makefile) -AC_CONFIG_FILES(programs/Hadrons/Makefile) +AC_CONFIG_FILES(extras/Makefile) +AC_CONFIG_FILES(extras/hadrons/Makefile) AC_OUTPUT echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/programs/Hadrons/Application.cc b/extras/Hadrons/Application.cc similarity index 100% rename from programs/Hadrons/Application.cc rename to extras/Hadrons/Application.cc diff --git a/programs/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp similarity index 100% rename from programs/Hadrons/Application.hpp rename to extras/Hadrons/Application.hpp diff --git a/programs/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc similarity index 100% rename from programs/Hadrons/Environment.cc rename to extras/Hadrons/Environment.cc diff --git a/programs/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp similarity index 100% rename from programs/Hadrons/Environment.hpp rename to extras/Hadrons/Environment.hpp diff --git a/programs/Hadrons/Factory.hpp b/extras/Hadrons/Factory.hpp similarity index 100% rename from programs/Hadrons/Factory.hpp rename to extras/Hadrons/Factory.hpp diff --git a/programs/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp similarity index 100% rename from programs/Hadrons/GeneticScheduler.hpp rename to extras/Hadrons/GeneticScheduler.hpp diff --git a/programs/Hadrons/Global.cc b/extras/Hadrons/Global.cc similarity index 100% rename from programs/Hadrons/Global.cc rename to extras/Hadrons/Global.cc diff --git a/programs/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp similarity index 100% rename from programs/Hadrons/Global.hpp rename to extras/Hadrons/Global.hpp diff --git a/programs/Hadrons/Graph.hpp b/extras/Hadrons/Graph.hpp similarity index 100% rename from programs/Hadrons/Graph.hpp rename to extras/Hadrons/Graph.hpp diff --git a/programs/Hadrons/Hadrons.cc b/extras/Hadrons/Hadrons.cc similarity index 100% rename from programs/Hadrons/Hadrons.cc rename to extras/Hadrons/Hadrons.cc diff --git a/extras/Hadrons/Makefile.am b/extras/Hadrons/Makefile.am new file mode 100644 index 00000000..6fd459dc --- /dev/null +++ b/extras/Hadrons/Makefile.am @@ -0,0 +1,22 @@ +lib_LIBRARIES = libHadrons.a + +include modules.inc + +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 \ + Modules.hpp \ + ModuleFactory.hpp diff --git a/programs/Hadrons/Module.cc b/extras/Hadrons/Module.cc similarity index 100% rename from programs/Hadrons/Module.cc rename to extras/Hadrons/Module.cc diff --git a/programs/Hadrons/Module.cc.template b/extras/Hadrons/Module.cc.template similarity index 100% rename from programs/Hadrons/Module.cc.template rename to extras/Hadrons/Module.cc.template diff --git a/programs/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp similarity index 100% rename from programs/Hadrons/Module.hpp rename to extras/Hadrons/Module.hpp diff --git a/programs/Hadrons/Module.hpp.template b/extras/Hadrons/Module.hpp.template similarity index 100% rename from programs/Hadrons/Module.hpp.template rename to extras/Hadrons/Module.hpp.template diff --git a/programs/Hadrons/ModuleFactory.hpp b/extras/Hadrons/ModuleFactory.hpp similarity index 100% rename from programs/Hadrons/ModuleFactory.hpp rename to extras/Hadrons/ModuleFactory.hpp diff --git a/programs/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp similarity index 100% rename from programs/Hadrons/Modules.hpp rename to extras/Hadrons/Modules.hpp diff --git a/programs/Hadrons/Modules/ADWF.cc b/extras/Hadrons/Modules/ADWF.cc similarity index 100% rename from programs/Hadrons/Modules/ADWF.cc rename to extras/Hadrons/Modules/ADWF.cc diff --git a/programs/Hadrons/Modules/ADWF.hpp b/extras/Hadrons/Modules/ADWF.hpp similarity index 100% rename from programs/Hadrons/Modules/ADWF.hpp rename to extras/Hadrons/Modules/ADWF.hpp diff --git a/programs/Hadrons/Modules/AWilson.cc b/extras/Hadrons/Modules/AWilson.cc similarity index 100% rename from programs/Hadrons/Modules/AWilson.cc rename to extras/Hadrons/Modules/AWilson.cc diff --git a/programs/Hadrons/Modules/AWilson.hpp b/extras/Hadrons/Modules/AWilson.hpp similarity index 100% rename from programs/Hadrons/Modules/AWilson.hpp rename to extras/Hadrons/Modules/AWilson.hpp diff --git a/programs/Hadrons/Modules/CMeson.cc b/extras/Hadrons/Modules/CMeson.cc similarity index 100% rename from programs/Hadrons/Modules/CMeson.cc rename to extras/Hadrons/Modules/CMeson.cc diff --git a/programs/Hadrons/Modules/CMeson.hpp b/extras/Hadrons/Modules/CMeson.hpp similarity index 100% rename from programs/Hadrons/Modules/CMeson.hpp rename to extras/Hadrons/Modules/CMeson.hpp diff --git a/programs/Hadrons/Modules/GLoad.cc b/extras/Hadrons/Modules/GLoad.cc similarity index 100% rename from programs/Hadrons/Modules/GLoad.cc rename to extras/Hadrons/Modules/GLoad.cc diff --git a/programs/Hadrons/Modules/GLoad.hpp b/extras/Hadrons/Modules/GLoad.hpp similarity index 100% rename from programs/Hadrons/Modules/GLoad.hpp rename to extras/Hadrons/Modules/GLoad.hpp diff --git a/programs/Hadrons/Modules/GRandom.cc b/extras/Hadrons/Modules/GRandom.cc similarity index 100% rename from programs/Hadrons/Modules/GRandom.cc rename to extras/Hadrons/Modules/GRandom.cc diff --git a/programs/Hadrons/Modules/GRandom.hpp b/extras/Hadrons/Modules/GRandom.hpp similarity index 100% rename from programs/Hadrons/Modules/GRandom.hpp rename to extras/Hadrons/Modules/GRandom.hpp diff --git a/programs/Hadrons/Modules/GUnit.cc b/extras/Hadrons/Modules/GUnit.cc similarity index 100% rename from programs/Hadrons/Modules/GUnit.cc rename to extras/Hadrons/Modules/GUnit.cc diff --git a/programs/Hadrons/Modules/GUnit.hpp b/extras/Hadrons/Modules/GUnit.hpp similarity index 100% rename from programs/Hadrons/Modules/GUnit.hpp rename to extras/Hadrons/Modules/GUnit.hpp diff --git a/programs/Hadrons/Modules/MQuark.cc b/extras/Hadrons/Modules/MQuark.cc similarity index 100% rename from programs/Hadrons/Modules/MQuark.cc rename to extras/Hadrons/Modules/MQuark.cc diff --git a/programs/Hadrons/Modules/MQuark.hpp b/extras/Hadrons/Modules/MQuark.hpp similarity index 100% rename from programs/Hadrons/Modules/MQuark.hpp rename to extras/Hadrons/Modules/MQuark.hpp diff --git a/programs/Hadrons/Modules/SolRBPrecCG.cc b/extras/Hadrons/Modules/SolRBPrecCG.cc similarity index 100% rename from programs/Hadrons/Modules/SolRBPrecCG.cc rename to extras/Hadrons/Modules/SolRBPrecCG.cc diff --git a/programs/Hadrons/Modules/SolRBPrecCG.hpp b/extras/Hadrons/Modules/SolRBPrecCG.hpp similarity index 100% rename from programs/Hadrons/Modules/SolRBPrecCG.hpp rename to extras/Hadrons/Modules/SolRBPrecCG.hpp diff --git a/programs/Hadrons/Modules/SrcPoint.cc b/extras/Hadrons/Modules/SrcPoint.cc similarity index 100% rename from programs/Hadrons/Modules/SrcPoint.cc rename to extras/Hadrons/Modules/SrcPoint.cc diff --git a/programs/Hadrons/Modules/SrcPoint.hpp b/extras/Hadrons/Modules/SrcPoint.hpp similarity index 100% rename from programs/Hadrons/Modules/SrcPoint.hpp rename to extras/Hadrons/Modules/SrcPoint.hpp diff --git a/programs/Hadrons/Modules/SrcZ2.cc b/extras/Hadrons/Modules/SrcZ2.cc similarity index 100% rename from programs/Hadrons/Modules/SrcZ2.cc rename to extras/Hadrons/Modules/SrcZ2.cc diff --git a/programs/Hadrons/Modules/SrcZ2.hpp b/extras/Hadrons/Modules/SrcZ2.hpp similarity index 100% rename from programs/Hadrons/Modules/SrcZ2.hpp rename to extras/Hadrons/Modules/SrcZ2.hpp diff --git a/programs/Hadrons/add_module.sh b/extras/Hadrons/add_module.sh similarity index 100% rename from programs/Hadrons/add_module.sh rename to extras/Hadrons/add_module.sh diff --git a/programs/Hadrons/make_module_list.sh b/extras/Hadrons/make_module_list.sh similarity index 100% rename from programs/Hadrons/make_module_list.sh rename to extras/Hadrons/make_module_list.sh diff --git a/programs/Hadrons/modules.inc b/extras/Hadrons/modules.inc similarity index 100% rename from programs/Hadrons/modules.inc rename to extras/Hadrons/modules.inc diff --git a/programs/Makefile.am b/extras/Makefile.am similarity index 100% rename from programs/Makefile.am rename to extras/Makefile.am diff --git a/lib/Hadrons b/lib/Hadrons index 5343d55a..1f422592 120000 --- a/lib/Hadrons +++ b/lib/Hadrons @@ -1 +1 @@ -../programs/Hadrons \ No newline at end of file +../extras/Hadrons \ No newline at end of file diff --git a/programs/Hadrons/Make.inc b/programs/Hadrons/Make.inc deleted file mode 100644 index 13c13c4e..00000000 --- a/programs/Hadrons/Make.inc +++ /dev/null @@ -1,4 +0,0 @@ -bin_PROGRAMS = Hadrons - -Hadrons_SOURCES = Hadrons.cc -Hadrons_LDADD = -lGrid diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am deleted file mode 100644 index cdf7a166..00000000 --- a/programs/Hadrons/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -lib_LIBRARIES = libHadrons.a - -bin_PROGRAMS = Hadrons - -include modules.inc - -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_SOURCES = Hadrons.cc -Hadrons_LDADD = libHadrons.a -lGrid diff --git a/scripts/filelist b/scripts/filelist index dddb605b..ca7425c0 100755 --- a/scripts/filelist +++ b/scripts/filelist @@ -24,10 +24,11 @@ for subdir in $dirs; do echo "tests: ${TESTLIST} ${SUB}" > Make.inc echo ${PREF}_PROGRAMS = ${TESTLIST} >> Make.inc echo >> Make.inc + HADLINK=`[ $subdir = './hadrons' ] && echo '-lHadrons'` for f in $TESTS; do BNAME=`basename $f .cc` - echo ${BNAME}_SOURCES=$f >> Make.inc - echo ${BNAME}_LDADD=-lGrid>> Make.inc + echo ${BNAME}_SOURCES=$f >> Make.inc + echo ${BNAME}_LDADD=-lGrid ${HADLINK} >> Make.inc echo >> Make.inc done if [ $subdir != '.' ]; then diff --git a/tests/hadrons/Makefile.am b/tests/hadrons/Makefile.am new file mode 100644 index 00000000..fae0d212 --- /dev/null +++ b/tests/hadrons/Makefile.am @@ -0,0 +1,3 @@ +AM_LDFLAGS += -L../../extras/hadrons + +include Make.inc diff --git a/tests/hadrons/Test_hadrons_xmldriven.cc b/tests/hadrons/Test_hadrons_xmldriven.cc new file mode 100644 index 00000000..ad43b6cc --- /dev/null +++ b/tests/hadrons/Test_hadrons_xmldriven.cc @@ -0,0 +1,66 @@ +/******************************************************************************* +Grid physics library, www.github.com/paboyle/Grid + +Source file: programs/Hadrons/Hadrons.cc + +Copyright (C) 2015 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory. +*******************************************************************************/ + +#include + +using namespace Grid; +using namespace QCD; +using namespace Hadrons; + +int main(int argc, char *argv[]) +{ + // parse command line + std::string parameterFileName; + + if (argc < 2) + { + std::cerr << "usage: " << argv[0] << " [Grid options]"; + std::cerr << std::endl; + std::exit(EXIT_FAILURE); + } + parameterFileName = argv[1]; + + // initialization + Grid_init(&argc, &argv); + HadronsLogError.Active(GridLogError.isActive()); + HadronsLogWarning.Active(GridLogWarning.isActive()); + HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogIterative.Active(GridLogIterative.isActive()); + HadronsLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << std::endl; + + // execution + Application application(parameterFileName); + + application.run(); + + // epilogue + LOG(Message) << "Grid is finalizing now" << std::endl; + Grid_finalize(); + + return EXIT_SUCCESS; +} From b5555d85a706d29bcaf2ba5e527c117b3ae6f861 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Fri, 2 Dec 2016 11:04:15 +0900 Subject: [PATCH 112/807] Hadrons: generelalised FImpl for actions --- extras/Hadrons/Modules/ADWF.cc | 4 ++-- extras/Hadrons/Modules/AWilson.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/Hadrons/Modules/ADWF.cc b/extras/Hadrons/Modules/ADWF.cc index c7fba722..8f83f93f 100644 --- a/extras/Hadrons/Modules/ADWF.cc +++ b/extras/Hadrons/Modules/ADWF.cc @@ -75,7 +75,7 @@ void ADWF::execute(void) auto &grb4 = *env().getRbGrid(); auto &g5 = *env().getGrid(par().Ls); auto &grb5 = *env().getRbGrid(par().Ls); - FMat *fMatPt = new DomainWallFermionR(U, g5, grb5, g4, grb4, par().mass, - par().M5); + FMat *fMatPt = new DomainWallFermion(U, g5, grb5, g4, grb4, + par().mass, par().M5); env().setObject(getName(), fMatPt); } diff --git a/extras/Hadrons/Modules/AWilson.cc b/extras/Hadrons/Modules/AWilson.cc index a27a258d..e55fe988 100644 --- a/extras/Hadrons/Modules/AWilson.cc +++ b/extras/Hadrons/Modules/AWilson.cc @@ -70,6 +70,6 @@ void AWilson::execute() auto &U = *env().getObject(par().gauge); auto &grid = *env().getGrid(); auto &gridRb = *env().getRbGrid(); - FMat *fMatPt = new WilsonFermionR(U, grid, gridRb, par().mass); + FMat *fMatPt = new WilsonFermion(U, grid, gridRb, par().mass); env().setObject(getName(), fMatPt); } From 8190523e4c665023d03b71ad8b411e2530516caf Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Fri, 2 Dec 2016 11:04:34 +0900 Subject: [PATCH 113/807] Hadrons: type fix in module creation --- extras/Hadrons/Environment.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index baea4550..aa93eb79 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -245,7 +245,7 @@ template void Environment::createModule(const std::string name, const typename M::Par &par) { - ModPt pt(new M(name)); + std::unique_ptr pt(new M(name)); pt->setPar(par); pushModule(pt); From 1540616b22894574f1c6b5d021b7739b11458144 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 08:53:48 +0900 Subject: [PATCH 114/807] Hadrons: integer types cleanup --- extras/Hadrons/Environment.cc | 25 ++++++++++++++----------- extras/Hadrons/Environment.hpp | 28 +++++++++++++++++----------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index e9c7c733..03f33366 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -143,6 +143,7 @@ void Environment::pushModule(Environment::ModPt &pt) if (!hasModule(name)) { std::vector inputAddress; + unsigned int address; ModuleInfo m; m.data = std::move(pt); @@ -159,18 +160,19 @@ void Environment::pushModule(Environment::ModPt &pt) } auto output = m.data->getOutput(); module_.push_back(std::move(m)); - moduleAddress_[name] = module_.size() - 1; + address = static_cast(module_.size() - 1); + moduleAddress_[name] = address; for (auto &out: output) { if (!hasObject(out)) { - addObject(out , module_.size() - 1); + addObject(out, address); } else { if (object_[objectAddress_[out]].module < 0) { - object_[objectAddress_[out]].module = module_.size() - 1; + object_[objectAddress_[out]].module = address; } else { @@ -287,9 +289,10 @@ Graph Environment::makeModuleGraph(void) const #define MEM_MSG(size)\ sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" -unsigned int Environment::executeProgram(const std::vector &p) +Environment::Size +Environment::executeProgram(const std::vector &p) { - unsigned int memPeak = 0, sizeBefore, sizeAfter; + Size memPeak = 0, sizeBefore, sizeAfter; std::vector> freeProg; bool continueCollect, nothingFreed; @@ -385,7 +388,7 @@ unsigned int Environment::executeProgram(const std::vector &p) return memPeak; } -unsigned int Environment::executeProgram(const std::vector &p) +Environment::Size Environment::executeProgram(const std::vector &p) { std::vector pAddress; @@ -405,7 +408,7 @@ void Environment::addObject(const std::string name, const int moduleAddress) info.name = name; info.module = moduleAddress; object_.push_back(std::move(info)); - objectAddress_[name] = object_.size() - 1; + objectAddress_[name] = static_cast(object_.size() - 1); } void Environment::registerObject(const unsigned int address, @@ -483,7 +486,7 @@ std::string Environment::getObjectType(const std::string name) const return getObjectType(getObjectAddress(name)); } -unsigned int Environment::getObjectSize(const unsigned int address) const +Environment::Size Environment::getObjectSize(const unsigned int address) const { if (hasRegisteredObject(address)) { @@ -500,7 +503,7 @@ unsigned int Environment::getObjectSize(const unsigned int address) const } } -unsigned int Environment::getObjectSize(const std::string name) const +Environment::Size Environment::getObjectSize(const std::string name) const { return getObjectSize(getObjectAddress(name)); } @@ -573,9 +576,9 @@ bool Environment::isObject5d(const std::string name) const return (getObjectLs(name) > 1); } -long unsigned int Environment::getTotalSize(void) const +Environment::Size Environment::getTotalSize(void) const { - long unsigned int size = 0; + Environment::Size size = 0; for (auto &o: object_) { diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index aa93eb79..002d5d9d 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -31,6 +31,10 @@ directory. #include #include +#ifndef SITE_SIZE_TYPE +#define SITE_SIZE_TYPE unsigned int +#endif + BEGIN_HADRONS_NAMESPACE /****************************************************************************** @@ -64,11 +68,12 @@ class Environment { SINGLETON(Environment); public: - typedef std::unique_ptr ModPt; - typedef std::unique_ptr GridPt; - typedef std::unique_ptr GridRbPt; - typedef std::unique_ptr RngPt; - typedef std::unique_ptr LatticePt; + typedef SITE_SIZE_TYPE Size; + typedef std::unique_ptr ModPt; + typedef std::unique_ptr GridPt; + typedef std::unique_ptr GridRbPt; + typedef std::unique_ptr RngPt; + typedef std::unique_ptr LatticePt; private: struct ModuleInfo { @@ -79,7 +84,8 @@ private: }; struct ObjInfo { - unsigned int size{0}, Ls{0}; + Size size{0}; + unsigned int Ls{0}; bool isRegistered{false}; const std::type_info *type{nullptr}; std::string name; @@ -124,8 +130,8 @@ public: bool hasModule(const unsigned int address) const; bool hasModule(const std::string name) const; Graph makeModuleGraph(void) const; - unsigned int executeProgram(const std::vector &p); - unsigned int executeProgram(const std::vector &p); + Size executeProgram(const std::vector &p); + Size executeProgram(const std::vector &p); // general memory management void addObject(const std::string name, const int moduleAddress); @@ -159,8 +165,8 @@ public: std::string getObjectName(const unsigned int address) const; std::string getObjectType(const unsigned int address) const; std::string getObjectType(const std::string name) const; - unsigned int getObjectSize(const unsigned int address) const; - unsigned int getObjectSize(const std::string name) const; + Size getObjectSize(const unsigned int address) const; + Size getObjectSize(const std::string name) const; unsigned int getObjectLs(const unsigned int address) const; unsigned int getObjectLs(const std::string name) const; bool hasObject(const unsigned int address) const; @@ -169,7 +175,7 @@ public: bool hasRegisteredObject(const std::string name) const; bool isObject5d(const unsigned int address) const; bool isObject5d(const std::string name) const; - long unsigned int getTotalSize(void) const; + Environment::Size getTotalSize(void) const; void addOwnership(const unsigned int owner, const unsigned int property); void addOwnership(const std::string owner, From ee5b1fe043e75510838607fe2b7050861ba5e53b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 09:08:45 +0900 Subject: [PATCH 115/807] Hadrons: freeing object message fix --- extras/Hadrons/Environment.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 03f33366..67880cd3 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -640,7 +640,7 @@ bool Environment::freeObject(const unsigned int address) { if (!hasOwners(address)) { - if (!isDryRun()) + if (!isDryRun() and object_[address].isRegistered) { LOG(Message) << "Destroying object '" << object_[address].name << "'" << std::endl; From 7433eed2740de714098c8aeca349a60a386dc4d9 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 11:44:16 +0900 Subject: [PATCH 116/807] Hadrons: module creation fix --- extras/Hadrons/Application.hpp | 22 ++++++++++++++++++++++ extras/Hadrons/Environment.hpp | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/extras/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp index dd26a5b8..b0c88030 100644 --- a/extras/Hadrons/Application.hpp +++ b/extras/Hadrons/Application.hpp @@ -65,6 +65,11 @@ public: virtual ~Application(void) = default; // access void setPar(const GlobalPar &par); + // module creation + template + void createModule(const std::string name); + template + void createModule(const std::string name, const typename M::Par &par); // execute void run(void); // parse parameter file @@ -81,6 +86,23 @@ private: std::vector program_; }; +/****************************************************************************** + * Application template implementation * + ******************************************************************************/ +// module creation ///////////////////////////////////////////////////////////// +template +void Application::createModule(const std::string name) +{ + env_.createModule(name); +} + +template +void Application::createModule(const std::string name, + const typename M::Par &par) +{ + env_.createModule(name, par); +} + END_HADRONS_NAMESPACE #endif // Hadrons_Application_hpp_ diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index 002d5d9d..88661c2e 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -251,9 +251,9 @@ template void Environment::createModule(const std::string name, const typename M::Par &par) { - std::unique_ptr pt(new M(name)); + ModPt pt(new M(name)); - pt->setPar(par); + static_cast(pt.get())->setPar(par); pushModule(pt); } From a69086ba1f78305aa794959155888e7a2dee85c5 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 11:44:36 +0900 Subject: [PATCH 117/807] Hadrons: application run minor fixes --- extras/Hadrons/Application.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index a89d7034..21f84ad1 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -76,6 +76,7 @@ Application::Application(const std::string parameterFileName) void Application::setPar(const Application::GlobalPar &par) { par_ = par; + env_.setSeed(strToVec(par_.seed)); } // execute ///////////////////////////////////////////////////////////////////// @@ -101,10 +102,12 @@ public: void Application::parseParameterFile(void) { XmlReader reader(parameterFileName_); + GlobalPar par; ObjectId id; LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl; - read(reader, "parameters", par_); + read(reader, "parameters", par); + setPar(par); push(reader, "modules"); push(reader, "module"); do @@ -150,7 +153,7 @@ void Application::schedule(void) std::random_device rd; GeneticScheduler::Parameters par; - par.popSize = 20; + par.popSize = 10; par.mutationRate = .1; par.seed = rd(); CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed)); @@ -173,6 +176,7 @@ void Application::schedule(void) nCstPeak = 0; } } + LOG(Debug) << "generation " << gen << ":\n" << scheduler; prevPeak = scheduler.getMinValue(); if (gen % 10 == 0) { From 0b4f680d2836589c44b9d7abb49ec2fb52edb83f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 11:44:58 +0900 Subject: [PATCH 118/807] Hadrons: meson run test --- tests/hadrons/Test_hadrons_mesons.cc | 110 +++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 tests/hadrons/Test_hadrons_mesons.cc diff --git a/tests/hadrons/Test_hadrons_mesons.cc b/tests/hadrons/Test_hadrons_mesons.cc new file mode 100644 index 00000000..9c062b39 --- /dev/null +++ b/tests/hadrons/Test_hadrons_mesons.cc @@ -0,0 +1,110 @@ +/******************************************************************************* + Grid physics library, www.github.com/paboyle/Grid + + Source file: programs/Hadrons/Hadrons.cc + + Copyright (C) 2015 + + Author: Antonin Portelli + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution + directory. + *******************************************************************************/ + +#include + +using namespace Grid; +using namespace QCD; +using namespace Hadrons; + +int main(int argc, char *argv[]) +{ + // initialization ////////////////////////////////////////////////////////// + Grid_init(&argc, &argv); + HadronsLogError.Active(GridLogError.isActive()); + HadronsLogWarning.Active(GridLogWarning.isActive()); + HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogIterative.Active(GridLogIterative.isActive()); + HadronsLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << std::endl; + + // run setup /////////////////////////////////////////////////////////////// + Application application; + + std::vector flavour = {"l", "s", "c1", "c2", "c3"}; + std::vector mass = {.01, .04, .2 , .25 , .3 }; + + // global parameters + Application::GlobalPar globalPar; + globalPar.trajCounter.start = 1500; + globalPar.trajCounter.end = 1520; + globalPar.trajCounter.step = 20; + globalPar.seed = "1 2 3 4"; + application.setPar(globalPar); + // gauge field + application.createModule("gauge"); + // sources + SrcZ2::Par z2Par; + z2Par.tA = 0; + z2Par.tB = 0; + application.createModule("z2", z2Par); + SrcPoint::Par ptPar; + ptPar.position = "0 0 0 0"; + application.createModule("pt", ptPar); + for (unsigned int i = 0; i < flavour.size(); ++i) + { + // actions + ADWF::Par actionPar; + actionPar.gauge = "gauge"; + actionPar.Ls = 12; + actionPar.M5 = 1.8; + actionPar.mass = mass[i]; + application.createModule("DWF_" + flavour[i], actionPar); + + // solvers + SolRBPrecCG::Par solverPar; + solverPar.action = "DWF_" + flavour[i]; + solverPar.residual = 1.0e-8; + application.createModule("CG_" + flavour[i], solverPar); + + // propagators + MQuark::Par quarkPar; + quarkPar.solver = "CG_" + flavour[i]; + quarkPar.source = (flavour[i][0] == 'c') ? "z2" : "pt"; + application.createModule("Q_" + flavour[i], quarkPar); + } + for (unsigned int i = 0; i < flavour.size(); ++i) + for (unsigned int j = i + 1; j < flavour.size(); ++j) + { + CMeson::Par mesPar; + + mesPar.output = "mesons/" + flavour[i] + flavour[j]; + mesPar.q1 = "Q_" + flavour[i]; + mesPar.q2 = "Q_" + flavour[j]; + application.createModule("meson_" + flavour[i] + flavour[j], + mesPar); + } + + // execution + application.run(); + + // epilogue + LOG(Message) << "Grid is finalizing now" << std::endl; + Grid_finalize(); + + return EXIT_SUCCESS; +} From dd6fb140c58bbc5c080e141510cea774798987ff Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 13:53:31 +0900 Subject: [PATCH 119/807] Hadrons: big module reorganisation --- extras/Hadrons/Global.hpp | 2 +- extras/Hadrons/Module.hpp | 17 ++++- extras/Hadrons/Modules.hpp | 18 ++--- .../Modules/{ADWF.cc => MAction/DWF.cc} | 19 +++--- .../Modules/{ADWF.hpp => MAction/DWF.hpp} | 61 ++++++++--------- .../Modules/{AWilson.cc => MAction/Wilson.cc} | 19 +++--- .../{AWilson.hpp => MAction/Wilson.hpp} | 55 ++++++++-------- .../{CMeson.cc => MContraction/Meson.cc} | 17 ++--- .../{CMeson.hpp => MContraction/Meson.hpp} | 65 ++++++++++--------- .../Modules/{GLoad.cc => MGauge/Load.cc} | 19 +++--- .../Modules/{GLoad.hpp => MGauge/Load.hpp} | 53 ++++++++------- .../Modules/{GRandom.cc => MGauge/Random.cc} | 17 ++--- .../{GRandom.hpp => MGauge/Random.hpp} | 41 ++++++------ .../Modules/{GUnit.cc => MGauge/Unit.cc} | 17 ++--- .../Modules/{GUnit.hpp => MGauge/Unit.hpp} | 41 ++++++------ extras/Hadrons/Modules/MQuark.cc | 2 +- extras/Hadrons/Modules/MQuark.hpp | 2 +- .../{SolRBPrecCG.cc => MSolver/RBPrecCG.cc} | 19 +++--- .../{SolRBPrecCG.hpp => MSolver/RBPrecCG.hpp} | 57 ++++++++-------- .../Modules/{SrcPoint.cc => MSource/Point.cc} | 19 +++--- .../{SrcPoint.hpp => MSource/Point.hpp} | 57 ++++++++-------- .../Modules/{SrcZ2.cc => MSource/Z2.cc} | 19 +++--- .../Modules/{SrcZ2.hpp => MSource/Z2.hpp} | 57 ++++++++-------- .../templates}/Module.cc.template | 2 +- .../templates}/Module.hpp.template | 6 +- .../templates/Module_in_NS.cc.template | 40 ++++++++++++ .../templates/Module_in_NS.hpp.template | 43 ++++++++++++ extras/Hadrons/add_module.sh | 30 +++++++-- extras/Hadrons/modules.inc | 36 +++++----- tests/hadrons/Test_hadrons_mesons.cc | 27 ++++---- 30 files changed, 514 insertions(+), 363 deletions(-) rename extras/Hadrons/Modules/{ADWF.cc => MAction/DWF.cc} (87%) rename extras/Hadrons/Modules/{ADWF.hpp => MAction/DWF.hpp} (60%) rename extras/Hadrons/Modules/{AWilson.cc => MAction/Wilson.cc} (85%) rename extras/Hadrons/Modules/{AWilson.hpp => MAction/Wilson.hpp} (62%) rename extras/Hadrons/Modules/{CMeson.cc => MContraction/Meson.cc} (88%) rename extras/Hadrons/Modules/{CMeson.hpp => MContraction/Meson.hpp} (55%) rename extras/Hadrons/Modules/{GLoad.cc => MGauge/Load.cc} (85%) rename extras/Hadrons/Modules/{GLoad.hpp => MGauge/Load.hpp} (65%) rename extras/Hadrons/Modules/{GRandom.cc => MGauge/Random.cc} (83%) rename extras/Hadrons/Modules/{GRandom.hpp => MGauge/Random.hpp} (70%) rename extras/Hadrons/Modules/{GUnit.cc => MGauge/Unit.cc} (84%) rename extras/Hadrons/Modules/{GUnit.hpp => MGauge/Unit.hpp} (70%) rename extras/Hadrons/Modules/{SolRBPrecCG.cc => MSolver/RBPrecCG.cc} (85%) rename extras/Hadrons/Modules/{SolRBPrecCG.hpp => MSolver/RBPrecCG.hpp} (61%) rename extras/Hadrons/Modules/{SrcPoint.cc => MSource/Point.cc} (84%) rename extras/Hadrons/Modules/{SrcPoint.hpp => MSource/Point.hpp} (64%) rename extras/Hadrons/Modules/{SrcZ2.cc => MSource/Z2.cc} (87%) rename extras/Hadrons/Modules/{SrcZ2.hpp => MSource/Z2.hpp} (64%) rename extras/Hadrons/{ => Modules/templates}/Module.cc.template (95%) rename extras/Hadrons/{ => Modules/templates}/Module.hpp.template (90%) create mode 100644 extras/Hadrons/Modules/templates/Module_in_NS.cc.template create mode 100644 extras/Hadrons/Modules/templates/Module_in_NS.hpp.template diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index 0936f3ba..5f102328 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -54,7 +54,7 @@ BEGIN_HADRONS_NAMESPACE typedef FermionOperator FMat; typedef FIMPL::FermionField FermionField; typedef FIMPL::PropagatorField PropagatorField; -typedef std::function Solver; +typedef std::function SolverFn; // logger class HadronsLogger: public Logger diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index 60dcc936..d7065650 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -33,7 +33,7 @@ directory. BEGIN_HADRONS_NAMESPACE -// module registration macro +// module registration macros #define MODULE_REGISTER(mod)\ class mod##ModuleRegistrar\ {\ @@ -49,6 +49,21 @@ public:\ };\ static mod##ModuleRegistrar mod##ModuleRegistrarInstance; +#define MODULE_REGISTER_NS(mod, ns)\ +class ns##mod##ModuleRegistrar\ +{\ +public:\ + ns##mod##ModuleRegistrar(void)\ + {\ + ModuleFactory &modFac = ModuleFactory::getInstance();\ + modFac.registerBuilder(#ns "::" #mod, [&](const std::string name)\ + {\ + return std::unique_ptr(new ns::mod(name));\ + });\ + }\ +};\ +static ns##mod##ModuleRegistrar ns##mod##ModuleRegistrarInstance; + /****************************************************************************** * Module class * ******************************************************************************/ diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp index a7a88710..998c609f 100644 --- a/extras/Hadrons/Modules.hpp +++ b/extras/Hadrons/Modules.hpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include diff --git a/extras/Hadrons/Modules/ADWF.cc b/extras/Hadrons/Modules/MAction/DWF.cc similarity index 87% rename from extras/Hadrons/Modules/ADWF.cc rename to extras/Hadrons/Modules/MAction/DWF.cc index 8f83f93f..626ac69b 100644 --- a/extras/Hadrons/Modules/ADWF.cc +++ b/extras/Hadrons/Modules/MAction/DWF.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/ADWF.cc +Source file: programs/Hadrons/DWF.cc Copyright (C) 2016 @@ -25,28 +25,29 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MAction; /****************************************************************************** -* ADWF implementation * +* DWF implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -ADWF::ADWF(const std::string name) -: Module(name) +DWF::DWF(const std::string name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector ADWF::getInput(void) +std::vector DWF::getInput(void) { std::vector in = {par().gauge}; return in; } -std::vector ADWF::getOutput(void) +std::vector DWF::getOutput(void) { std::vector out = {getName()}; @@ -54,7 +55,7 @@ std::vector ADWF::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void ADWF::setup(void) +void DWF::setup(void) { unsigned int size; @@ -63,7 +64,7 @@ void ADWF::setup(void) } // execution /////////////////////////////////////////////////////////////////// -void ADWF::execute(void) +void DWF::execute(void) { LOG(Message) << "Setting up domain wall fermion matrix with m= " << par().mass << ", M5= " << par().M5 << " and Ls= " diff --git a/extras/Hadrons/Modules/ADWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp similarity index 60% rename from extras/Hadrons/Modules/ADWF.hpp rename to extras/Hadrons/Modules/MAction/DWF.hpp index 159d5b20..15d3a0dc 100644 --- a/extras/Hadrons/Modules/ADWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/ADWF.hpp +Source file: programs/Hadrons/DWF.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_ADWF_hpp_ -#define Hadrons_ADWF_hpp_ +#ifndef Hadrons_DWF_hpp_ +#define Hadrons_DWF_hpp_ #include #include @@ -37,34 +37,37 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Domain wall quark action * ******************************************************************************/ -class ADWFPar: Serializable +namespace MAction { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(ADWFPar, - std::string, gauge, - unsigned int, Ls, - double , mass, - double , M5); -}; + class DWFPar: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(DWFPar, + std::string, gauge, + unsigned int, Ls, + double , mass, + double , M5); + }; + + class DWF: public Module + { + public: + // constructor + DWF(const std::string name); + // destructor + virtual ~DWF(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -class ADWF: public Module -{ -public: - // constructor - ADWF(const std::string name); - // destructor - virtual ~ADWF(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; - -MODULE_REGISTER(ADWF); +MODULE_REGISTER_NS(DWF, MAction); END_HADRONS_NAMESPACE -#endif // Hadrons_ADWF_hpp_ +#endif // Hadrons_DWF_hpp_ diff --git a/extras/Hadrons/Modules/AWilson.cc b/extras/Hadrons/Modules/MAction/Wilson.cc similarity index 85% rename from extras/Hadrons/Modules/AWilson.cc rename to extras/Hadrons/Modules/MAction/Wilson.cc index e55fe988..a07669e2 100644 --- a/extras/Hadrons/Modules/AWilson.cc +++ b/extras/Hadrons/Modules/MAction/Wilson.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/AWilson.cc +Source file: programs/Hadrons/Wilson.cc Copyright (C) 2016 @@ -25,28 +25,29 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MAction; /****************************************************************************** -* AWilson implementation * +* Wilson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -AWilson::AWilson(const std::string name) -: Module(name) +Wilson::Wilson(const std::string name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector AWilson::getInput(void) +std::vector Wilson::getInput(void) { std::vector in = {par().gauge}; return in; } -std::vector AWilson::getOutput(void) +std::vector Wilson::getOutput(void) { std::vector out = {getName()}; @@ -54,7 +55,7 @@ std::vector AWilson::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void AWilson::setup(void) +void Wilson::setup(void) { unsigned int size; @@ -63,7 +64,7 @@ void AWilson::setup(void) } // execution /////////////////////////////////////////////////////////////////// -void AWilson::execute() +void Wilson::execute() { LOG(Message) << "Setting up Wilson fermion matrix with m= " << par().mass << " using gauge field '" << par().gauge << "'" << std::endl; diff --git a/extras/Hadrons/Modules/AWilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp similarity index 62% rename from extras/Hadrons/Modules/AWilson.hpp rename to extras/Hadrons/Modules/MAction/Wilson.hpp index 93986315..d6644ea4 100644 --- a/extras/Hadrons/Modules/AWilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/AWilson.hpp +Source file: programs/Hadrons/Wilson.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_AWilson_hpp_ -#define Hadrons_AWilson_hpp_ +#ifndef Hadrons_Wilson_hpp_ +#define Hadrons_Wilson_hpp_ #include #include @@ -37,32 +37,35 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Wilson quark action * ******************************************************************************/ -class AWilsonPar: Serializable +namespace MAction { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(AWilsonPar, - std::string, gauge, - double , mass); -}; + class WilsonPar: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(WilsonPar, + std::string, gauge, + double , mass); + }; -class AWilson: public Module -{ -public: - // constructor - AWilson(const std::string name); - // destructor - virtual ~AWilson(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; + class Wilson: public Module + { + public: + // constructor + Wilson(const std::string name); + // destructor + virtual ~Wilson(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -MODULE_REGISTER(AWilson); +MODULE_REGISTER_NS(Wilson, MAction); END_HADRONS_NAMESPACE -#endif // Hadrons_AWilson_hpp_ +#endif // Hadrons_Wilson_hpp_ diff --git a/extras/Hadrons/Modules/CMeson.cc b/extras/Hadrons/Modules/MContraction/Meson.cc similarity index 88% rename from extras/Hadrons/Modules/CMeson.cc rename to extras/Hadrons/Modules/MContraction/Meson.cc index fef8179d..1707f00d 100644 --- a/extras/Hadrons/Modules/CMeson.cc +++ b/extras/Hadrons/Modules/MContraction/Meson.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/CMeson.cc +Source file: programs/Hadrons/Meson.cc Copyright (C) 2015 @@ -25,29 +25,30 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; using namespace Hadrons; +using namespace MContraction; /****************************************************************************** - * CMeson implementation * + * Meson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -CMeson::CMeson(const std::string name) -: Module(name) +Meson::Meson(const std::string name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector CMeson::getInput(void) +std::vector Meson::getInput(void) { std::vector input = {par().q1, par().q2}; return input; } -std::vector CMeson::getOutput(void) +std::vector Meson::getOutput(void) { std::vector output = {getName()}; @@ -55,7 +56,7 @@ std::vector CMeson::getOutput(void) } // execution /////////////////////////////////////////////////////////////////// -void CMeson::execute(void) +void Meson::execute(void) { LOG(Message) << "Computing meson contraction '" << getName() << "' using" << " quarks '" << par().q1 << "' and '" << par().q2 << "'" diff --git a/extras/Hadrons/Modules/CMeson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp similarity index 55% rename from extras/Hadrons/Modules/CMeson.hpp rename to extras/Hadrons/Modules/MContraction/Meson.hpp index 2e9daa6d..a2cdf3db 100644 --- a/extras/Hadrons/Modules/CMeson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/CMeson.hpp +Source file: programs/Hadrons/Meson.hpp Copyright (C) 2015 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_CMeson_hpp_ -#define Hadrons_CMeson_hpp_ +#ifndef Hadrons_Meson_hpp_ +#define Hadrons_Meson_hpp_ #include #include @@ -35,40 +35,43 @@ directory. BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * CMeson * + * Meson * ******************************************************************************/ -class CMesonPar: Serializable +namespace MContraction { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(CMesonPar, - std::string, q1, - std::string, q2, - std::string, output); -}; - -class CMeson: public Module -{ -public: - class Result: Serializable + class MesonPar: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Result, - std::vector>>, corr); + GRID_SERIALIZABLE_CLASS_MEMBERS(MesonPar, + std::string, q1, + std::string, q2, + std::string, output); }; -public: - // constructor - CMeson(const std::string name); - // destructor - virtual ~CMeson(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // execution - virtual void execute(void); -}; + + class Meson: public Module + { + public: + class Result: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Result, + std::vector>>, corr); + }; + public: + // constructor + Meson(const std::string name); + // destructor + virtual ~Meson(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // execution + virtual void execute(void); + }; +} -MODULE_REGISTER(CMeson); +MODULE_REGISTER_NS(Meson, MContraction); END_HADRONS_NAMESPACE -#endif // Hadrons_CMeson_hpp_ +#endif // Hadrons_Meson_hpp_ diff --git a/extras/Hadrons/Modules/GLoad.cc b/extras/Hadrons/Modules/MGauge/Load.cc similarity index 85% rename from extras/Hadrons/Modules/GLoad.cc rename to extras/Hadrons/Modules/MGauge/Load.cc index b81307cd..276c08b2 100644 --- a/extras/Hadrons/Modules/GLoad.cc +++ b/extras/Hadrons/Modules/MGauge/Load.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GLoad.cc +Source file: programs/Hadrons/Load.cc Copyright (C) 2016 @@ -25,28 +25,29 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MGauge; /****************************************************************************** -* GLoad implementation * +* Load implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -GLoad::GLoad(const std::string name) -: Module(name) +Load::Load(const std::string name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector GLoad::getInput(void) +std::vector Load::getInput(void) { std::vector in; return in; } -std::vector GLoad::getOutput(void) +std::vector Load::getOutput(void) { std::vector out = {getName()}; @@ -54,13 +55,13 @@ std::vector GLoad::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void GLoad::setup(void) +void Load::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void GLoad::execute(void) +void Load::execute(void) { NerscField header; std::string fileName = par().file + "." diff --git a/extras/Hadrons/Modules/GLoad.hpp b/extras/Hadrons/Modules/MGauge/Load.hpp similarity index 65% rename from extras/Hadrons/Modules/GLoad.hpp rename to extras/Hadrons/Modules/MGauge/Load.hpp index 9a089b61..5cd98f0c 100644 --- a/extras/Hadrons/Modules/GLoad.hpp +++ b/extras/Hadrons/Modules/MGauge/Load.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GLoad.hpp +Source file: programs/Hadrons/Load.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_GLoad_hpp_ -#define Hadrons_GLoad_hpp_ +#ifndef Hadrons_Load_hpp_ +#define Hadrons_Load_hpp_ #include #include @@ -37,31 +37,34 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Load a NERSC configuration * ******************************************************************************/ -class GLoadPar: Serializable +namespace MGauge { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(GLoadPar, - std::string, file); -}; + class LoadPar: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPar, + std::string, file); + }; -class GLoad: public Module -{ -public: - // constructor - GLoad(const std::string name); - // destructor - virtual ~GLoad(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; + class Load: public Module + { + public: + // constructor + Load(const std::string name); + // destructor + virtual ~Load(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -MODULE_REGISTER(GLoad); +MODULE_REGISTER_NS(Load, MGauge); END_HADRONS_NAMESPACE -#endif // Hadrons_GLoad_hpp_ +#endif // Hadrons_Load_hpp_ diff --git a/extras/Hadrons/Modules/GRandom.cc b/extras/Hadrons/Modules/MGauge/Random.cc similarity index 83% rename from extras/Hadrons/Modules/GRandom.cc rename to extras/Hadrons/Modules/MGauge/Random.cc index 7f5af2c2..587c5c25 100644 --- a/extras/Hadrons/Modules/GRandom.cc +++ b/extras/Hadrons/Modules/MGauge/Random.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GRandom.cc +Source file: programs/Hadrons/Random.cc Copyright (C) 2016 @@ -25,26 +25,27 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MGauge; /****************************************************************************** -* GRandom implementation * +* Random implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -GRandom::GRandom(const std::string name) +Random::Random(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector GRandom::getInput(void) +std::vector Random::getInput(void) { return std::vector(); } -std::vector GRandom::getOutput(void) +std::vector Random::getOutput(void) { std::vector out = {getName()}; @@ -52,13 +53,13 @@ std::vector GRandom::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void GRandom::setup(void) +void Random::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void GRandom::execute(void) +void Random::execute(void) { LOG(Message) << "Generating random gauge configuration" << std::endl; LatticeGaugeField &U = *env().createLattice(getName()); diff --git a/extras/Hadrons/Modules/GRandom.hpp b/extras/Hadrons/Modules/MGauge/Random.hpp similarity index 70% rename from extras/Hadrons/Modules/GRandom.hpp rename to extras/Hadrons/Modules/MGauge/Random.hpp index 6c42372e..285357e3 100644 --- a/extras/Hadrons/Modules/GRandom.hpp +++ b/extras/Hadrons/Modules/MGauge/Random.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GRandom.hpp +Source file: programs/Hadrons/Random.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_GRandom_hpp_ -#define Hadrons_GRandom_hpp_ +#ifndef Hadrons_Random_hpp_ +#define Hadrons_Random_hpp_ #include #include @@ -37,24 +37,27 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Random gauge * ******************************************************************************/ -class GRandom: public Module +namespace MGauge { -public: - // constructor - GRandom(const std::string name); - // destructor - virtual ~GRandom(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; + class Random: public Module + { + public: + // constructor + Random(const std::string name); + // destructor + virtual ~Random(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -MODULE_REGISTER(GRandom); +MODULE_REGISTER_NS(Random, MGauge); END_HADRONS_NAMESPACE -#endif // Hadrons_GRandom_hpp_ +#endif // Hadrons_Random_hpp_ diff --git a/extras/Hadrons/Modules/GUnit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc similarity index 84% rename from extras/Hadrons/Modules/GUnit.cc rename to extras/Hadrons/Modules/MGauge/Unit.cc index 34f134fe..232bd835 100644 --- a/extras/Hadrons/Modules/GUnit.cc +++ b/extras/Hadrons/Modules/MGauge/Unit.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GUnit.cc +Source file: programs/Hadrons/Unit.cc Copyright (C) 2016 @@ -25,26 +25,27 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MGauge; /****************************************************************************** -* GUnit implementation * +* Unit implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -GUnit::GUnit(const std::string name) +Unit::Unit(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector GUnit::getInput(void) +std::vector Unit::getInput(void) { return std::vector(); } -std::vector GUnit::getOutput(void) +std::vector Unit::getOutput(void) { std::vector out = {getName()}; @@ -52,13 +53,13 @@ std::vector GUnit::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void GUnit::setup(void) +void Unit::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void GUnit::execute(void) +void Unit::execute(void) { LOG(Message) << "Creating unit gauge configuration" << std::endl; LatticeGaugeField &U = *env().createLattice(getName()); diff --git a/extras/Hadrons/Modules/GUnit.hpp b/extras/Hadrons/Modules/MGauge/Unit.hpp similarity index 70% rename from extras/Hadrons/Modules/GUnit.hpp rename to extras/Hadrons/Modules/MGauge/Unit.hpp index 31b53a35..4fa03f54 100644 --- a/extras/Hadrons/Modules/GUnit.hpp +++ b/extras/Hadrons/Modules/MGauge/Unit.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GUnit.hpp +Source file: programs/Hadrons/Unit.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_GUnit_hpp_ -#define Hadrons_GUnit_hpp_ +#ifndef Hadrons_Unit_hpp_ +#define Hadrons_Unit_hpp_ #include #include @@ -37,24 +37,27 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Unit gauge * ******************************************************************************/ -class GUnit: public Module +namespace MGauge { -public: - // constructor - GUnit(const std::string name); - // destructor - virtual ~GUnit(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; + class Unit: public Module + { + public: + // constructor + Unit(const std::string name); + // destructor + virtual ~Unit(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -MODULE_REGISTER(GUnit); +MODULE_REGISTER_NS(Unit, MGauge); END_HADRONS_NAMESPACE -#endif // Hadrons_GUnit_hpp_ +#endif // Hadrons_Unit_hpp_ diff --git a/extras/Hadrons/Modules/MQuark.cc b/extras/Hadrons/Modules/MQuark.cc index 8f730b58..07f25e1c 100644 --- a/extras/Hadrons/Modules/MQuark.cc +++ b/extras/Hadrons/Modules/MQuark.cc @@ -76,7 +76,7 @@ void MQuark::execute(void) << std::endl; LatticePropagator &prop = *env().createLattice(propName); LatticePropagator &fullSrc = *env().getObject(par().source); - Solver &solver = *env().getObject(par().solver); + SolverFn &solver = *env().getObject(par().solver); if (Ls_ > 1) { env().createLattice(getName()); diff --git a/extras/Hadrons/Modules/MQuark.hpp b/extras/Hadrons/Modules/MQuark.hpp index f217e338..ed6dfb0c 100644 --- a/extras/Hadrons/Modules/MQuark.hpp +++ b/extras/Hadrons/Modules/MQuark.hpp @@ -61,7 +61,7 @@ public: virtual void execute(void); private: unsigned int Ls_; - Solver *solver_{nullptr}; + SolverFn *solver_{nullptr}; }; MODULE_REGISTER(MQuark); diff --git a/extras/Hadrons/Modules/SolRBPrecCG.cc b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc similarity index 85% rename from extras/Hadrons/Modules/SolRBPrecCG.cc rename to extras/Hadrons/Modules/MSolver/RBPrecCG.cc index 7a7aa69d..2c3d9f67 100644 --- a/extras/Hadrons/Modules/SolRBPrecCG.cc +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SolRBPrecCG.cc +Source file: programs/Hadrons/RBPrecCG.cc Copyright (C) 2016 @@ -25,29 +25,30 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace QCD; using namespace Hadrons; +using namespace MSolver; /****************************************************************************** -* SolRBPrecCG implementation * +* RBPrecCG implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -SolRBPrecCG::SolRBPrecCG(const std::string name) +RBPrecCG::RBPrecCG(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector SolRBPrecCG::getInput(void) +std::vector RBPrecCG::getInput(void) { std::vector in = {par().action}; return in; } -std::vector SolRBPrecCG::getOutput(void) +std::vector RBPrecCG::getOutput(void) { std::vector out = {getName()}; @@ -55,7 +56,7 @@ std::vector SolRBPrecCG::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void SolRBPrecCG::setup(void) +void RBPrecCG::setup(void) { auto Ls = env().getObjectLs(par().action); @@ -64,7 +65,7 @@ void SolRBPrecCG::setup(void) } // execution /////////////////////////////////////////////////////////////////// -void SolRBPrecCG::execute(void) +void RBPrecCG::execute(void) { auto &mat = *(env().getObject(par().action)); auto solver = [&mat, this](LatticeFermion &sol, @@ -79,5 +80,5 @@ void SolRBPrecCG::execute(void) LOG(Message) << "setting up Schur red-black preconditioned CG for" << " action '" << par().action << "' with residual " << par().residual << std::endl; - env().setObject(getName(), new Solver(solver)); + env().setObject(getName(), new SolverFn(solver)); } diff --git a/extras/Hadrons/Modules/SolRBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp similarity index 61% rename from extras/Hadrons/Modules/SolRBPrecCG.hpp rename to extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index 7482a70c..3d36c4c7 100644 --- a/extras/Hadrons/Modules/SolRBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SolRBPrecCG.hpp +Source file: programs/Hadrons/RBPrecCG.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_SolRBPrecCG_hpp_ -#define Hadrons_SolRBPrecCG_hpp_ +#ifndef Hadrons_RBPrecCG_hpp_ +#define Hadrons_RBPrecCG_hpp_ #include #include @@ -37,32 +37,35 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Schur red-black preconditioned CG * ******************************************************************************/ -class SolRBPrecCGPar: Serializable +namespace MSolver { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(SolRBPrecCGPar, - std::string, action, - double , residual); -}; + class RBPrecCGPar: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar, + std::string, action, + double , residual); + }; + + class RBPrecCG: public Module + { + public: + // constructor + RBPrecCG(const std::string name); + // destructor + virtual ~RBPrecCG(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -class SolRBPrecCG: public Module -{ -public: - // constructor - SolRBPrecCG(const std::string name); - // destructor - virtual ~SolRBPrecCG(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; - -MODULE_REGISTER(SolRBPrecCG); +MODULE_REGISTER_NS(RBPrecCG, MSolver); END_HADRONS_NAMESPACE -#endif // Hadrons_SolRBPrecCG_hpp_ +#endif // Hadrons_RBPrecCG_hpp_ diff --git a/extras/Hadrons/Modules/SrcPoint.cc b/extras/Hadrons/Modules/MSource/Point.cc similarity index 84% rename from extras/Hadrons/Modules/SrcPoint.cc rename to extras/Hadrons/Modules/MSource/Point.cc index a060b5d7..f22f41d9 100644 --- a/extras/Hadrons/Modules/SrcPoint.cc +++ b/extras/Hadrons/Modules/MSource/Point.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SrcPoint.cc +Source file: programs/Hadrons/Point.cc Copyright (C) 2016 @@ -25,28 +25,29 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MSource; /****************************************************************************** -* SrcPoint implementation * +* Point implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -SrcPoint::SrcPoint(const std::string name) -: Module(name) +Point::Point(const std::string name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector SrcPoint::getInput(void) +std::vector Point::getInput(void) { std::vector in; return in; } -std::vector SrcPoint::getOutput(void) +std::vector Point::getOutput(void) { std::vector out = {getName()}; @@ -54,13 +55,13 @@ std::vector SrcPoint::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void SrcPoint::setup(void) +void Point::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void SrcPoint::execute(void) +void Point::execute(void) { std::vector position = strToVec(par().position); SpinColourMatrix id; diff --git a/extras/Hadrons/Modules/SrcPoint.hpp b/extras/Hadrons/Modules/MSource/Point.hpp similarity index 64% rename from extras/Hadrons/Modules/SrcPoint.hpp rename to extras/Hadrons/Modules/MSource/Point.hpp index 8c1efce0..4bebdfe0 100644 --- a/extras/Hadrons/Modules/SrcPoint.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SrcPoint.hpp +Source file: programs/Hadrons/Point.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_SrcPoint_hpp_ -#define Hadrons_SrcPoint_hpp_ +#ifndef Hadrons_Point_hpp_ +#define Hadrons_Point_hpp_ #include #include @@ -46,33 +46,36 @@ BEGIN_HADRONS_NAMESPACE */ /****************************************************************************** - * SrcPoint * + * Point * ******************************************************************************/ -class SrcPointPar: Serializable +namespace MSource { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(SrcPointPar, - std::string, position); -}; + class PointPar: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(PointPar, + std::string, position); + }; + + class Point: public Module + { + public: + // constructor + Point(const std::string name); + // destructor + virtual ~Point(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -class SrcPoint: public Module -{ -public: - // constructor - SrcPoint(const std::string name); - // destructor - virtual ~SrcPoint(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; - -MODULE_REGISTER(SrcPoint); +MODULE_REGISTER_NS(Point, MSource); END_HADRONS_NAMESPACE -#endif // Hadrons_SrcPoint_hpp_ +#endif // Hadrons_Point_hpp_ diff --git a/extras/Hadrons/Modules/SrcZ2.cc b/extras/Hadrons/Modules/MSource/Z2.cc similarity index 87% rename from extras/Hadrons/Modules/SrcZ2.cc rename to extras/Hadrons/Modules/MSource/Z2.cc index ec555a08..90f9f274 100644 --- a/extras/Hadrons/Modules/SrcZ2.cc +++ b/extras/Hadrons/Modules/MSource/Z2.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SrcZ2.cc +Source file: programs/Hadrons/Z2.cc Copyright (C) 2016 @@ -25,28 +25,29 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#include using namespace Grid; using namespace Hadrons; +using namespace MSource; /****************************************************************************** -* SrcZ2 implementation * +* Z2 implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -SrcZ2::SrcZ2(const std::string name) -: Module(name) +Z2::Z2(const std::string name) +: Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector SrcZ2::getInput(void) +std::vector Z2::getInput(void) { std::vector in; return in; } -std::vector SrcZ2::getOutput(void) +std::vector Z2::getOutput(void) { std::vector out = {getName()}; @@ -54,13 +55,13 @@ std::vector SrcZ2::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void SrcZ2::setup(void) +void Z2::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void SrcZ2::execute(void) +void Z2::execute(void) { Lattice> t(env().getGrid()); LatticeComplex eta(env().getGrid()); diff --git a/extras/Hadrons/Modules/SrcZ2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp similarity index 64% rename from extras/Hadrons/Modules/SrcZ2.hpp rename to extras/Hadrons/Modules/MSource/Z2.hpp index bf0aebc0..0ff24b0c 100644 --- a/extras/Hadrons/Modules/SrcZ2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/SrcZ2.hpp +Source file: programs/Hadrons/Z2.hpp Copyright (C) 2016 @@ -25,8 +25,8 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#ifndef Hadrons_SrcZ2_hpp_ -#define Hadrons_SrcZ2_hpp_ +#ifndef Hadrons_Z2_hpp_ +#define Hadrons_Z2_hpp_ #include #include @@ -47,34 +47,37 @@ BEGIN_HADRONS_NAMESPACE */ /****************************************************************************** - * SrcZ2 * + * Z2 * ******************************************************************************/ -class SrcZ2Par: Serializable +namespace MSource { -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(SrcZ2Par, - unsigned int, tA, - unsigned int, tB); -}; + class Z2Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Z2Par, + unsigned int, tA, + unsigned int, tB); + }; -class SrcZ2: public Module -{ -public: - // constructor - SrcZ2(const std::string name); - // destructor - virtual ~SrcZ2(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -}; + class Z2: public Module + { + public: + // constructor + Z2(const std::string name); + // destructor + virtual ~Z2(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} -MODULE_REGISTER(SrcZ2); +MODULE_REGISTER_NS(Z2, MSource); END_HADRONS_NAMESPACE -#endif // Hadrons_SrcZ2_hpp_ +#endif // Hadrons_Z2_hpp_ diff --git a/extras/Hadrons/Module.cc.template b/extras/Hadrons/Modules/templates/Module.cc.template similarity index 95% rename from extras/Hadrons/Module.cc.template rename to extras/Hadrons/Modules/templates/Module.cc.template index 1bcf53ca..5cd7664d 100644 --- a/extras/Hadrons/Module.cc.template +++ b/extras/Hadrons/Modules/templates/Module.cc.template @@ -1,4 +1,4 @@ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Module.hpp.template b/extras/Hadrons/Modules/templates/Module.hpp.template similarity index 90% rename from extras/Hadrons/Module.hpp.template rename to extras/Hadrons/Modules/templates/Module.hpp.template index e8e6c4de..bee4e618 100644 --- a/extras/Hadrons/Module.hpp.template +++ b/extras/Hadrons/Modules/templates/Module.hpp.template @@ -1,9 +1,9 @@ #ifndef Hadrons____FILEBASENAME____hpp_ #define Hadrons____FILEBASENAME____hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.cc.template b/extras/Hadrons/Modules/templates/Module_in_NS.cc.template new file mode 100644 index 00000000..64bc7aa9 --- /dev/null +++ b/extras/Hadrons/Modules/templates/Module_in_NS.cc.template @@ -0,0 +1,40 @@ +#include + +using namespace Grid; +using namespace Hadrons; +using namespace ___NAMESPACE___; + +/****************************************************************************** +* ___FILEBASENAME___ implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +___FILEBASENAME___::___FILEBASENAME___(const std::string name) +: Module<___FILEBASENAME___Par>(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector ___FILEBASENAME___::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector ___FILEBASENAME___::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +void ___FILEBASENAME___::setup(void) +{ + +} + +// execution /////////////////////////////////////////////////////////////////// +void ___FILEBASENAME___::execute(void) +{ + +} diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template new file mode 100644 index 00000000..bc43649b --- /dev/null +++ b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template @@ -0,0 +1,43 @@ +#ifndef Hadrons____FILEBASENAME____hpp_ +#define Hadrons____FILEBASENAME____hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * ___FILEBASENAME___ * + ******************************************************************************/ +namespace ___NAMESPACE___ +{ + class ___FILEBASENAME___Par: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par, + unsigned int, i); + }; + + class ___FILEBASENAME___: public Module<___FILEBASENAME___Par> + { + public: + // constructor + ___FILEBASENAME___(const std::string name); + // destructor + virtual ~___FILEBASENAME___(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); + }; +} + +MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___); + +END_HADRONS_NAMESPACE + +#endif // Hadrons____FILEBASENAME____hpp_ diff --git a/extras/Hadrons/add_module.sh b/extras/Hadrons/add_module.sh index e412e0e7..d5d23ea4 100755 --- a/extras/Hadrons/add_module.sh +++ b/extras/Hadrons/add_module.sh @@ -1,15 +1,31 @@ #!/usr/bin/env bash -if (( $# != 1 )); then - echo "usage: `basename $0` " 1>&2 +if (( $# != 1 && $# != 2)); then + echo "usage: `basename $0` []" 1>&2 exit 1 fi NAME=$1 +NS=$2 -if [ -e "Modules/${NAME}.cc" ] || [ -e "Modules/${NAME}.hpp" ]; then - echo "error: files Modules/${NAME}.* already exists" 1>&2 - exit 1 +if (( $# == 1 )); then + if [ -e "Modules/${NAME}.cc" ] || [ -e "Modules/${NAME}.hpp" ]; then + echo "error: files Modules/${NAME}.* already exists" 1>&2 + exit 1 + fi + sed "s/___FILEBASENAME___/${NAME}/g" Modules/templates/Module.cc.template > Modules/${NAME}.cc + sed "s/___FILEBASENAME___/${NAME}/g" Modules/templates/Module.hpp.template > Modules/${NAME}.hpp +elif (( $# == 2 )); then + mkdir -p Modules/${NS} + if [ -e "Modules/${NS}/${NAME}.cc" ] || [ -e "Modules/${NS}/${NAME}.hpp" ]; then + echo "error: files Modules/${NS}/${NAME}.* already exists" 1>&2 + exit 1 + fi + TMPCC=".${NS}.${NAME}.tmp.cc" + TMPHPP=".${NS}.${NAME}.tmp.hpp" + sed "s/___FILEBASENAME___/${NAME}/g" Modules/templates/Module_in_NS.cc.template > ${TMPCC} + sed "s/___FILEBASENAME___/${NAME}/g" Modules/templates/Module_in_NS.hpp.template > ${TMPHPP} + sed "s/___NAMESPACE___/${NS}/g" ${TMPCC} > Modules/${NS}/${NAME}.cc + sed "s/___NAMESPACE___/${NS}/g" ${TMPHPP} > Modules/${NS}/${NAME}.hpp + rm -f ${TMPCC} ${TMPHPP} fi -sed "s/___FILEBASENAME___/${NAME}/g" Module.cc.template > Modules/${NAME}.cc -sed "s/___FILEBASENAME___/${NAME}/g" Module.hpp.template > Modules/${NAME}.hpp ./make_module_list.sh diff --git a/extras/Hadrons/modules.inc b/extras/Hadrons/modules.inc index 9040c406..a460ae86 100644 --- a/extras/Hadrons/modules.inc +++ b/extras/Hadrons/modules.inc @@ -1,24 +1,24 @@ modules_cc =\ - Modules/ADWF.cc \ - Modules/AWilson.cc \ - Modules/CMeson.cc \ - Modules/GLoad.cc \ - Modules/GRandom.cc \ - Modules/GUnit.cc \ + Modules/MAction/DWF.cc \ + Modules/MAction/Wilson.cc \ + Modules/MContraction/Meson.cc \ + Modules/MGauge/Load.cc \ + Modules/MGauge/Random.cc \ + Modules/MGauge/Unit.cc \ Modules/MQuark.cc \ - Modules/SolRBPrecCG.cc \ - Modules/SrcPoint.cc \ - Modules/SrcZ2.cc + Modules/MSolver/RBPrecCG.cc \ + Modules/MSource/Point.cc \ + Modules/MSource/Z2.cc modules_hpp =\ - Modules/ADWF.hpp \ - Modules/AWilson.hpp \ - Modules/CMeson.hpp \ - Modules/GLoad.hpp \ - Modules/GRandom.hpp \ - Modules/GUnit.hpp \ + Modules/MAction/DWF.hpp \ + Modules/MAction/Wilson.hpp \ + Modules/MContraction/Meson.hpp \ + Modules/MGauge/Load.hpp \ + Modules/MGauge/Random.hpp \ + Modules/MGauge/Unit.hpp \ Modules/MQuark.hpp \ - Modules/SolRBPrecCG.hpp \ - Modules/SrcPoint.hpp \ - Modules/SrcZ2.hpp + Modules/MSolver/RBPrecCG.hpp \ + Modules/MSource/Point.hpp \ + Modules/MSource/Z2.hpp diff --git a/tests/hadrons/Test_hadrons_mesons.cc b/tests/hadrons/Test_hadrons_mesons.cc index 9c062b39..b9561694 100644 --- a/tests/hadrons/Test_hadrons_mesons.cc +++ b/tests/hadrons/Test_hadrons_mesons.cc @@ -28,7 +28,6 @@ #include using namespace Grid; -using namespace QCD; using namespace Hadrons; int main(int argc, char *argv[]) @@ -56,30 +55,31 @@ int main(int argc, char *argv[]) globalPar.seed = "1 2 3 4"; application.setPar(globalPar); // gauge field - application.createModule("gauge"); + application.createModule("gauge"); // sources - SrcZ2::Par z2Par; + MSource::Z2::Par z2Par; z2Par.tA = 0; z2Par.tB = 0; - application.createModule("z2", z2Par); - SrcPoint::Par ptPar; + application.createModule("z2", z2Par); + MSource::Point::Par ptPar; ptPar.position = "0 0 0 0"; - application.createModule("pt", ptPar); + application.createModule("pt", ptPar); for (unsigned int i = 0; i < flavour.size(); ++i) { // actions - ADWF::Par actionPar; + MAction::DWF::Par actionPar; actionPar.gauge = "gauge"; actionPar.Ls = 12; actionPar.M5 = 1.8; actionPar.mass = mass[i]; - application.createModule("DWF_" + flavour[i], actionPar); + application.createModule("DWF_" + flavour[i], actionPar); // solvers - SolRBPrecCG::Par solverPar; + MSolver::RBPrecCG::Par solverPar; solverPar.action = "DWF_" + flavour[i]; solverPar.residual = 1.0e-8; - application.createModule("CG_" + flavour[i], solverPar); + application.createModule("CG_" + flavour[i], + solverPar); // propagators MQuark::Par quarkPar; @@ -90,13 +90,14 @@ int main(int argc, char *argv[]) for (unsigned int i = 0; i < flavour.size(); ++i) for (unsigned int j = i + 1; j < flavour.size(); ++j) { - CMeson::Par mesPar; + MContraction::Meson::Par mesPar; mesPar.output = "mesons/" + flavour[i] + flavour[j]; mesPar.q1 = "Q_" + flavour[i]; mesPar.q2 = "Q_" + flavour[j]; - application.createModule("meson_" + flavour[i] + flavour[j], - mesPar); + application.createModule("meson_" + + flavour[i] + flavour[j], + mesPar); } // execution From 320268fe93f40a17f31dc8c8b6674612eb41abfb Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 13:57:34 +0900 Subject: [PATCH 120/807] Hadrons: code cleaning --- extras/Hadrons/Modules/MAction/DWF.cc | 2 +- extras/Hadrons/Modules/MAction/Wilson.cc | 2 +- extras/Hadrons/Modules/MContraction/Meson.cc | 7 +++---- extras/Hadrons/Modules/MGauge/Load.cc | 2 +- extras/Hadrons/Modules/MGauge/Random.cc | 2 +- extras/Hadrons/Modules/MGauge/Unit.cc | 2 +- extras/Hadrons/Modules/MSolver/RBPrecCG.cc | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/extras/Hadrons/Modules/MAction/DWF.cc b/extras/Hadrons/Modules/MAction/DWF.cc index 626ac69b..36527b58 100644 --- a/extras/Hadrons/Modules/MAction/DWF.cc +++ b/extras/Hadrons/Modules/MAction/DWF.cc @@ -32,7 +32,7 @@ using namespace Hadrons; using namespace MAction; /****************************************************************************** -* DWF implementation * +* DWF implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// DWF::DWF(const std::string name) diff --git a/extras/Hadrons/Modules/MAction/Wilson.cc b/extras/Hadrons/Modules/MAction/Wilson.cc index a07669e2..3188a636 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.cc +++ b/extras/Hadrons/Modules/MAction/Wilson.cc @@ -32,7 +32,7 @@ using namespace Hadrons; using namespace MAction; /****************************************************************************** -* Wilson implementation * +* Wilson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Wilson::Wilson(const std::string name) diff --git a/extras/Hadrons/Modules/MContraction/Meson.cc b/extras/Hadrons/Modules/MContraction/Meson.cc index 1707f00d..fbdfceb1 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.cc +++ b/extras/Hadrons/Modules/MContraction/Meson.cc @@ -33,7 +33,7 @@ using namespace Hadrons; using namespace MContraction; /****************************************************************************** - * Meson implementation * + * Meson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Meson::Meson(const std::string name) @@ -63,13 +63,12 @@ void Meson::execute(void) << std::endl; XmlWriter writer(par().output); - PropagatorField &q1 = *env().getObject(par().q1); - PropagatorField &q2 = *env().getObject(par().q2); + PropagatorField &q1 = *env().getObject(par().q1); + PropagatorField &q2 = *env().getObject(par().q2); LatticeComplex c(env().getGrid()); SpinMatrix g[Ns*Ns], g5; std::vector buf; Result result; - unsigned int nt = env().getGrid()->GlobalDimensions()[Tp]; g5 = makeGammaProd(Ns*Ns - 1); result.corr.resize(Ns*Ns); diff --git a/extras/Hadrons/Modules/MGauge/Load.cc b/extras/Hadrons/Modules/MGauge/Load.cc index 276c08b2..1a6cec0a 100644 --- a/extras/Hadrons/Modules/MGauge/Load.cc +++ b/extras/Hadrons/Modules/MGauge/Load.cc @@ -32,7 +32,7 @@ using namespace Hadrons; using namespace MGauge; /****************************************************************************** -* Load implementation * +* Load implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Load::Load(const std::string name) diff --git a/extras/Hadrons/Modules/MGauge/Random.cc b/extras/Hadrons/Modules/MGauge/Random.cc index 587c5c25..6d5e0ec9 100644 --- a/extras/Hadrons/Modules/MGauge/Random.cc +++ b/extras/Hadrons/Modules/MGauge/Random.cc @@ -32,7 +32,7 @@ using namespace Hadrons; using namespace MGauge; /****************************************************************************** -* Random implementation * +* Random implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Random::Random(const std::string name) diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc index 232bd835..b9cfeac7 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.cc +++ b/extras/Hadrons/Modules/MGauge/Unit.cc @@ -32,7 +32,7 @@ using namespace Hadrons; using namespace MGauge; /****************************************************************************** -* Unit implementation * +* Unit implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// Unit::Unit(const std::string name) diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc index 2c3d9f67..9cdd05aa 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc @@ -33,7 +33,7 @@ using namespace Hadrons; using namespace MSolver; /****************************************************************************** -* RBPrecCG implementation * +* RBPrecCG implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// RBPrecCG::RBPrecCG(const std::string name) From 7a1ac4567924cfd9e08cc73d98318b6f67611974 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 14:00:10 +0900 Subject: [PATCH 121/807] Hadrons: configure.ac Linux typo --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 19e3f105..97491d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -387,7 +387,7 @@ AC_CONFIG_FILES(tests/solver/Makefile) AC_CONFIG_FILES(tests/qdpxx/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) AC_CONFIG_FILES(extras/Makefile) -AC_CONFIG_FILES(extras/hadrons/Makefile) +AC_CONFIG_FILES(extras/Hadrons/Makefile) AC_OUTPUT echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 7ae734103eac3b0a5d88d516dbe2cec566048de7 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 14:29:32 +0900 Subject: [PATCH 122/807] Hadrons: namespace macro to tackle GCC 5 bug --- extras/Hadrons/Global.hpp | 7 ++- extras/Hadrons/Modules/MAction/DWF.hpp | 55 +++++++++--------- extras/Hadrons/Modules/MAction/Wilson.hpp | 51 +++++++++-------- extras/Hadrons/Modules/MContraction/Meson.hpp | 57 ++++++++++--------- extras/Hadrons/Modules/MGauge/Load.hpp | 49 ++++++++-------- extras/Hadrons/Modules/MGauge/Random.hpp | 35 ++++++------ extras/Hadrons/Modules/MGauge/Unit.hpp | 35 ++++++------ extras/Hadrons/Modules/MSolver/RBPrecCG.hpp | 51 +++++++++-------- extras/Hadrons/Modules/MSource/Point.hpp | 49 ++++++++-------- extras/Hadrons/Modules/MSource/Z2.hpp | 51 +++++++++-------- .../templates/Module_in_NS.hpp.template | 49 ++++++++-------- 11 files changed, 252 insertions(+), 237 deletions(-) diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index 5f102328..1dc9164a 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -39,8 +39,13 @@ namespace Hadrons {\ using Grid::operator<<; #define END_HADRONS_NAMESPACE }} +#define BEGIN_MODULE_NAMESPACE(name)\ +namespace name {\ +using Grid::operator<<; +#define END_MODULE_NAMESPACE } + /* the 'using Grid::operator<<;' statement prevents a very nasty compilation - * error with GCC (clang compiles fine without it). + * error with GCC 5 (clang & GCC 6 compile fine without it). */ // FIXME: find a way to do that in a more general fashion diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index 15d3a0dc..246fafd4 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -37,34 +37,35 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Domain wall quark action * ******************************************************************************/ -namespace MAction +BEGIN_MODULE_NAMESPACE(MAction) + +class DWFPar: Serializable { - class DWFPar: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(DWFPar, - std::string, gauge, - unsigned int, Ls, - double , mass, - double , M5); - }; - - class DWF: public Module - { - public: - // constructor - DWF(const std::string name); - // destructor - virtual ~DWF(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(DWFPar, + std::string, gauge, + unsigned int, Ls, + double , mass, + double , M5); +}; + +class DWF: public Module +{ +public: + // constructor + DWF(const std::string name); + // destructor + virtual ~DWF(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(DWF, MAction); diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp index d6644ea4..d3965f09 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -37,32 +37,33 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Wilson quark action * ******************************************************************************/ -namespace MAction -{ - class WilsonPar: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(WilsonPar, - std::string, gauge, - double , mass); - }; +BEGIN_MODULE_NAMESPACE(MAction) - class Wilson: public Module - { - public: - // constructor - Wilson(const std::string name); - // destructor - virtual ~Wilson(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +class WilsonPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(WilsonPar, + std::string, gauge, + double , mass); +}; + +class Wilson: public Module +{ +public: + // constructor + Wilson(const std::string name); + // destructor + virtual ~Wilson(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Wilson, MAction); diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index a2cdf3db..713c8631 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -37,38 +37,39 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Meson * ******************************************************************************/ -namespace MContraction +BEGIN_MODULE_NAMESPACE(MContraction) + +class MesonPar: Serializable { - class MesonPar: Serializable +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(MesonPar, + std::string, q1, + std::string, q2, + std::string, output); +}; + +class Meson: public Module +{ +public: + class Result: Serializable { public: - GRID_SERIALIZABLE_CLASS_MEMBERS(MesonPar, - std::string, q1, - std::string, q2, - std::string, output); + GRID_SERIALIZABLE_CLASS_MEMBERS(Result, + std::vector>>, corr); }; - - class Meson: public Module - { - public: - class Result: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Result, - std::vector>>, corr); - }; - public: - // constructor - Meson(const std::string name); - // destructor - virtual ~Meson(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // execution - virtual void execute(void); - }; -} +public: + // constructor + Meson(const std::string name); + // destructor + virtual ~Meson(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Meson, MContraction); diff --git a/extras/Hadrons/Modules/MGauge/Load.hpp b/extras/Hadrons/Modules/MGauge/Load.hpp index 5cd98f0c..ff7cc128 100644 --- a/extras/Hadrons/Modules/MGauge/Load.hpp +++ b/extras/Hadrons/Modules/MGauge/Load.hpp @@ -37,31 +37,32 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Load a NERSC configuration * ******************************************************************************/ -namespace MGauge -{ - class LoadPar: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPar, - std::string, file); - }; +BEGIN_MODULE_NAMESPACE(MGauge) - class Load: public Module - { - public: - // constructor - Load(const std::string name); - // destructor - virtual ~Load(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +class LoadPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPar, + std::string, file); +}; + +class Load: public Module +{ +public: + // constructor + Load(const std::string name); + // destructor + virtual ~Load(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Load, MGauge); diff --git a/extras/Hadrons/Modules/MGauge/Random.hpp b/extras/Hadrons/Modules/MGauge/Random.hpp index 285357e3..afa03de8 100644 --- a/extras/Hadrons/Modules/MGauge/Random.hpp +++ b/extras/Hadrons/Modules/MGauge/Random.hpp @@ -37,24 +37,25 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Random gauge * ******************************************************************************/ -namespace MGauge +BEGIN_MODULE_NAMESPACE(MGauge) + +class Random: public Module { - class Random: public Module - { - public: - // constructor - Random(const std::string name); - // destructor - virtual ~Random(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +public: + // constructor + Random(const std::string name); + // destructor + virtual ~Random(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Random, MGauge); diff --git a/extras/Hadrons/Modules/MGauge/Unit.hpp b/extras/Hadrons/Modules/MGauge/Unit.hpp index 4fa03f54..da26dd37 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.hpp +++ b/extras/Hadrons/Modules/MGauge/Unit.hpp @@ -37,24 +37,25 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Unit gauge * ******************************************************************************/ -namespace MGauge +BEGIN_MODULE_NAMESPACE(MGauge) + +class Unit: public Module { - class Unit: public Module - { - public: - // constructor - Unit(const std::string name); - // destructor - virtual ~Unit(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +public: + // constructor + Unit(const std::string name); + // destructor + virtual ~Unit(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Unit, MGauge); diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index 3d36c4c7..14d8c169 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -37,32 +37,33 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Schur red-black preconditioned CG * ******************************************************************************/ -namespace MSolver +BEGIN_MODULE_NAMESPACE(MSolver) + +class RBPrecCGPar: Serializable { - class RBPrecCGPar: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar, - std::string, action, - double , residual); - }; - - class RBPrecCG: public Module - { - public: - // constructor - RBPrecCG(const std::string name); - // destructor - virtual ~RBPrecCG(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar, + std::string, action, + double , residual); +}; + +class RBPrecCG: public Module +{ +public: + // constructor + RBPrecCG(const std::string name); + // destructor + virtual ~RBPrecCG(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(RBPrecCG, MSolver); diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index 4bebdfe0..1245ed9a 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -48,31 +48,32 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Point * ******************************************************************************/ -namespace MSource +BEGIN_MODULE_NAMESPACE(MSource) + +class PointPar: Serializable { - class PointPar: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(PointPar, - std::string, position); - }; - - class Point: public Module - { - public: - // constructor - Point(const std::string name); - // destructor - virtual ~Point(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(PointPar, + std::string, position); +}; + +class Point: public Module +{ +public: + // constructor + Point(const std::string name); + // destructor + virtual ~Point(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Point, MSource); diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp index 0ff24b0c..ac569ced 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -49,32 +49,33 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * Z2 * ******************************************************************************/ -namespace MSource -{ - class Z2Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(Z2Par, - unsigned int, tA, - unsigned int, tB); - }; +BEGIN_MODULE_NAMESPACE(MSource) - class Z2: public Module - { - public: - // constructor - Z2(const std::string name); - // destructor - virtual ~Z2(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +class Z2Par: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Z2Par, + unsigned int, tA, + unsigned int, tB); +}; + +class Z2: public Module +{ +public: + // constructor + Z2(const std::string name); + // destructor + virtual ~Z2(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(Z2, MSource); diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template index bc43649b..490e5a78 100644 --- a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template @@ -10,31 +10,32 @@ BEGIN_HADRONS_NAMESPACE /****************************************************************************** * ___FILEBASENAME___ * ******************************************************************************/ -namespace ___NAMESPACE___ +BEGIN_MODULE_NAMESPACE(___NAMESPACE___) + +class ___FILEBASENAME___Par: Serializable { - class ___FILEBASENAME___Par: Serializable - { - public: - GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par, - unsigned int, i); - }; - - class ___FILEBASENAME___: public Module<___FILEBASENAME___Par> - { - public: - // constructor - ___FILEBASENAME___(const std::string name); - // destructor - virtual ~___FILEBASENAME___(void) = default; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); - }; -} +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par, + unsigned int, i); +}; + +class ___FILEBASENAME___: public Module<___FILEBASENAME___Par> +{ +public: + // constructor + ___FILEBASENAME___(const std::string name); + // destructor + virtual ~___FILEBASENAME___(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +END_MODULE_NAMESPACE MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___); From d1f7c6b94e732d7619c1e2862264e2dfe8884475 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 16:47:29 +0900 Subject: [PATCH 123/807] Hadrons: templatisation of the fermion implementation --- extras/Hadrons/Global.hpp | 17 +++- extras/Hadrons/Modules.hpp | 2 +- extras/Hadrons/Modules/MAction/DWF.cc | 82 ---------------- extras/Hadrons/Modules/MAction/DWF.hpp | 66 ++++++++++++- extras/Hadrons/Modules/MAction/Wilson.cc | 76 -------------- extras/Hadrons/Modules/MAction/Wilson.hpp | 64 +++++++++++- extras/Hadrons/Modules/MContraction/Meson.cc | 94 ------------------ extras/Hadrons/Modules/MContraction/Meson.hpp | 81 ++++++++++++++- extras/Hadrons/Modules/MQuark.hpp | 71 -------------- extras/Hadrons/Modules/MSolver/RBPrecCG.cc | 84 ---------------- extras/Hadrons/Modules/MSolver/RBPrecCG.hpp | 68 ++++++++++++- extras/Hadrons/Modules/MSource/Point.cc | 75 -------------- extras/Hadrons/Modules/MSource/Point.hpp | 63 +++++++++++- extras/Hadrons/Modules/MSource/Z2.cc | 88 ----------------- extras/Hadrons/Modules/MSource/Z2.hpp | 75 +++++++++++++- .../Hadrons/Modules/{MQuark.cc => Quark.hpp} | 98 ++++++++++++++----- extras/Hadrons/modules.inc | 13 +-- tests/hadrons/Test_hadrons_mesons.cc | 4 +- 18 files changed, 483 insertions(+), 638 deletions(-) delete mode 100644 extras/Hadrons/Modules/MAction/DWF.cc delete mode 100644 extras/Hadrons/Modules/MAction/Wilson.cc delete mode 100644 extras/Hadrons/Modules/MContraction/Meson.cc delete mode 100644 extras/Hadrons/Modules/MQuark.hpp delete mode 100644 extras/Hadrons/Modules/MSolver/RBPrecCG.cc delete mode 100644 extras/Hadrons/Modules/MSource/Point.cc delete mode 100644 extras/Hadrons/Modules/MSource/Z2.cc rename extras/Hadrons/Modules/{MQuark.cc => Quark.hpp} (58%) diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index 1dc9164a..3107ef12 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -56,10 +56,19 @@ using Grid::operator<<; BEGIN_HADRONS_NAMESPACE // type aliases -typedef FermionOperator FMat; -typedef FIMPL::FermionField FermionField; -typedef FIMPL::PropagatorField PropagatorField; -typedef std::function SolverFn; +//typedef FermionOperator FMat; +//typedef FIMPL::FermionField FermionField; +//typedef FIMPL::PropagatorField PropagatorField; +//typedef std::function SolverFn; + +#define TYPE_ALIASES(FImpl, suffix)\ +typedef FermionOperator FMat##suffix; \ +typedef typename FImpl::FermionField FermionField##suffix; \ +typedef typename FImpl::PropagatorField PropagatorField##suffix; \ +typedef typename FImpl::SitePropagator SitePropagator##suffix; \ +typedef typename FImpl::DoubledGaugeField DoubledGaugeField##suffix;\ +typedef std::function SolverFn##suffix; // logger class HadronsLogger: public Logger diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp index 998c609f..e90d0313 100644 --- a/extras/Hadrons/Modules.hpp +++ b/extras/Hadrons/Modules.hpp @@ -4,7 +4,7 @@ #include #include #include -#include #include #include #include +#include diff --git a/extras/Hadrons/Modules/MAction/DWF.cc b/extras/Hadrons/Modules/MAction/DWF.cc deleted file mode 100644 index 36527b58..00000000 --- a/extras/Hadrons/Modules/MAction/DWF.cc +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/DWF.cc - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MAction; - -/****************************************************************************** -* DWF implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -DWF::DWF(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector DWF::getInput(void) -{ - std::vector in = {par().gauge}; - - return in; -} - -std::vector DWF::getOutput(void) -{ - std::vector out = {getName()}; - - return out; -} - -// setup /////////////////////////////////////////////////////////////////////// -void DWF::setup(void) -{ - unsigned int size; - - size = 3*env().lattice4dSize(); - env().registerObject(getName(), size, par().Ls); -} - -// execution /////////////////////////////////////////////////////////////////// -void DWF::execute(void) -{ - LOG(Message) << "Setting up domain wall fermion matrix with m= " - << par().mass << ", M5= " << par().M5 << " and Ls= " - << par().Ls << " using gauge field '" << par().gauge << "'" - << std::endl; - env().createGrid(par().Ls); - auto &U = *env().getObject(par().gauge); - auto &g4 = *env().getGrid(); - auto &grb4 = *env().getRbGrid(); - auto &g5 = *env().getGrid(par().Ls); - auto &grb5 = *env().getRbGrid(par().Ls); - FMat *fMatPt = new DomainWallFermion(U, g5, grb5, g4, grb4, - par().mass, par().M5); - env().setObject(getName(), fMatPt); -} diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index 246fafd4..ceec975c 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -49,13 +49,16 @@ public: double , M5); }; -class DWF: public Module +template +class TDWF: public Module { +public: + TYPE_ALIASES(FImpl,); public: // constructor - DWF(const std::string name); + TDWF(const std::string name); // destructor - virtual ~DWF(void) = default; + virtual ~TDWF(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -65,6 +68,63 @@ public: virtual void execute(void); }; +/****************************************************************************** + * DWF template implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TDWF::TDWF(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TDWF::getInput(void) +{ + std::vector in = {par().gauge}; + + return in; +} + +template +std::vector TDWF::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void TDWF::setup(void) +{ + unsigned int size; + + size = 3*env().template lattice4dSize(); + env().registerObject(getName(), size, par().Ls); +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TDWF::execute(void) +{ + LOG(Message) << "Setting up domain wall fermion matrix with m= " + << par().mass << ", M5= " << par().M5 << " and Ls= " + << par().Ls << " using gauge field '" << par().gauge << "'" + << std::endl; + env().createGrid(par().Ls); + auto &U = *env().template getObject(par().gauge); + auto &g4 = *env().getGrid(); + auto &grb4 = *env().getRbGrid(); + auto &g5 = *env().getGrid(par().Ls); + auto &grb5 = *env().getRbGrid(par().Ls); + FMat *fMatPt = new DomainWallFermion(U, g5, grb5, g4, grb4, + par().mass, par().M5); + env().setObject(getName(), fMatPt); +} + +typedef TDWF DWF; + END_MODULE_NAMESPACE MODULE_REGISTER_NS(DWF, MAction); diff --git a/extras/Hadrons/Modules/MAction/Wilson.cc b/extras/Hadrons/Modules/MAction/Wilson.cc deleted file mode 100644 index 3188a636..00000000 --- a/extras/Hadrons/Modules/MAction/Wilson.cc +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/Wilson.cc - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MAction; - -/****************************************************************************** -* Wilson implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -Wilson::Wilson(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector Wilson::getInput(void) -{ - std::vector in = {par().gauge}; - - return in; -} - -std::vector Wilson::getOutput(void) -{ - std::vector out = {getName()}; - - return out; -} - -// setup /////////////////////////////////////////////////////////////////////// -void Wilson::setup(void) -{ - unsigned int size; - - size = 3*env().lattice4dSize(); - env().registerObject(getName(), size); -} - -// execution /////////////////////////////////////////////////////////////////// -void Wilson::execute() -{ - LOG(Message) << "Setting up Wilson fermion matrix with m= " << par().mass - << " using gauge field '" << par().gauge << "'" << std::endl; - auto &U = *env().getObject(par().gauge); - auto &grid = *env().getGrid(); - auto &gridRb = *env().getRbGrid(); - FMat *fMatPt = new WilsonFermion(U, grid, gridRb, par().mass); - env().setObject(getName(), fMatPt); -} diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp index d3965f09..6a4528ca 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Wilson.hpp +Source file: programs/Hadrons/TWilson.hpp Copyright (C) 2016 @@ -35,7 +35,7 @@ directory. BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * Wilson quark action * + * TWilson quark action * ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MAction) @@ -47,13 +47,16 @@ public: double , mass); }; -class Wilson: public Module +template +class TWilson: public Module { +public: + TYPE_ALIASES(FImpl,); public: // constructor - Wilson(const std::string name); + TWilson(const std::string name); // destructor - virtual ~Wilson(void) = default; + virtual ~TWilson(void) = default; // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -63,6 +66,57 @@ public: virtual void execute(void); }; +/****************************************************************************** + * TWilson template implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TWilson::TWilson(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TWilson::getInput(void) +{ + std::vector in = {par().gauge}; + + return in; +} + +template +std::vector TWilson::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void TWilson::setup(void) +{ + unsigned int size; + + size = 3*env().template lattice4dSize(); + env().registerObject(getName(), size); +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TWilson::execute() +{ + LOG(Message) << "Setting up TWilson fermion matrix with m= " << par().mass + << " using gauge field '" << par().gauge << "'" << std::endl; + auto &U = *env().template getObject(par().gauge); + auto &grid = *env().getGrid(); + auto &gridRb = *env().getRbGrid(); + FMat *fMatPt = new WilsonFermion(U, grid, gridRb, par().mass); + env().setObject(getName(), fMatPt); +} + +typedef TWilson Wilson; + END_MODULE_NAMESPACE MODULE_REGISTER_NS(Wilson, MAction); diff --git a/extras/Hadrons/Modules/MContraction/Meson.cc b/extras/Hadrons/Modules/MContraction/Meson.cc deleted file mode 100644 index fbdfceb1..00000000 --- a/extras/Hadrons/Modules/MContraction/Meson.cc +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/Meson.cc - -Copyright (C) 2015 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace QCD; -using namespace Hadrons; -using namespace MContraction; - -/****************************************************************************** - * Meson implementation * - ******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -Meson::Meson(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector Meson::getInput(void) -{ - std::vector input = {par().q1, par().q2}; - - return input; -} - -std::vector Meson::getOutput(void) -{ - std::vector output = {getName()}; - - return output; -} - -// execution /////////////////////////////////////////////////////////////////// -void Meson::execute(void) -{ - LOG(Message) << "Computing meson contraction '" << getName() << "' using" - << " quarks '" << par().q1 << "' and '" << par().q2 << "'" - << std::endl; - - XmlWriter writer(par().output); - PropagatorField &q1 = *env().getObject(par().q1); - PropagatorField &q2 = *env().getObject(par().q2); - LatticeComplex c(env().getGrid()); - SpinMatrix g[Ns*Ns], g5; - std::vector buf; - Result result; - - g5 = makeGammaProd(Ns*Ns - 1); - result.corr.resize(Ns*Ns); - for (unsigned int i = 0; i < Ns*Ns; ++i) - { - g[i] = makeGammaProd(i); - } - for (unsigned int iSink = 0; iSink < Ns*Ns; ++iSink) - { - result.corr[iSink].resize(Ns*Ns); - for (unsigned int iSrc = 0; iSrc < Ns*Ns; ++iSrc) - { - c = trace(g[iSink]*q1*g[iSrc]*g5*adj(q2)*g5); - sliceSum(c, buf, Tp); - result.corr[iSink][iSrc].resize(buf.size()); - for (unsigned int t = 0; t < buf.size(); ++t) - { - result.corr[iSink][iSrc][t] = TensorRemove(buf[t]); - } - } - } - write(writer, "meson", result); -} diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index 713c8631..fde05fca 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Meson.hpp +Source file: programs/Hadrons/TMeson.hpp Copyright (C) 2015 @@ -35,7 +35,7 @@ directory. BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * Meson * + * TMeson * ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MContraction) @@ -48,8 +48,12 @@ public: std::string, output); }; -class Meson: public Module +template +class TMeson: public Module { +public: + TYPE_ALIASES(FImpl1, 1); + TYPE_ALIASES(FImpl2, 2); public: class Result: Serializable { @@ -59,9 +63,9 @@ public: }; public: // constructor - Meson(const std::string name); + TMeson(const std::string name); // destructor - virtual ~Meson(void) = default; + virtual ~TMeson(void) = default; // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -69,6 +73,73 @@ public: virtual void execute(void); }; +/****************************************************************************** + * TMeson implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TMeson::TMeson(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TMeson::getInput(void) +{ + std::vector input = {par().q1, par().q2}; + + return input; +} + +template +std::vector TMeson::getOutput(void) +{ + std::vector output = {getName()}; + + return output; +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TMeson::execute(void) +{ + LOG(Message) << "Computing meson contraction '" << getName() << "' using" + << " quarks '" << par().q1 << "' and '" << par().q2 << "'" + << std::endl; + + XmlWriter writer(par().output); + PropagatorField1 &q1 = *env().template getObject(par().q1); + PropagatorField2 &q2 = *env().template getObject(par().q2); + LatticeComplex c(env().getGrid()); + SpinMatrix g[Ns*Ns], g5; + std::vector buf; + Result result; + + g5 = makeGammaProd(Ns*Ns - 1); + result.corr.resize(Ns*Ns); + for (unsigned int i = 0; i < Ns*Ns; ++i) + { + g[i] = makeGammaProd(i); + } + for (unsigned int iSink = 0; iSink < Ns*Ns; ++iSink) + { + result.corr[iSink].resize(Ns*Ns); + for (unsigned int iSrc = 0; iSrc < Ns*Ns; ++iSrc) + { + c = trace(g[iSink]*q1*g[iSrc]*g5*adj(q2)*g5); + sliceSum(c, buf, Tp); + result.corr[iSink][iSrc].resize(buf.size()); + for (unsigned int t = 0; t < buf.size(); ++t) + { + result.corr[iSink][iSrc][t] = TensorRemove(buf[t]); + } + } + } + write(writer, "meson", result); +} + +typedef TMeson Meson; + END_MODULE_NAMESPACE MODULE_REGISTER_NS(Meson, MContraction); diff --git a/extras/Hadrons/Modules/MQuark.hpp b/extras/Hadrons/Modules/MQuark.hpp deleted file mode 100644 index ed6dfb0c..00000000 --- a/extras/Hadrons/Modules/MQuark.hpp +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/MQuark.hpp - -Copyright (C) 2015 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#ifndef Hadrons_MQuark_hpp_ -#define Hadrons_MQuark_hpp_ - -#include -#include -#include - -BEGIN_HADRONS_NAMESPACE - -/****************************************************************************** - * MQuark * - ******************************************************************************/ -class MQuarkPar: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(MQuarkPar, - std::string, source, - std::string, solver); -}; - -class MQuark: public Module -{ -public: - // constructor - MQuark(const std::string name); - // destructor - virtual ~MQuark(void) = default; - // dependencies/products - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -private: - unsigned int Ls_; - SolverFn *solver_{nullptr}; -}; - -MODULE_REGISTER(MQuark); - -END_HADRONS_NAMESPACE - -#endif // Hadrons_MQuark_hpp_ diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc b/extras/Hadrons/Modules/MSolver/RBPrecCG.cc deleted file mode 100644 index 9cdd05aa..00000000 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/RBPrecCG.cc - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace QCD; -using namespace Hadrons; -using namespace MSolver; - -/****************************************************************************** -* RBPrecCG implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -RBPrecCG::RBPrecCG(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector RBPrecCG::getInput(void) -{ - std::vector in = {par().action}; - - return in; -} - -std::vector RBPrecCG::getOutput(void) -{ - std::vector out = {getName()}; - - return out; -} - -// setup /////////////////////////////////////////////////////////////////////// -void RBPrecCG::setup(void) -{ - auto Ls = env().getObjectLs(par().action); - - env().registerObject(getName(), 0, Ls); - env().addOwnership(getName(), par().action); -} - -// execution /////////////////////////////////////////////////////////////////// -void RBPrecCG::execute(void) -{ - auto &mat = *(env().getObject(par().action)); - auto solver = [&mat, this](LatticeFermion &sol, - const LatticeFermion &source) - { - ConjugateGradient cg(par().residual, 10000); - SchurRedBlackDiagMooeeSolve schurSolver(cg); - - schurSolver(mat, source, sol); - }; - - LOG(Message) << "setting up Schur red-black preconditioned CG for" - << " action '" << par().action << "' with residual " - << par().residual << std::endl; - env().setObject(getName(), new SolverFn(solver)); -} diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index 14d8c169..57ebb816 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/RBPrecCG.hpp +Source file: programs/Hadrons/TRBPrecCG.hpp Copyright (C) 2016 @@ -47,13 +47,16 @@ public: double , residual); }; -class RBPrecCG: public Module +template +class TRBPrecCG: public Module { +public: + TYPE_ALIASES(FImpl,); public: // constructor - RBPrecCG(const std::string name); + TRBPrecCG(const std::string name); // destructor - virtual ~RBPrecCG(void) = default; + virtual ~TRBPrecCG(void) = default; // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -63,6 +66,63 @@ public: virtual void execute(void); }; +/****************************************************************************** + * TRBPrecCG template implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TRBPrecCG::TRBPrecCG(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TRBPrecCG::getInput(void) +{ + std::vector in = {par().action}; + + return in; +} + +template +std::vector TRBPrecCG::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void TRBPrecCG::setup(void) +{ + auto Ls = env().getObjectLs(par().action); + + env().registerObject(getName(), 0, Ls); + env().addOwnership(getName(), par().action); +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TRBPrecCG::execute(void) +{ + auto &mat = *(env().template getObject(par().action)); + auto solver = [&mat, this](FermionField &sol, const FermionField &source) + { + ConjugateGradient cg(par().residual, 10000); + SchurRedBlackDiagMooeeSolve schurSolver(cg); + + schurSolver(mat, source, sol); + }; + + LOG(Message) << "setting up Schur red-black preconditioned CG for" + << " action '" << par().action << "' with residual " + << par().residual << std::endl; + env().setObject(getName(), new SolverFn(solver)); +} + +typedef TRBPrecCG RBPrecCG; + END_MODULE_NAMESPACE MODULE_REGISTER_NS(RBPrecCG, MSolver); diff --git a/extras/Hadrons/Modules/MSource/Point.cc b/extras/Hadrons/Modules/MSource/Point.cc deleted file mode 100644 index f22f41d9..00000000 --- a/extras/Hadrons/Modules/MSource/Point.cc +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/Point.cc - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MSource; - -/****************************************************************************** -* Point implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -Point::Point(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector Point::getInput(void) -{ - std::vector in; - - return in; -} - -std::vector Point::getOutput(void) -{ - std::vector out = {getName()}; - - return out; -} - -// setup /////////////////////////////////////////////////////////////////////// -void Point::setup(void) -{ - env().registerLattice(getName()); -} - -// execution /////////////////////////////////////////////////////////////////// -void Point::execute(void) -{ - std::vector position = strToVec(par().position); - SpinColourMatrix id; - - LOG(Message) << "Creating point source at position [" << par().position - << "]" << std::endl; - PropagatorField &src = *env().createLattice(getName()); - id = 1.; - src = zero; - pokeSite(id, src, position); -} diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index 1245ed9a..ad0a37b5 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Point.hpp +Source file: programs/Hadrons/TPoint.hpp Copyright (C) 2016 @@ -46,7 +46,7 @@ BEGIN_HADRONS_NAMESPACE */ /****************************************************************************** - * Point * + * TPoint * ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MSource) @@ -57,13 +57,16 @@ public: std::string, position); }; -class Point: public Module +template +class TPoint: public Module { +public: + TYPE_ALIASES(FImpl,); public: // constructor - Point(const std::string name); + TPoint(const std::string name); // destructor - virtual ~Point(void) = default; + virtual ~TPoint(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -73,6 +76,56 @@ public: virtual void execute(void); }; +/****************************************************************************** + * TPoint template implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TPoint::TPoint(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TPoint::getInput(void) +{ + std::vector in; + + return in; +} + +template +std::vector TPoint::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void TPoint::setup(void) +{ + env().template registerLattice(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TPoint::execute(void) +{ + std::vector position = strToVec(par().position); + typename SitePropagator::scalar_object id; + + LOG(Message) << "Creating point source at position [" << par().position + << "]" << std::endl; + PropagatorField &src = *env().template createLattice(getName()); + id = 1.; + src = zero; + pokeSite(id, src, position); +} + +typedef TPoint Point; + END_MODULE_NAMESPACE MODULE_REGISTER_NS(Point, MSource); diff --git a/extras/Hadrons/Modules/MSource/Z2.cc b/extras/Hadrons/Modules/MSource/Z2.cc deleted file mode 100644 index 90f9f274..00000000 --- a/extras/Hadrons/Modules/MSource/Z2.cc +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: programs/Hadrons/Z2.cc - -Copyright (C) 2016 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MSource; - -/****************************************************************************** -* Z2 implementation * -******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -Z2::Z2(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -std::vector Z2::getInput(void) -{ - std::vector in; - - return in; -} - -std::vector Z2::getOutput(void) -{ - std::vector out = {getName()}; - - return out; -} - -// setup /////////////////////////////////////////////////////////////////////// -void Z2::setup(void) -{ - env().registerLattice(getName()); -} - -// execution /////////////////////////////////////////////////////////////////// -void Z2::execute(void) -{ - Lattice> t(env().getGrid()); - LatticeComplex eta(env().getGrid()); - LatticeFermion phi(env().getGrid()); - Complex shift(1., 1.); - - if (par().tA == par().tB) - { - LOG(Message) << "Generating Z_2 wall source at t= " << par().tA - << std::endl; - } - else - { - LOG(Message) << "Generating Z_2 band for " << par().tA << " <= t <= " - << par().tB << std::endl; - } - PropagatorField &src = *env().createLattice(getName()); - LatticeCoordinate(t, Tp); - bernoulli(*env().get4dRng(), eta); - eta = (2.*eta - shift)*(1./::sqrt(2.)); - eta = where((t >= par().tA) and (t <= par().tB), eta, 0.*eta); - src = 1.; - src = src*eta; -} diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp index ac569ced..21d0b2bd 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Z2.hpp +Source file: programs/Hadrons/TZ2.hpp Copyright (C) 2016 @@ -47,7 +47,7 @@ BEGIN_HADRONS_NAMESPACE */ /****************************************************************************** - * Z2 * + * Z2 stochastic source * ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MSource) @@ -59,13 +59,16 @@ public: unsigned int, tB); }; -class Z2: public Module +template +class TZ2: public Module { +public: + TYPE_ALIASES(FImpl,); public: // constructor - Z2(const std::string name); + TZ2(const std::string name); // destructor - virtual ~Z2(void) = default; + virtual ~TZ2(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -75,6 +78,68 @@ public: virtual void execute(void); }; +/****************************************************************************** + * TZ2 template implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TZ2::TZ2(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TZ2::getInput(void) +{ + std::vector in; + + return in; +} + +template +std::vector TZ2::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void TZ2::setup(void) +{ + env().template registerLattice(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TZ2::execute(void) +{ + Lattice> t(env().getGrid()); + LatticeComplex eta(env().getGrid()); + Complex shift(1., 1.); + + if (par().tA == par().tB) + { + LOG(Message) << "Generating Z_2 wall source at t= " << par().tA + << std::endl; + } + else + { + LOG(Message) << "Generating Z_2 band for " << par().tA << " <= t <= " + << par().tB << std::endl; + } + PropagatorField &src = *env().template createLattice(getName()); + LatticeCoordinate(t, Tp); + bernoulli(*env().get4dRng(), eta); + eta = (2.*eta - shift)*(1./::sqrt(2.)); + eta = where((t >= par().tA) and (t <= par().tB), eta, 0.*eta); + src = 1.; + src = src*eta; +} + +typedef TZ2 Z2; + END_MODULE_NAMESPACE MODULE_REGISTER_NS(Z2, MSource); diff --git a/extras/Hadrons/Modules/MQuark.cc b/extras/Hadrons/Modules/Quark.hpp similarity index 58% rename from extras/Hadrons/Modules/MQuark.cc rename to extras/Hadrons/Modules/Quark.hpp index 07f25e1c..59274546 100644 --- a/extras/Hadrons/Modules/MQuark.cc +++ b/extras/Hadrons/Modules/Quark.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/MQuark.cc +Source file: programs/Hadrons/TQuark.hpp Copyright (C) 2015 @@ -25,29 +25,68 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ -#include +#ifndef Hadrons_Quark_hpp_ +#define Hadrons_Quark_hpp_ -using namespace Grid; -using namespace QCD; -using namespace Hadrons; +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE /****************************************************************************** - * MQuark implementation * + * TQuark * + ******************************************************************************/ +class QuarkPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(QuarkPar, + std::string, source, + std::string, solver); +}; + +template +class TQuark: public Module +{ +public: + TYPE_ALIASES(FImpl,); +public: + // constructor + TQuark(const std::string name); + // destructor + virtual ~TQuark(void) = default; + // dependencies/products + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +private: + unsigned int Ls_; + SolverFn *solver_{nullptr}; +}; + +/****************************************************************************** + * TQuark implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -MQuark::MQuark(const std::string name) +template +TQuark::TQuark(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector MQuark::getInput(void) +template +std::vector TQuark::getInput(void) { std::vector in = {par().source, par().solver}; return in; } -std::vector MQuark::getOutput(void) +template +std::vector TQuark::getOutput(void) { std::vector out = {getName(), getName() + "_5d"}; @@ -55,40 +94,42 @@ std::vector MQuark::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void MQuark::setup(void) +template +void TQuark::setup(void) { Ls_ = env().getObjectLs(par().solver); - env().registerLattice(getName()); + env().template registerLattice(getName()); if (Ls_ > 1) { - env().registerLattice(getName() + "_5d", Ls_); + env().template registerLattice(getName() + "_5d", Ls_); } } // execution /////////////////////////////////////////////////////////////////// -void MQuark::execute(void) +template +void TQuark::execute(void) { - LatticeFermion source(env().getGrid(Ls_)), sol(env().getGrid(Ls_)), - tmp(env().getGrid()); - std::string propName = (Ls_ == 1) ? getName() : (getName() + "_5d"); - LOG(Message) << "Computing quark propagator '" << getName() << "'" << std::endl; - LatticePropagator &prop = *env().createLattice(propName); - LatticePropagator &fullSrc = *env().getObject(par().source); - SolverFn &solver = *env().getObject(par().solver); + + FermionField source(env().getGrid(Ls_)), sol(env().getGrid(Ls_)), + tmp(env().getGrid()); + std::string propName = (Ls_ == 1) ? getName() : (getName() + "_5d"); + PropagatorField &prop = *env().template createLattice(propName); + PropagatorField &fullSrc = *env().template getObject(par().source); + SolverFn &solver = *env().template getObject(par().solver); if (Ls_ > 1) { - env().createLattice(getName()); + env().template createLattice(getName()); } - + LOG(Message) << "Inverting using solver '" << par().solver << "' on source '" << par().source << "'" << std::endl; for (unsigned int s = 0; s < Ns; ++s) for (unsigned int c = 0; c < Nc; ++c) { LOG(Message) << "Inversion for spin= " << s << ", color= " << c - << std::endl; + << std::endl; // source conversion for 4D sources if (!env().isObject5d(par().source)) { @@ -124,7 +165,8 @@ void MQuark::execute(void) // create 4D propagators from 5D one if necessary if (Ls_ > 1) { - LatticePropagator &p4d = *env().getObject(getName()); + PropagatorField &p4d = + *env().template getObject(getName()); axpby_ssp_pminus(sol, 0., sol, 1., sol, 0, 0); axpby_ssp_pplus(sol, 0., sol, 1., sol, 0, Ls_-1); @@ -133,3 +175,11 @@ void MQuark::execute(void) } } } + +typedef TQuark Quark; + +MODULE_REGISTER(Quark); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Quark_hpp_ diff --git a/extras/Hadrons/modules.inc b/extras/Hadrons/modules.inc index a460ae86..aacbbf14 100644 --- a/extras/Hadrons/modules.inc +++ b/extras/Hadrons/modules.inc @@ -1,14 +1,7 @@ modules_cc =\ - Modules/MAction/DWF.cc \ - Modules/MAction/Wilson.cc \ - Modules/MContraction/Meson.cc \ Modules/MGauge/Load.cc \ Modules/MGauge/Random.cc \ - Modules/MGauge/Unit.cc \ - Modules/MQuark.cc \ - Modules/MSolver/RBPrecCG.cc \ - Modules/MSource/Point.cc \ - Modules/MSource/Z2.cc + Modules/MGauge/Unit.cc modules_hpp =\ Modules/MAction/DWF.hpp \ @@ -17,8 +10,8 @@ modules_hpp =\ Modules/MGauge/Load.hpp \ Modules/MGauge/Random.hpp \ Modules/MGauge/Unit.hpp \ - Modules/MQuark.hpp \ Modules/MSolver/RBPrecCG.hpp \ Modules/MSource/Point.hpp \ - Modules/MSource/Z2.hpp + Modules/MSource/Z2.hpp \ + Modules/Quark.hpp diff --git a/tests/hadrons/Test_hadrons_mesons.cc b/tests/hadrons/Test_hadrons_mesons.cc index b9561694..75d752b2 100644 --- a/tests/hadrons/Test_hadrons_mesons.cc +++ b/tests/hadrons/Test_hadrons_mesons.cc @@ -82,10 +82,10 @@ int main(int argc, char *argv[]) solverPar); // propagators - MQuark::Par quarkPar; + Quark::Par quarkPar; quarkPar.solver = "CG_" + flavour[i]; quarkPar.source = (flavour[i][0] == 'c') ? "z2" : "pt"; - application.createModule("Q_" + flavour[i], quarkPar); + application.createModule("Q_" + flavour[i], quarkPar); } for (unsigned int i = 0; i < flavour.size(); ++i) for (unsigned int j = i + 1; j < flavour.size(); ++j) From d292657ef74bb217edff4ab4581f205443eb27e6 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 17:26:17 +0900 Subject: [PATCH 124/807] Hadrons: more module templates --- .../Modules/templates/Module_tmp.hpp.template | 83 ++++++++++++++++++ .../templates/Module_tmp_in_NS.hpp.template | 87 +++++++++++++++++++ extras/Hadrons/add_module_template.sh | 28 ++++++ 3 files changed, 198 insertions(+) create mode 100644 extras/Hadrons/Modules/templates/Module_tmp.hpp.template create mode 100644 extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template create mode 100755 extras/Hadrons/add_module_template.sh diff --git a/extras/Hadrons/Modules/templates/Module_tmp.hpp.template b/extras/Hadrons/Modules/templates/Module_tmp.hpp.template new file mode 100644 index 00000000..53bee52b --- /dev/null +++ b/extras/Hadrons/Modules/templates/Module_tmp.hpp.template @@ -0,0 +1,83 @@ +#ifndef Hadrons____FILEBASENAME____hpp_ +#define Hadrons____FILEBASENAME____hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * ___FILEBASENAME___ * + ******************************************************************************/ +class ___FILEBASENAME___Par: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par, + unsigned int, i); +}; + +template +class T___FILEBASENAME___: public Module<___FILEBASENAME___Par> +{ +public: + // constructor + T___FILEBASENAME___(const std::string name); + // destructor + virtual ~T___FILEBASENAME___(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +typedef T___FILEBASENAME___ ___FILEBASENAME___; + +/****************************************************************************** + * T___FILEBASENAME___ implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +T___FILEBASENAME___::T___FILEBASENAME___(const std::string name) +: Module<___FILEBASENAME___Par>(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector T___FILEBASENAME___::getInput(void) +{ + std::vector in; + + return in; +} + +template +std::vector T___FILEBASENAME___::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void T___FILEBASENAME___::setup(void) +{ + +} + +// execution /////////////////////////////////////////////////////////////////// +template +void T___FILEBASENAME___::execute(void) +{ + +} + +MODULE_REGISTER(___FILEBASENAME___); + +END_HADRONS_NAMESPACE + +#endif // Hadrons____FILEBASENAME____hpp_ diff --git a/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template b/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template new file mode 100644 index 00000000..e7ff8ace --- /dev/null +++ b/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template @@ -0,0 +1,87 @@ +#ifndef Hadrons____FILEBASENAME____hpp_ +#define Hadrons____FILEBASENAME____hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * ___FILEBASENAME___ * + ******************************************************************************/ +BEGIN_MODULE_NAMESPACE(___NAMESPACE___) + +class ___FILEBASENAME___Par: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par, + unsigned int, i); +}; + +template +class T___FILEBASENAME___: public Module<___FILEBASENAME___Par> +{ +public: + // constructor + T___FILEBASENAME___(const std::string name); + // destructor + virtual ~T___FILEBASENAME___(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +typedef T___FILEBASENAME___ ___FILEBASENAME___; + +/****************************************************************************** + * T___FILEBASENAME___ implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +T___FILEBASENAME___::T___FILEBASENAME___(const std::string name) +: Module<___FILEBASENAME___Par>(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector T___FILEBASENAME___::getInput(void) +{ + std::vector in; + + return in; +} + +template +std::vector T___FILEBASENAME___::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void T___FILEBASENAME___::setup(void) +{ + +} + +// execution /////////////////////////////////////////////////////////////////// +template +void T___FILEBASENAME___::execute(void) +{ + +} + +END_MODULE_NAMESPACE + +MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___); + +END_HADRONS_NAMESPACE + +#endif // Hadrons____FILEBASENAME____hpp_ diff --git a/extras/Hadrons/add_module_template.sh b/extras/Hadrons/add_module_template.sh new file mode 100755 index 00000000..0069fcea --- /dev/null +++ b/extras/Hadrons/add_module_template.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +if (( $# != 1 && $# != 2)); then + echo "usage: `basename $0` []" 1>&2 + exit 1 +fi +NAME=$1 +NS=$2 + +if (( $# == 1 )); then + if [ -e "Modules/${NAME}.cc" ] || [ -e "Modules/${NAME}.hpp" ]; then + echo "error: files Modules/${NAME}.* already exists" 1>&2 + exit 1 + fi + sed "s/___FILEBASENAME___/${NAME}/g" Modules/templates/Module_tmp.hpp.template > Modules/${NAME}.hpp +elif (( $# == 2 )); then + mkdir -p Modules/${NS} + if [ -e "Modules/${NS}/${NAME}.cc" ] || [ -e "Modules/${NS}/${NAME}.hpp" ]; then + echo "error: files Modules/${NS}/${NAME}.* already exists" 1>&2 + exit 1 + fi + TMPCC=".${NS}.${NAME}.tmp.cc" + TMPHPP=".${NS}.${NAME}.tmp.hpp" + sed "s/___FILEBASENAME___/${NAME}/g" Modules/templates/Module_tmp_in_NS.hpp.template > ${TMPHPP} + sed "s/___NAMESPACE___/${NS}/g" ${TMPHPP} > Modules/${NS}/${NAME}.hpp + rm -f ${TMPCC} ${TMPHPP} +fi +./make_module_list.sh From d42a1b73c483e6f9a0464d701ca90ff9ac52483e Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 17:26:36 +0900 Subject: [PATCH 125/807] Hadrons: code cleaning --- extras/Hadrons/Application.cc | 2 -- extras/Hadrons/Modules/MContraction/Meson.hpp | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 21f84ad1..63fb3673 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -117,8 +117,6 @@ void Application::parseParameterFile(void) } while (reader.nextElement("module")); pop(reader); pop(reader); - env_.setSeed(strToVec(par_.seed)); - env_.printContent(); } // schedule computation //////////////////////////////////////////////////////// diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index fde05fca..517b509d 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -54,7 +54,6 @@ class TMeson: public Module public: TYPE_ALIASES(FImpl1, 1); TYPE_ALIASES(FImpl2, 2); -public: class Result: Serializable { public: @@ -103,9 +102,9 @@ std::vector TMeson::getOutput(void) template void TMeson::execute(void) { - LOG(Message) << "Computing meson contraction '" << getName() << "' using" - << " quarks '" << par().q1 << "' and '" << par().q2 << "'" - << std::endl; + LOG(Message) << "Computing meson contractions '" << getName() << "' using" + << " quarks '" << par().q1 << "' and '" << par().q2 << "'" + << std::endl; XmlWriter writer(par().output); PropagatorField1 &q1 = *env().template getObject(par().q1); From aa016f61b968b5cfabddc694ace3ee77967738b3 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 17:26:57 +0900 Subject: [PATCH 126/807] Hadrons: empty baryon contractions --- extras/Hadrons/Modules.hpp | 1 + .../Hadrons/Modules/MContraction/Baryon.hpp | 104 ++++++++++++++++++ extras/Hadrons/modules.inc | 1 + tests/hadrons/Test_hadrons_mesons.cc | 17 ++- 4 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 extras/Hadrons/Modules/MContraction/Baryon.hpp diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp index e90d0313..b08a7468 100644 --- a/extras/Hadrons/Modules.hpp +++ b/extras/Hadrons/Modules.hpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include diff --git a/extras/Hadrons/Modules/MContraction/Baryon.hpp b/extras/Hadrons/Modules/MContraction/Baryon.hpp new file mode 100644 index 00000000..e8191793 --- /dev/null +++ b/extras/Hadrons/Modules/MContraction/Baryon.hpp @@ -0,0 +1,104 @@ +#ifndef Hadrons_Baryon_hpp_ +#define Hadrons_Baryon_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * Baryon * + ******************************************************************************/ +BEGIN_MODULE_NAMESPACE(MContraction) + +class BaryonPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(BaryonPar, + std::string, q1, + std::string, q2, + std::string, q3, + std::string, output); +}; + +template +class TBaryon: public Module +{ +public: + TYPE_ALIASES(FImpl1, 1); + TYPE_ALIASES(FImpl2, 2); + TYPE_ALIASES(FImpl3, 3); + class Result: Serializable + { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(Result, + std::vector>>, corr); + }; +public: + // constructor + TBaryon(const std::string name); + // destructor + virtual ~TBaryon(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // execution + virtual void execute(void); +}; + +typedef TBaryon Baryon; + +/****************************************************************************** + * TBaryon implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TBaryon::TBaryon(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TBaryon::getInput(void) +{ + std::vector input = {par().q1, par().q2, par().q3}; + + return input; +} + +template +std::vector TBaryon::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TBaryon::execute(void) +{ + LOG(Message) << "Computing baryon contractions '" << getName() << "' using" + << " quarks '" << par().q1 << "', '" << par().q2 << "', and '" + << par().q3 << "'" << std::endl; + + XmlWriter writer(par().output); + PropagatorField1 &q1 = *env().template getObject(par().q1); + PropagatorField2 &q2 = *env().template getObject(par().q2); + PropagatorField3 &q3 = *env().template getObject(par().q2); + LatticeComplex c(env().getGrid()); + Result result; + + // FIXME: do contractions + + write(writer, "meson", result); +} + +END_MODULE_NAMESPACE + +MODULE_REGISTER_NS(Baryon, MContraction); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_Baryon_hpp_ diff --git a/extras/Hadrons/modules.inc b/extras/Hadrons/modules.inc index aacbbf14..aad6c73b 100644 --- a/extras/Hadrons/modules.inc +++ b/extras/Hadrons/modules.inc @@ -6,6 +6,7 @@ modules_cc =\ modules_hpp =\ Modules/MAction/DWF.hpp \ Modules/MAction/Wilson.hpp \ + Modules/MContraction/Baryon.hpp \ Modules/MContraction/Meson.hpp \ Modules/MGauge/Load.hpp \ Modules/MGauge/Random.hpp \ diff --git a/tests/hadrons/Test_hadrons_mesons.cc b/tests/hadrons/Test_hadrons_mesons.cc index 75d752b2..620e6ba8 100644 --- a/tests/hadrons/Test_hadrons_mesons.cc +++ b/tests/hadrons/Test_hadrons_mesons.cc @@ -87,8 +87,8 @@ int main(int argc, char *argv[]) quarkPar.source = (flavour[i][0] == 'c') ? "z2" : "pt"; application.createModule("Q_" + flavour[i], quarkPar); } - for (unsigned int i = 0; i < flavour.size(); ++i) - for (unsigned int j = i + 1; j < flavour.size(); ++j) + for (unsigned int i = 0; i < flavour.size(); ++i) + for (unsigned int j = i; j < flavour.size(); ++j) { MContraction::Meson::Par mesPar; @@ -99,6 +99,19 @@ int main(int argc, char *argv[]) + flavour[i] + flavour[j], mesPar); } + for (unsigned int i = 0; i < flavour.size(); ++i) + for (unsigned int j = i; j < flavour.size(); ++j) + for (unsigned int k = j; k < flavour.size(); ++k) + { + MContraction::Baryon::Par barPar; + + barPar.output = "baryons/" + flavour[i] + flavour[j] + flavour[k]; + barPar.q1 = "Q_" + flavour[i]; + barPar.q2 = "Q_" + flavour[j]; + barPar.q3 = "Q_" + flavour[k]; + application.createModule( + "baryon_" + flavour[i] + flavour[j] + flavour[k], barPar); + } // execution application.run(); From e6effcfd950b80b671c5a456caece44a4fa78832 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 5 Dec 2016 17:41:58 +0900 Subject: [PATCH 127/807] Hadrons: more contractions in the spectrum test --- tests/hadrons/Test_hadrons_mesons.cc | 30 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/tests/hadrons/Test_hadrons_mesons.cc b/tests/hadrons/Test_hadrons_mesons.cc index 620e6ba8..baf1cd38 100644 --- a/tests/hadrons/Test_hadrons_mesons.cc +++ b/tests/hadrons/Test_hadrons_mesons.cc @@ -84,18 +84,26 @@ int main(int argc, char *argv[]) // propagators Quark::Par quarkPar; quarkPar.solver = "CG_" + flavour[i]; - quarkPar.source = (flavour[i][0] == 'c') ? "z2" : "pt"; - application.createModule("Q_" + flavour[i], quarkPar); + quarkPar.source = "pt"; + application.createModule("Qpt_" + flavour[i], quarkPar); + quarkPar.source = "z2"; + application.createModule("QZ2_" + flavour[i], quarkPar); } for (unsigned int i = 0; i < flavour.size(); ++i) for (unsigned int j = i; j < flavour.size(); ++j) { MContraction::Meson::Par mesPar; - mesPar.output = "mesons/" + flavour[i] + flavour[j]; - mesPar.q1 = "Q_" + flavour[i]; - mesPar.q2 = "Q_" + flavour[j]; - application.createModule("meson_" + mesPar.output = "mesons/pt_" + flavour[i] + flavour[j]; + mesPar.q1 = "Qpt_" + flavour[i]; + mesPar.q2 = "Qpt_" + flavour[j]; + application.createModule("meson_pt_" + + flavour[i] + flavour[j], + mesPar); + mesPar.output = "mesons/Z2_" + flavour[i] + flavour[j]; + mesPar.q1 = "QZ2_" + flavour[i]; + mesPar.q2 = "QZ2_" + flavour[j]; + application.createModule("meson_Z2_" + flavour[i] + flavour[j], mesPar); } @@ -105,12 +113,12 @@ int main(int argc, char *argv[]) { MContraction::Baryon::Par barPar; - barPar.output = "baryons/" + flavour[i] + flavour[j] + flavour[k]; - barPar.q1 = "Q_" + flavour[i]; - barPar.q2 = "Q_" + flavour[j]; - barPar.q3 = "Q_" + flavour[k]; + barPar.output = "baryons/pt_" + flavour[i] + flavour[j] + flavour[k]; + barPar.q1 = "Qpt_" + flavour[i]; + barPar.q2 = "Qpt_" + flavour[j]; + barPar.q3 = "Qpt_" + flavour[k]; application.createModule( - "baryon_" + flavour[i] + flavour[j] + flavour[k], barPar); + "baryon_pt_" + flavour[i] + flavour[j] + flavour[k], barPar); } // execution From a683a0f55aa945b23af844e9cfeb28309d25fb0b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 6 Dec 2016 12:11:44 +0900 Subject: [PATCH 128/807] Hadrons: meson tests renamed spectrum --- .../{Test_hadrons_mesons.cc => Test_hadrons_spectrum.cc} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tests/hadrons/{Test_hadrons_mesons.cc => Test_hadrons_spectrum.cc} (98%) diff --git a/tests/hadrons/Test_hadrons_mesons.cc b/tests/hadrons/Test_hadrons_spectrum.cc similarity index 98% rename from tests/hadrons/Test_hadrons_mesons.cc rename to tests/hadrons/Test_hadrons_spectrum.cc index baf1cd38..93d31fed 100644 --- a/tests/hadrons/Test_hadrons_mesons.cc +++ b/tests/hadrons/Test_hadrons_spectrum.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid - Source file: programs/Hadrons/Hadrons.cc + Source file: tests/hadrons/Test_hadrons_spectrum.cc Copyright (C) 2015 From 646b11f5c246c4a09ad80f5901e9a21028afe933 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 6 Dec 2016 12:12:05 +0900 Subject: [PATCH 129/807] Hadrons: exposing scheduler settings --- extras/Hadrons/Application.cc | 9 +++++---- extras/Hadrons/Application.hpp | 13 +++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 63fb3673..1b0c37f8 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -76,6 +76,7 @@ Application::Application(const std::string parameterFileName) void Application::setPar(const Application::GlobalPar &par) { par_ = par; + LOG(Message) << par_.seed << std::endl; env_.setSeed(strToVec(par_.seed)); } @@ -144,15 +145,14 @@ void Application::schedule(void) // constrained topological sort using a genetic algorithm LOG(Message) << "Scheduling computation..." << std::endl; - constexpr unsigned int maxGen = 200, maxCstGen = 50; unsigned int k = 0, gen, prevPeak, nCstPeak = 0; auto graph = env_.makeModuleGraph(); auto con = graph.getConnectedComponents(); std::random_device rd; GeneticScheduler::Parameters par; - par.popSize = 10; - par.mutationRate = .1; + par.popSize = par_.genetic.popSize; + par.mutationRate = par_.genetic.mutationRate; par.seed = rd(); CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed)); for (unsigned int i = 0; i < con.size(); ++i) @@ -182,7 +182,8 @@ void Application::schedule(void) << MEM_MSG(scheduler.getMinValue()) << std::endl; } gen++; - } while ((gen < maxGen) and (nCstPeak < maxCstGen)); + } while ((gen < par_.genetic.maxGen) + and (nCstPeak < par_.genetic.maxCstGen)); auto &t = scheduler.getMinSchedule(); LOG(Message) << "Program " << i + 1 << " (memory peak: " << MEM_MSG(scheduler.getMinValue()) << "):" << std::endl; diff --git a/extras/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp index b0c88030..846b4dfa 100644 --- a/extras/Hadrons/Application.hpp +++ b/extras/Hadrons/Application.hpp @@ -49,11 +49,24 @@ public: unsigned int, end, unsigned int, step); }; + class GeneticPar: Serializable + { + public: + GeneticPar(void): + popSize{20}, maxGen{1000}, maxCstGen{100}, mutationRate{.1} {}; + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(GeneticPar, + unsigned int, popSize, + unsigned int, maxGen, + unsigned int, maxCstGen, + double , mutationRate); + }; class GlobalPar: Serializable { public: GRID_SERIALIZABLE_CLASS_MEMBERS(GlobalPar, TrajRange, trajCounter, + GeneticPar, genetic, std::string, seed); }; public: From bd1d1cca34e097e1ddced6f2106e0acfa58868a7 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 6 Dec 2016 12:12:59 +0900 Subject: [PATCH 130/807] Hadrons: code cleaning --- extras/Hadrons/Modules/MContraction/Meson.hpp | 2 +- extras/Hadrons/Modules/MSource/Point.hpp | 4 ++-- extras/Hadrons/Modules/MSource/Z2.hpp | 4 +++- tests/hadrons/Test_hadrons_xmldriven.cc | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index 517b509d..b2625b3e 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -73,7 +73,7 @@ public: }; /****************************************************************************** - * TMeson implementation * + * TMeson implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// template diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index ad0a37b5..456de76c 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -38,9 +38,9 @@ BEGIN_HADRONS_NAMESPACE Point source ------------ - * src_x = delta_x,o + * src_x = delta_x,position - * options: o + * options: - position: space-separated integer sequence (e.g. "0 1 1 0") */ diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp index 21d0b2bd..76fefc8f 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -38,7 +38,9 @@ BEGIN_HADRONS_NAMESPACE Z_2 stochastic source ----------------------------- - * src_x = eta_x * theta(x_3 - ta) * theta(tb - x_3) + * src_x = eta_x * theta(x_3 - tA) * theta(tB - x_3) + + the eta_x are independent uniform random numbers in {+/- 1 +/- i} * options: - tA: begin timeslice (integer) diff --git a/tests/hadrons/Test_hadrons_xmldriven.cc b/tests/hadrons/Test_hadrons_xmldriven.cc index ad43b6cc..feb547e9 100644 --- a/tests/hadrons/Test_hadrons_xmldriven.cc +++ b/tests/hadrons/Test_hadrons_xmldriven.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Hadrons.cc +Source file: tests/hadrons/Test_hadrons_xmldriven.cc Copyright (C) 2015 From 5b3edf08a405e80ebc9554532050720b767f891b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 6 Dec 2016 12:13:19 +0900 Subject: [PATCH 131/807] Hadrons: sequential gamma source --- extras/Hadrons/Modules.hpp | 1 + extras/Hadrons/Modules/MSource/SeqGamma.hpp | 137 ++++++++++++++++ extras/Hadrons/modules.inc | 1 + tests/hadrons/Test_hadrons_meson_3pt.cc | 171 ++++++++++++++++++++ 4 files changed, 310 insertions(+) create mode 100644 extras/Hadrons/Modules/MSource/SeqGamma.hpp create mode 100644 tests/hadrons/Test_hadrons_meson_3pt.cc diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp index b08a7468..72807d8b 100644 --- a/extras/Hadrons/Modules.hpp +++ b/extras/Hadrons/Modules.hpp @@ -7,5 +7,6 @@ #include #include #include +#include #include #include diff --git a/extras/Hadrons/Modules/MSource/SeqGamma.hpp b/extras/Hadrons/Modules/MSource/SeqGamma.hpp new file mode 100644 index 00000000..e3dad26a --- /dev/null +++ b/extras/Hadrons/Modules/MSource/SeqGamma.hpp @@ -0,0 +1,137 @@ +#ifndef Hadrons_SeqGamma_hpp_ +#define Hadrons_SeqGamma_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/* + + Sequential source + ----------------------------- + * src_x = q_x * theta(x_3 - tA) * theta(tB - x_3) * gamma * exp(i x.mom) + + * options: + - q: input propagator (string) + - tA: begin timeslice (integer) + - tB: end timesilce (integer) + - gamma: gamma product to insert (integer) + - mom: momentum insertion, space-separated float sequence (e.g ".1 .2 1. 0.") + + */ + +/****************************************************************************** + * SeqGamma * + ******************************************************************************/ +BEGIN_MODULE_NAMESPACE(MSource) + +class SeqGammaPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(SeqGammaPar, + std::string, q, + unsigned int, tA, + unsigned int, tB, + unsigned int, gamma, + std::string, mom); +}; + +template +class TSeqGamma: public Module +{ +public: + TYPE_ALIASES(FImpl,); +public: + // constructor + TSeqGamma(const std::string name); + // destructor + virtual ~TSeqGamma(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +typedef TSeqGamma SeqGamma; + +/****************************************************************************** + * TSeqGamma implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +template +TSeqGamma::TSeqGamma(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +template +std::vector TSeqGamma::getInput(void) +{ + std::vector in = {par().q}; + + return in; +} + +template +std::vector TSeqGamma::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +template +void TSeqGamma::setup(void) +{ + env().template registerLattice(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +template +void TSeqGamma::execute(void) +{ + if (par().tA == par().tB) + { + LOG(Message) << "Generating gamma_" << par().gamma + << " sequential source at t= " << par().tA << std::endl; + } + else + { + LOG(Message) << "Generating gamma_" << par().gamma + << " sequential source for " + << par().tA << " <= t <= " << par().tB << std::endl; + } + PropagatorField &src = *env().template createLattice(getName()); + PropagatorField &q = *env().template getObject(par().q); + Lattice> t(env().getGrid()); + LatticeComplex ph(env().getGrid()), coor(env().getGrid()); + SpinMatrix g; + std::vector p; + Complex i(0.0,1.0); + + g = makeGammaProd(par().gamma); + p = strToVec(par().mom); + ph = zero; + for(unsigned int mu = 0; mu < Nd; mu++) + { + LatticeCoordinate(coor, mu); + ph = ph + p[mu]*coor; + } + ph = exp(i*ph); + LatticeCoordinate(t, Tp); + src = where((t >= par().tA) and (t <= par().tB), g*ph*q, 0.*q); +} + +END_MODULE_NAMESPACE + +MODULE_REGISTER_NS(SeqGamma, MSource); + +END_HADRONS_NAMESPACE + +#endif // Hadrons_SeqGamma_hpp_ diff --git a/extras/Hadrons/modules.inc b/extras/Hadrons/modules.inc index aad6c73b..4251ffa3 100644 --- a/extras/Hadrons/modules.inc +++ b/extras/Hadrons/modules.inc @@ -13,6 +13,7 @@ modules_hpp =\ Modules/MGauge/Unit.hpp \ Modules/MSolver/RBPrecCG.hpp \ Modules/MSource/Point.hpp \ + Modules/MSource/SeqGamma.hpp \ Modules/MSource/Z2.hpp \ Modules/Quark.hpp diff --git a/tests/hadrons/Test_hadrons_meson_3pt.cc b/tests/hadrons/Test_hadrons_meson_3pt.cc new file mode 100644 index 00000000..159981d0 --- /dev/null +++ b/tests/hadrons/Test_hadrons_meson_3pt.cc @@ -0,0 +1,171 @@ +/******************************************************************************* + Grid physics library, www.github.com/paboyle/Grid + + Source file: tests/hadrons/Test_hadrons_meson_3pt.cc + + Copyright (C) 2015 + + Author: Antonin Portelli + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution + directory. + *******************************************************************************/ + +#include + +using namespace Grid; +using namespace Hadrons; + +int main(int argc, char *argv[]) +{ + // initialization ////////////////////////////////////////////////////////// + Grid_init(&argc, &argv); + HadronsLogError.Active(GridLogError.isActive()); + HadronsLogWarning.Active(GridLogWarning.isActive()); + HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogIterative.Active(GridLogIterative.isActive()); + HadronsLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << std::endl; + + // run setup /////////////////////////////////////////////////////////////// + Application application; + + std::vector flavour = {"l", "s", "c1", "c2", "c3"}; + std::vector mass = {.01, .04, .2 , .25 , .3 }; + unsigned int nt = GridDefaultLatt()[Tp]; + + // global parameters + Application::GlobalPar globalPar; + globalPar.trajCounter.start = 1500; + globalPar.trajCounter.end = 1520; + globalPar.trajCounter.step = 20; + globalPar.seed = "1 2 3 4"; + globalPar.genetic.maxGen = 5000; + globalPar.genetic.maxCstGen = 100; + globalPar.genetic.popSize = 50; + globalPar.genetic.mutationRate = .25; + application.setPar(globalPar); + + // gauge field + application.createModule("gauge"); + for (unsigned int i = 0; i < flavour.size(); ++i) + { + // actions + MAction::DWF::Par actionPar; + actionPar.gauge = "gauge"; + actionPar.Ls = 12; + actionPar.M5 = 1.8; + actionPar.mass = mass[i]; + application.createModule("DWF_" + flavour[i], actionPar); + + // solvers + MSolver::RBPrecCG::Par solverPar; + solverPar.action = "DWF_" + flavour[i]; + solverPar.residual = 1.0e-8; + application.createModule("CG_" + flavour[i], + solverPar); + } + for (unsigned int t = 0; t < nt; t += 8) + { + std::string srcName; + std::vector qName; + std::vector> seqName; + + // Z2 source + MSource::Z2::Par z2Par; + z2Par.tA = t; + z2Par.tB = t; + srcName = "z2_" + std::to_string(t); + application.createModule(srcName, z2Par); + for (unsigned int i = 0; i < flavour.size(); ++i) + { + // sequential sources + MSource::SeqGamma::Par seqPar; + qName.push_back("QZ2_" + flavour[i] + srcName); + seqPar.q = qName[i]; + seqPar.tA = (t + nt/4) % nt; + seqPar.tB = (t + nt/4) % nt; + seqPar.mom = "1. 0. 0. 0."; + seqName.push_back(std::vector(Nd)); + for (unsigned int mu = 0; mu < Nd; ++mu) + { + seqPar.gamma = 0x1 << mu; + seqName[i][mu] = "G" + std::to_string(seqPar.gamma) + + "_" + std::to_string(seqPar.tA) + "-" + + qName[i]; + application.createModule(seqName[i][mu], seqPar); + } + + // propagators + Quark::Par quarkPar; + quarkPar.solver = "CG_" + flavour[i]; + quarkPar.source = srcName; + application.createModule(qName[i], quarkPar); + for (unsigned int mu = 0; mu < Nd; ++mu) + { + quarkPar.source = seqName[i][mu]; + seqName[i][mu] = qName[i] + "-" + seqName[i][mu]; + application.createModule(seqName[i][mu], quarkPar); + } + } + + // contractions + MContraction::Meson::Par mesPar; + for (unsigned int i = 0; i < flavour.size(); ++i) + for (unsigned int j = i; j < flavour.size(); ++j) + { + mesPar.output = "mesons/Z2_" + flavour[i] + flavour[j]; + mesPar.q1 = qName[i]; + mesPar.q2 = qName[j]; + application.createModule("meson_Z2_" + + std::to_string(t) + + "_" + + flavour[i] + + flavour[j], + mesPar); + } + for (unsigned int i = 0; i < flavour.size(); ++i) + for (unsigned int j = 0; j < flavour.size(); ++j) + for (unsigned int mu = 0; mu < Nd; ++mu) + { + MContraction::Meson::Par mesPar; + + mesPar.output = "3pt/Z2_" + flavour[i] + flavour[j] + "_" + + std::to_string(mu); + mesPar.q1 = qName[i]; + mesPar.q2 = seqName[j][mu]; + application.createModule("3pt_Z2_" + + std::to_string(t) + + "_" + + flavour[i] + + flavour[j] + + "_" + + std::to_string(mu), + mesPar); + } + } + + Environment::getInstance().printContent(); + // execution + application.run(); + + // epilogue + LOG(Message) << "Grid is finalizing now" << std::endl; + Grid_finalize(); + + return EXIT_SUCCESS; +} From b812d5e39c57d14f3cc4c769ed1f72cf90691cb4 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 6 Dec 2016 16:31:13 +0000 Subject: [PATCH 132/807] Added single threaded version of the derivative for the Ls vectorised DWF --- lib/cartesian/Cartesian_base.h | 48 +++-- lib/lattice/Lattice_rng.h | 75 +++++--- lib/qcd/action/fermion/FermionOperatorImpl.h | 168 +++++++++++------- lib/qcd/action/fermion/WilsonFermion5D.cc | 31 ++-- .../EvenOddSchurDifferentiable.h | 22 ++- .../pseudofermion/TwoFlavourEvenOddRatio.h | 4 +- lib/qcd/hmc/integrators/Integrator.h | 1 + lib/simd/Grid_vector_types.h | 13 ++ lib/tensors/Tensor_class.h | 48 +++++ tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 30 +++- .../hmc/Test_hmc_WilsonFermionGauge_Binary.cc | 2 + 11 files changed, 307 insertions(+), 135 deletions(-) diff --git a/lib/cartesian/Cartesian_base.h b/lib/cartesian/Cartesian_base.h index 72b21ee3..334914e9 100644 --- a/lib/cartesian/Cartesian_base.h +++ b/lib/cartesian/Cartesian_base.h @@ -99,7 +99,7 @@ public: virtual int oIndex(std::vector &coor) { int idx=0; - // Works with either global or local coordinates + // Works with either global or local coordinates for(int d=0;d<_ndimension;d++) idx+=_ostride[d]*(coor[d]%_rdimensions[d]); return idx; } @@ -146,15 +146,15 @@ public: // Distance should be either 0,1,2.. // if ( _simd_layout[dimension] > 2 ) { - for(int d=0;d<_ndimension;d++){ - if ( d != dimension ) assert ( (_simd_layout[d]==1) ); - } - permute_type = RotateBit; // How to specify distance; this is not just direction. - return permute_type; + for(int d=0;d<_ndimension;d++){ + if ( d != dimension ) assert ( (_simd_layout[d]==1) ); + } + permute_type = RotateBit; // How to specify distance; this is not just direction. + return permute_type; } for(int d=_ndimension-1;d>dimension;d--){ - if (_simd_layout[d]>1 ) permute_type++; + if (_simd_layout[d]>1 ) permute_type++; } return permute_type; } @@ -174,6 +174,22 @@ public: inline const std::vector &LocalDimensions(void) { return _ldimensions;}; inline const std::vector &VirtualLocalDimensions(void) { return _ldimensions;}; + //////////////////////////////////////////////////////////////// + // Print decomposition + //////////////////////////////////////////////////////////////// + + void show_decomposition(){ + std::cout << GridLogMessage << "Full Dimensions : " << _fdimensions << std::endl; + std::cout << GridLogMessage << "Global Dimensions : " << _gdimensions << std::endl; + std::cout << GridLogMessage << "Local Dimensions : " << _ldimensions << std::endl; + std::cout << GridLogMessage << "Reduced Dimensions : " << _rdimensions << std::endl; + std::cout << GridLogMessage << "iSites : " << _isites << std::endl; + std::cout << GridLogMessage << "oSites : " << _osites << std::endl; + std::cout << GridLogMessage << "lSites : " << lSites() << std::endl; + std::cout << GridLogMessage << "gSites : " << gSites() << std::endl; + std::cout << GridLogMessage << "Nd : " << _ndimension << std::endl; + } + //////////////////////////////////////////////////////////////// // Global addressing //////////////////////////////////////////////////////////////// @@ -187,8 +203,8 @@ public: gidx=0; int mult=1; for(int mu=0;mu<_ndimension;mu++) { - gidx+=mult*gcoor[mu]; - mult*=_gdimensions[mu]; + gidx+=mult*gcoor[mu]; + mult*=_gdimensions[mu]; } } void GlobalCoorToProcessorCoorLocalCoor(std::vector &pcoor,std::vector &lcoor,const std::vector &gcoor) @@ -196,9 +212,9 @@ public: pcoor.resize(_ndimension); lcoor.resize(_ndimension); for(int mu=0;mu<_ndimension;mu++){ - int _fld = _fdimensions[mu]/_processors[mu]; - pcoor[mu] = gcoor[mu]/_fld; - lcoor[mu] = gcoor[mu]%_fld; + int _fld = _fdimensions[mu]/_processors[mu]; + pcoor[mu] = gcoor[mu]/_fld; + lcoor[mu] = gcoor[mu]%_fld; } } void GlobalCoorToRankIndex(int &rank, int &o_idx, int &i_idx ,const std::vector &gcoor) @@ -210,9 +226,9 @@ public: std::vector cblcoor(lcoor); for(int d=0;dCheckerBoarded(d) ) { - cblcoor[d] = lcoor[d]/2; - } + if( this->CheckerBoarded(d) ) { + cblcoor[d] = lcoor[d]/2; + } } i_idx= iIndex(cblcoor);// this does not imply divide by 2 on checker dim @@ -238,7 +254,7 @@ public: { RankIndexToGlobalCoor(rank,o_idx,i_idx ,fcoor); if(CheckerBoarded(0)){ - fcoor[0] = fcoor[0]*2+cb; + fcoor[0] = fcoor[0]*2+cb; } } void ProcessorCoorLocalCoorToGlobalCoor(std::vector &Pcoor,std::vector &Lcoor,std::vector &gcoor) diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index cd73b462..c5607ed8 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -6,8 +6,8 @@ Copyright (C) 2015 -Author: Peter Boyle -Author: paboyle + Author: Peter Boyle + Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -67,24 +67,42 @@ namespace Grid { return multiplicity; } + + + inline int RNGfillable_general(GridBase *coarse,GridBase *fine) + { + int rngdims = coarse->_ndimension; + + // trivially extended in higher dims, with locality guaranteeing RNG state is local to node + int lowerdims = fine->_ndimension - coarse->_ndimension; assert(lowerdims >= 0); + // assumes that the higher dimensions are not using more processors + // all further divisions are local + for(int d=0;d_processors[d]==1); + for(int d=0;d_processors[d] == fine->_processors[d+lowerdims]); + + + // then divide the number of local sites + // check that the total number of sims agree, meanse the iSites are the same + assert(fine->Nsimd() == coarse->Nsimd()); + + // check that the two grids divide cleanly + assert( (fine->lSites() / coarse->lSites() ) * coarse->lSites() == fine->lSites() ); + + return fine->lSites() / coarse->lSites(); + } + // Wrap seed_seq to give common interface with random_device class fixedSeed { public: - typedef std::seed_seq::result_type result_type; - std::seed_seq src; fixedSeed(const std::vector &seeds) : src(seeds.begin(),seeds.end()) {}; result_type operator () (void){ - std::vector list(1); - src.generate(list.begin(),list.end()); - return list[0]; - } }; @@ -252,24 +270,30 @@ namespace Grid { }; class GridParallelRNG : public GridRNGbase { + + double _time_counter; + public: GridBase *_grid; - int _vol; + unsigned int _vol; int generator_idx(int os,int is){ return is*_grid->oSites()+os; } GridParallelRNG(GridBase *grid) : GridRNGbase() { - _grid=grid; - _vol =_grid->iSites()*_grid->oSites(); + _grid = grid; + _vol =_grid->iSites()*_grid->oSites(); _generators.resize(_vol); _uniform.resize(_vol,std::uniform_real_distribution{0,1}); _gaussian.resize(_vol,std::normal_distribution(0.0,1.0) ); _bernoulli.resize(_vol,std::discrete_distribution{1,1}); - _seeded=0; + _seeded = 0; + + _time_counter = 0.0; + } @@ -325,37 +349,36 @@ namespace Grid { typedef typename vobj::scalar_type scalar_type; typedef typename vobj::vector_type vector_type; - int multiplicity = RNGfillable(_grid, l._grid); + double inner_time_counter = usecond(); - int Nsimd = _grid->Nsimd(); - int osites = _grid->oSites(); + int multiplicity = RNGfillable_general(_grid, l._grid); // l has finer or same grid + + int Nsimd = _grid->Nsimd();// guaranteed to be the same for l._grid too + int osites = _grid->oSites();// guaranteed to be <= l._grid->oSites() by a factor multiplicity int words = sizeof(scalar_object) / sizeof(scalar_type); PARALLEL_FOR_LOOP for (int ss = 0; ss < osites; ss++) { std::vector buf(Nsimd); - for (int m = 0; m < multiplicity; - m++) { // Draw from same generator multiplicity times + for (int m = 0; m < multiplicity; m++) { // Draw from same generator multiplicity times - int sm = multiplicity * ss + - m; // Maps the generator site to the fine site + int sm = multiplicity * ss + m; // Maps the generator site to the fine site for (int si = 0; si < Nsimd; si++) { int gdx = generator_idx(ss, si); // index of generator state scalar_type *pointer = (scalar_type *)&buf[si]; dist[gdx].reset(); - for (int idx = 0; idx < words; idx++) { - + for (int idx = 0; idx < words; idx++) fillScalar(pointer[idx], dist[gdx], _generators[gdx]); - } } - // merge into SIMD lanes merge(l._odata[sm], buf); } } + + _time_counter += usecond()- inner_time_counter; }; void SeedRandomDevice(void) { @@ -366,6 +389,12 @@ namespace Grid { fixedSeed src(seeds); Seed(src); } + + void Report(){ + std::cout << GridLogMessage << "Time spent in the fill() routine by GridParallelRNG: "<< _time_counter/1e3 << " ms" << std::endl; + } + + }; template inline void random(GridParallelRNG &rng,Lattice &l){ diff --git a/lib/qcd/action/fermion/FermionOperatorImpl.h b/lib/qcd/action/fermion/FermionOperatorImpl.h index 0800dea6..be4f629f 100644 --- a/lib/qcd/action/fermion/FermionOperatorImpl.h +++ b/lib/qcd/action/fermion/FermionOperatorImpl.h @@ -44,14 +44,14 @@ namespace QCD { // Ultimately need Impl to always define types where XXX is opaque // // typedef typename XXX Simd; - // typedef typename XXX GaugeLinkField; + // typedef typename XXX GaugeLinkField; // typedef typename XXX GaugeField; // typedef typename XXX GaugeActField; // typedef typename XXX FermionField; // typedef typename XXX DoubledGaugeField; // typedef typename XXX SiteSpinor; - // typedef typename XXX SiteHalfSpinor; - // typedef typename XXX Compressor; + // typedef typename XXX SiteHalfSpinor; + // typedef typename XXX Compressor; // // and Methods: // void ImportGauge(GridBase *GaugeGrid,DoubledGaugeField &Uds,const GaugeField &Umu) @@ -94,17 +94,17 @@ namespace QCD { //////////////////////////////////////////////////////////////////////// #define INHERIT_FIMPL_TYPES(Impl)\ - typedef typename Impl::FermionField FermionField; \ - typedef typename Impl::DoubledGaugeField DoubledGaugeField; \ - typedef typename Impl::SiteSpinor SiteSpinor; \ - typedef typename Impl::SiteHalfSpinor SiteHalfSpinor; \ - typedef typename Impl::Compressor Compressor; \ - typedef typename Impl::StencilImpl StencilImpl; \ - typedef typename Impl::ImplParams ImplParams; \ + typedef typename Impl::FermionField FermionField; \ + typedef typename Impl::DoubledGaugeField DoubledGaugeField; \ + typedef typename Impl::SiteSpinor SiteSpinor; \ + typedef typename Impl::SiteHalfSpinor SiteHalfSpinor; \ + typedef typename Impl::Compressor Compressor; \ + typedef typename Impl::StencilImpl StencilImpl; \ + typedef typename Impl::ImplParams ImplParams; \ typedef typename Impl::Coeff_t Coeff_t; #define INHERIT_IMPL_TYPES(Base) \ - INHERIT_GIMPL_TYPES(Base) \ + INHERIT_GIMPL_TYPES(Base) \ INHERIT_FIMPL_TYPES(Base) ///////////////////////////////////////////////////////////////////////////// @@ -148,11 +148,11 @@ namespace QCD { bool overlapCommsCompute(void) { return Params.overlapCommsCompute; }; inline void multLink(SiteHalfSpinor &phi, - const SiteDoubledGaugeField &U, - const SiteHalfSpinor &chi, - int mu, - StencilEntry *SE, - StencilImpl &St) { + const SiteDoubledGaugeField &U, + const SiteHalfSpinor &chi, + int mu, + StencilEntry *SE, + StencilImpl &St) { mult(&phi(), &U(mu), &chi()); } @@ -162,16 +162,16 @@ namespace QCD { } inline void DoubleStore(GridBase *GaugeGrid, - DoubledGaugeField &Uds, - const GaugeField &Umu) { + DoubledGaugeField &Uds, + const GaugeField &Umu) { conformable(Uds._grid, GaugeGrid); conformable(Umu._grid, GaugeGrid); GaugeLinkField U(GaugeGrid); for (int mu = 0; mu < Nd; mu++) { - U = PeekIndex(Umu, mu); - PokeIndex(Uds, U, mu); - U = adj(Cshift(U, mu, -1)); - PokeIndex(Uds, U, mu + 4); + U = PeekIndex(Umu, mu); + PokeIndex(Uds, U, mu); + U = adj(Cshift(U, mu, -1)); + PokeIndex(Uds, U, mu + 4); } } @@ -189,11 +189,11 @@ namespace QCD { PARALLEL_FOR_LOOP for(int sss=0;sssoSites();sss++){ - int sU=sss; - for(int s=0;s(outerProduct(Btilde[sF],Atilde[sF])); // ordering here - } + int sU=sss; + for(int s=0;s(outerProduct(Btilde[sF],Atilde[sF])); // ordering here + } } PokeIndex(mat,tmp,mu); @@ -248,12 +248,12 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres } inline void multLink(SiteHalfSpinor &phi, const SiteDoubledGaugeField &U, - const SiteHalfSpinor &chi, int mu, StencilEntry *SE, - StencilImpl &St) { + const SiteHalfSpinor &chi, int mu, StencilEntry *SE, + StencilImpl &St) { SiteGaugeLink UU; for (int i = 0; i < Nrepresentation; i++) { for (int j = 0; j < Nrepresentation; j++) { - vsplat(UU()()(i, j), U(mu)()(i, j)); + vsplat(UU()()(i, j), U(mu)()(i, j)); } } mult(&phi(), &UU(), &chi()); @@ -290,10 +290,40 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres { assert(0); } - - inline void InsertForce5D(GaugeField &mat, FermionField &Btilde,FermionField Ã, int mu) - { - assert(0); + + inline void InsertForce5D(GaugeField &mat, FermionField &Btilde, FermionField Ã, int mu) { + int LLs = Btilde._grid->_rdimensions[0]; + conformable(Atilde._grid,Btilde._grid); + GaugeLinkField tmp(mat._grid); + tmp = zero; + typedef decltype(traceIndex(outerProduct(Btilde[0], Atilde[0]))) result_type; + std::vector v_scalar_object(Btilde._grid->Nsimd()); + + PARALLEL_FOR_LOOP + for (int sss = 0; sss < tmp._grid->oSites(); sss++) { + std::vector ocoor; + tmp._grid->oCoorFromOindex(ocoor,sss); + for (int si = 0; si < tmp._grid->iSites(); si++){ + typename result_type::scalar_object scalar_object; + scalar_object = zero; + std::vector local_coor(tmp._grid->Nd()); + std::vector icoor; + tmp._grid->iCoorFromIindex(icoor,si); + for (int i = 0; i < tmp._grid->Nd(); i++) local_coor[i] = ocoor[i] + tmp._grid->_rdimensions[i]*icoor[i]; + + for (int s = 0; s < LLs; s++) { + std::vector slocal_coor(Btilde._grid->Nd()); + slocal_coor[0] = s; + for (int s4d = 1; s4d< Btilde._grid->Nd(); s4d++) slocal_coor[s4d] = local_coor[s4d-1]; + int sF = Btilde._grid->oIndexReduced(slocal_coor); + assert(sF < Btilde._grid->oSites()); + extract(traceIndex(outerProduct(Btilde[sF], Atilde[sF])), v_scalar_object); + for (int sv = 0; sv < v_scalar_object.size(); sv++) scalar_object += v_scalar_object[sv]; // sum across the 5d dimension + } + tmp._odata[sss].putlane(scalar_object, si); + } + } + PokeIndex(mat, tmp, mu); } }; @@ -339,19 +369,19 @@ class GparityWilsonImpl : public ConjugateGaugeImplNsimd(); - + int direction = St._directions[mu]; int distance = St._distances[mu]; int ptype = St._permute_type[mu]; @@ -359,13 +389,13 @@ class GparityWilsonImpl : public ConjugateGaugeImpl icoor; - + if ( SE->_around_the_world && Params.twists[mmu] ) { if ( sl == 2 ) { @@ -375,25 +405,25 @@ class GparityWilsonImpl : public ConjugateGaugeImpliCoorFromIindex(icoor,s); - - assert((icoor[direction]==0)||(icoor[direction]==1)); - - int permute_lane; - if ( distance == 1) { - permute_lane = icoor[direction]?1:0; - } else { - permute_lane = icoor[direction]?0:1; - } - - if ( permute_lane ) { - stmp(0) = vals[s](1); - stmp(1) = vals[s](0); - vals[s] = stmp; - } + grid->iCoorFromIindex(icoor,s); + + assert((icoor[direction]==0)||(icoor[direction]==1)); + + int permute_lane; + if ( distance == 1) { + permute_lane = icoor[direction]?1:0; + } else { + permute_lane = icoor[direction]?0:1; + } + + if ( permute_lane ) { + stmp(0) = vals[s](1); + stmp(1) = vals[s](0); + vals[s] = stmp; + } } merge(vtmp,vals); - + } else { vtmp(0) = chi(1); vtmp(1) = chi(0); @@ -418,11 +448,11 @@ class GparityWilsonImpl : public ConjugateGaugeImpl > coor(GaugeGrid); - + for(int mu=0;mu(Umu,mu); Uconj = conjugate(U); @@ -431,13 +461,13 @@ class GparityWilsonImpl : public ConjugateGaugeImpl_fdimensions[0]; - + GaugeLinkField tmp(mat._grid); tmp = zero; PARALLEL_FOR_LOOP diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/lib/qcd/action/fermion/WilsonFermion5D.cc index d2ac96e3..8b8d1e2d 100644 --- a/lib/qcd/action/fermion/WilsonFermion5D.cc +++ b/lib/qcd/action/fermion/WilsonFermion5D.cc @@ -271,11 +271,14 @@ void WilsonFermion5D::DhopDir(const FermionField &in, FermionField &out,in assert(dirdisp<=7); assert(dirdisp>=0); + int LLs = out._grid->_rdimensions[0]; + PARALLEL_FOR_LOOP for(int ss=0;ssoSites();ss++){ - for(int s=0;soSites()); Kernels::DiracOptDhopDir(Stencil,Umu,Stencil.CommBuf(),sF,sU,in,out,dirdisp,gamma); } } @@ -305,6 +308,8 @@ void WilsonFermion5D::DerivInternal(StencilImpl & st, DerivCommTime+=usecond(); Atilde=A; + int LLs = B._grid->_rdimensions[0]; + DerivComputeTime-=usecond(); for (int mu = 0; mu < Nd; mu++) { @@ -321,20 +326,18 @@ void WilsonFermion5D::DerivInternal(StencilImpl & st, DerivDhopComputeTime -= usecond(); PARALLEL_FOR_LOOP for (int sss = 0; sss < U._grid->oSites(); sss++) { - for (int s = 0; s < Ls; s++) { - int sU = sss; - int sF = s + Ls * sU; - + int sU = sss; + for (int s = 0; s < LLs; s++) { + int sF = s + LLs * sU; assert(sF < B._grid->oSites()); assert(sU < U._grid->oSites()); Kernels::DiracOptDhopDir(st, U, st.CommBuf(), sF, sU, B, Btilde, mu, gamma); - - //////////////////////////// - // spin trace outer product - //////////////////////////// } } + //////////////////////////// + // spin trace outer product + //////////////////////////// DerivDhopComputeTime += usecond(); Impl::InsertForce5D(mat, Btilde, Atilde, mu); } @@ -349,7 +352,7 @@ void WilsonFermion5D::DhopDeriv(GaugeField &mat, { conformable(A._grid,FermionGrid()); conformable(A._grid,B._grid); - conformable(GaugeGrid(),mat._grid); + //conformable(GaugeGrid(),mat._grid); mat.checkerboard = A.checkerboard; @@ -363,7 +366,7 @@ void WilsonFermion5D::DhopDerivEO(GaugeField &mat, int dag) { conformable(A._grid,FermionRedBlackGrid()); - conformable(GaugeRedBlackGrid(),mat._grid); + //conformable(GaugeRedBlackGrid(),mat._grid); conformable(A._grid,B._grid); assert(B.checkerboard==Odd); @@ -381,7 +384,7 @@ void WilsonFermion5D::DhopDerivOE(GaugeField &mat, int dag) { conformable(A._grid,FermionRedBlackGrid()); - conformable(GaugeRedBlackGrid(),mat._grid); + //conformable(GaugeRedBlackGrid(),mat._grid); conformable(A._grid,B._grid); assert(B.checkerboard==Even); diff --git a/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h b/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h index 6837bb19..6965fea9 100644 --- a/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h +++ b/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h @@ -68,8 +68,14 @@ namespace Grid{ assert(U.checkerboard==Odd); assert(V.checkerboard==U.checkerboard); - GaugeField ForceO(ucbgrid); - GaugeField ForceE(ucbgrid); + // NOTE Guido: WE DO NOT WANT TO USE THIS GRID FOR THE FORCE + // INHERIT FROM THE Force field + //GaugeField ForceO(ucbgrid); + //GaugeField ForceE(ucbgrid); + GridRedBlackCartesian* forcecb = new GridRedBlackCartesian(Force._grid); + GaugeField ForceO(forcecb); + GaugeField ForceE(forcecb); + // X^dag Der_oe MeeInv Meo Y // Use Mooee as nontrivial but gauge field indept @@ -110,8 +116,14 @@ namespace Grid{ assert(V.checkerboard==Odd); assert(V.checkerboard==V.checkerboard); - GaugeField ForceO(ucbgrid); - GaugeField ForceE(ucbgrid); + // NOTE Guido: WE DO NOT WANT TO USE THIS GRID FOR THE FORCE + // INHERIT FROM THE Force field + + //GaugeField ForceO(ucbgrid); + //GaugeField ForceE(ucbgrid); + GridRedBlackCartesian* forcecb = new GridRedBlackCartesian(Force._grid); + GaugeField ForceO(forcecb); + GaugeField ForceE(forcecb); // X^dag Der_oe MeeInv Meo Y // Use Mooee as nontrivial but gauge field indept @@ -130,6 +142,8 @@ namespace Grid{ setCheckerboard(Force,ForceE); setCheckerboard(Force,ForceO); Force=-Force; + + } }; diff --git a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h b/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h index a8bd9fe7..d7a26695 100644 --- a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h +++ b/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h @@ -166,7 +166,9 @@ namespace Grid{ FermionField X(NumOp.FermionRedBlackGrid()); FermionField Y(NumOp.FermionRedBlackGrid()); - GaugeField force(NumOp.GaugeGrid()); + //GaugeField force(NumOp.GaugeGrid()); + GaugeField force(dSdU._grid); + conformable(force._grid, dSdU._grid); //Y=Vdag phi //X = (Mdag M)^-1 V^dag phi diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index 6f1e5c45..bc076085 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -114,6 +114,7 @@ class Integrator { // Fundamental updates, include smearing for (int a = 0; a < as[level].actions.size(); ++a) { Field force(U._grid); + conformable(U._grid, Mom._grid); Field& Us = Smearer.get_U(as[level].actions.at(a)->is_smeared); as[level].actions.at(a)->deriv(Us, force); // deriv should NOT include Ta diff --git a/lib/simd/Grid_vector_types.h b/lib/simd/Grid_vector_types.h index 42f28b34..fc217cc5 100644 --- a/lib/simd/Grid_vector_types.h +++ b/lib/simd/Grid_vector_types.h @@ -386,6 +386,19 @@ class Grid_simd { } } + /////////////////////////////// + // Getting single lanes + /////////////////////////////// + inline Scalar_type getlane(int lane) { + return ((Scalar_type*)&v)[lane]; + } + + inline void putlane(const Scalar_type &S, int lane){ + ((Scalar_type*)&v)[lane] = S; + } + + + }; // end of Grid_simd class definition diff --git a/lib/tensors/Tensor_class.h b/lib/tensors/Tensor_class.h index 916fc09c..cdd57792 100644 --- a/lib/tensors/Tensor_class.h +++ b/lib/tensors/Tensor_class.h @@ -88,6 +88,21 @@ class iScalar { zeroit(*this); return *this; } + + + // managing the internal vector structure + strong_inline scalar_object getlane(int lane){ + scalar_object ret; + ret._internal = _internal.getlane(lane); + return ret; + } + + strong_inline void putlane(scalar_object &s, int lane){ + _internal.putlane(s._internal,lane); + } + + + friend strong_inline void vstream(iScalar &out, const iScalar &in) { vstream(out._internal, in._internal); @@ -226,6 +241,20 @@ class iVector { zeroit(*this); return *this; } + + strong_inline scalar_object getlane(int lane){ + scalar_object ret; + for (int i = 0; i < N; i++) ret._internal[i] = _internal[i].getlane(lane); + return ret; + } + + strong_inline void putlane(scalar_object &s, int lane){ + for (int i = 0; i < N; i++) _internal[i].putlane(s._internal[i],lane); + } + + + + friend strong_inline void zeroit(iVector &that) { for (int i = 0; i < N; i++) { zeroit(that._internal[i]); @@ -349,6 +378,25 @@ class iMatrix { return *this; } + + strong_inline scalar_object getlane(int lane){ + scalar_object ret; + for (int i = 0; i < N; i++) { + for (int j = 0; j < N; j++) { + ret._internal[i][j] = _internal[i][j].getlane(lane); + } + } + return ret; + } + + strong_inline void putlane(scalar_object &s, int lane){ + for (int i = 0; i < N; i++) + for (int j = 0; j < N; j++) _internal[i][j].putlane(s._internal[i][j],lane); + } + + + + friend strong_inline void zeroit(iMatrix &that){ for(int i=0;i FermionAction; typedef typename FermionAction::FermionField FermionField; - const int Ls = 12; + const int Ls = 8; UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi()); UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + GridCartesian* sUGrid = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(),GridDefaultMpi()); + GridRedBlackCartesian* sUrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid); + + + FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls,UGrid); + FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls,UGrid); + + /* FGrid = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid); FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); + */ // temporarily need a gauge field LatticeGaugeField U(UGrid); // Gauge action double beta = 4.0; - IwasakiGaugeActionR Iaction(beta); + WilsonGaugeActionR Iaction(beta); Real mass = 0.04; Real pv = 1.0; RealD M5 = 1.5; RealD scale = 2.0; - FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale); - FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale); + FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5,scale); + FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5,scale); + + std::cout << GridLogMessage << "Frb Osites: " << FrbGrid->oSites() << std::endl; + std::cout << GridLogMessage << "sUGrid Osites: " << sUGrid->oSites() << std::endl; double StoppingCondition = 1.0e-8; double MaxCGIterations = 10000; @@ -94,7 +108,7 @@ public: TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); // Set smearing (true/false), default: false - Nf2.is_smeared = true; + Nf2.is_smeared = false; // Collect actions // here an example of 2 level integration @@ -154,7 +168,7 @@ int main(int argc, char **argv) { // Seeds for the random number generators std::vector SerSeed({1, 2, 3, 4, 5}); - std::vector ParSeed({6, 7, 8, 9, 10}); + std::vector ParSeed({6, 7, 8, 9, 5}); TheHMC.RNGSeeds(SerSeed, ParSeed); TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc index 42a903d6..cae53960 100644 --- a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc @@ -156,4 +156,6 @@ int main(int argc, char **argv) { TheHMC.MDparameters.set(10, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); + + Grid_finalize(); } From c56707e003e63c33404659d150b33dd8bcd05869 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 7 Dec 2016 08:59:20 +0900 Subject: [PATCH 133/807] useless debug message removed --- lib/stencil/Lebesgue.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/stencil/Lebesgue.cc b/lib/stencil/Lebesgue.cc index c30c14c7..c83975a9 100644 --- a/lib/stencil/Lebesgue.cc +++ b/lib/stencil/Lebesgue.cc @@ -65,7 +65,7 @@ void LebesgueOrder::CartesianBlocking(void) { _LebesgueReorder.resize(0); - std::cout << GridLogDebug << " CartesianBlocking "; + // std::cout << GridLogDebug << " CartesianBlocking "; // for(int d=0;d Date: Wed, 7 Dec 2016 08:59:58 +0900 Subject: [PATCH 134/807] Hadrons: more verbose genetic parameters --- extras/Hadrons/Application.cc | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 1b0c37f8..62c69230 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -76,7 +76,6 @@ Application::Application(const std::string parameterFileName) void Application::setPar(const Application::GlobalPar &par) { par_ = par; - LOG(Message) << par_.seed << std::endl; env_.setSeed(strToVec(par_.seed)); } @@ -143,14 +142,23 @@ void Application::schedule(void) return memPeak; }; - // constrained topological sort using a genetic algorithm - LOG(Message) << "Scheduling computation..." << std::endl; - unsigned int k = 0, gen, prevPeak, nCstPeak = 0; + // build module dependency graph + LOG(Message) << "Building module graph..." << std::endl; auto graph = env_.makeModuleGraph(); auto con = graph.getConnectedComponents(); - std::random_device rd; + + // constrained topological sort using a genetic algorithm + LOG(Message) << "Scheduling computation..." << std::endl; + LOG(Message) << " #module= " << graph.size() << std::endl; + LOG(Message) << " population size= " << par_.genetic.popSize << std::endl; + LOG(Message) << " max. generation= " << par_.genetic.maxGen << std::endl; + LOG(Message) << " max. cst. generation= " << par_.genetic.maxCstGen << std::endl; + LOG(Message) << " mutation rate= " << par_.genetic.mutationRate << std::endl; + + unsigned int k = 0, gen, prevPeak, nCstPeak = 0; + std::random_device rd; GeneticScheduler::Parameters par; - + par.popSize = par_.genetic.popSize; par.mutationRate = par_.genetic.mutationRate; par.seed = rd(); @@ -162,6 +170,7 @@ void Application::schedule(void) gen = 0; do { + LOG(Debug) << "Generation " << gen << ":" << std::endl; scheduler.nextGeneration(); if (gen != 0) { @@ -174,13 +183,14 @@ void Application::schedule(void) nCstPeak = 0; } } - LOG(Debug) << "generation " << gen << ":\n" << scheduler; + prevPeak = scheduler.getMinValue(); if (gen % 10 == 0) { LOG(Iterative) << "Generation " << gen << ": " << MEM_MSG(scheduler.getMinValue()) << std::endl; } + gen++; } while ((gen < par_.genetic.maxGen) and (nCstPeak < par_.genetic.maxCstGen)); From 51322da6f86c671b18141019e7cbd394bf3cc312 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 7 Dec 2016 09:00:45 +0900 Subject: [PATCH 135/807] Hadrons: genetic scheduler improvement --- extras/Hadrons/GeneticScheduler.hpp | 152 ++++++++++++++++++---------- lib/Threads.h | 2 + 2 files changed, 102 insertions(+), 52 deletions(-) diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index 3d75f2a4..0d0692cc 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -61,10 +61,12 @@ public: friend std::ostream & operator<<(std::ostream &out, const GeneticScheduler &s) { + out << "["; for (auto &p: s.population_) { - out << p.second << ": " << p.first << std::endl; + out << p.first << ", "; } + out << "\b\b]"; return out; } @@ -72,10 +74,10 @@ private: // randomly initialize population void initPopulation(void); // genetic operators - const std::vector & selection(void); - void crossover(const std::vector &c1, - const std::vector &c2); - void mutation(std::vector &c); + std::vector * select1(void); + std::pair *, std::vector *> select2(void); + void crossover(void); + void mutation(void); private: Graph &graph_; const ObjFunc &func_; @@ -115,38 +117,35 @@ int GeneticScheduler::getMinValue(void) template void GeneticScheduler::nextGeneration(void) { - std::uniform_real_distribution dis(0., 1.); - // random initialization of the population if necessary if (population_.size() != par_.popSize) { initPopulation(); } - - // mating - for (unsigned int i = 0; i < par_.popSize/2; ++i) - { - auto &p1 = selection(), &p2 = selection(); - crossover(p1, p2); - } + LOG(Debug) << "Starting population:\n" << *this << std::endl; // random mutations - auto buf = population_; - population_.clear(); - for (auto &c: buf) + PARALLEL_FOR_LOOP + for (unsigned int i = 0; i < par_.popSize; ++i) { - if (dis(gen_) < par_.mutationRate) - { - mutation(c.second); - } - population_.emplace(func_(c.second), c.second); + mutation(); } + LOG(Debug) << "After mutations:\n" << *this << std::endl; + + // mating + PARALLEL_FOR_LOOP + for (unsigned int i = 0; i < par_.popSize/2; ++i) + { + crossover(); + } + LOG(Debug) << "After mating:\n" << *this << std::endl; // grim reaper auto it = population_.begin(); std::advance(it, par_.popSize); population_.erase(it, population_.end()); + LOG(Debug) << "After grim reaper:\n" << *this << std::endl; } // randomly initialize population ////////////////////////////////////////////// @@ -164,37 +163,66 @@ void GeneticScheduler::initPopulation(void) // genetic operators /////////////////////////////////////////////////////////// template -const std::vector & GeneticScheduler::selection(void) +std::vector * GeneticScheduler::select1(void) +{ + std::uniform_int_distribution pdis(0, population_.size() - 1); + + auto it = population_.begin(); + std::advance(it, pdis(gen_)); + + return &(it->second); +} + +template +std::pair *, std::vector *> GeneticScheduler::select2(void) { std::vector prob; + unsigned int ind; + std::vector *p1, *p2; for (auto &c: population_) { prob.push_back(1./c.first); } - std::discrete_distribution dis(prob.begin(), prob.end()); - auto rIt = population_.begin(); - std::advance(rIt, dis(gen_)); + do + { + double probCpy; + + std::discrete_distribution dis1(prob.begin(), prob.end()); + auto rIt = population_.begin(); + ind = dis1(gen_); + std::advance(rIt, ind); + p1 = &(rIt->second); + probCpy = prob[ind]; + prob[ind] = 0.; + std::discrete_distribution dis2(prob.begin(), prob.end()); + rIt = population_.begin(); + std::advance(rIt, dis2(gen_)); + p2 = &(rIt->second); + prob[ind] = probCpy; + } while (p1 == p2); - return rIt->second; + return std::make_pair(p1, p2); } template -void GeneticScheduler::crossover(const std::vector &p1, - const std::vector &p2) +void GeneticScheduler::crossover(void) { - std::uniform_int_distribution dis(0, p1.size() - 1); - unsigned int cut = dis(gen_); + auto p = select2(); + auto &p1 = *(p.first), + &p2 = *(p.second); + std::uniform_int_distribution dis2(0, p1.size() - 1); + unsigned int cut = dis2(gen_); std::vector c1, c2, buf; auto cross = [&buf, cut](std::vector &c, const std::vector &p1, const std::vector &p2) { - buf = p2; + buf = p1; for (unsigned int i = 0; i < cut; ++i) { - c.push_back(p1[i]); - buf.erase(std::find(buf.begin(), buf.end(), p1[i])); + c.push_back(p2[i]); + buf.erase(std::find(buf.begin(), buf.end(), p2[i])); } for (unsigned int i = 0; i < buf.size(); ++i) { @@ -204,31 +232,51 @@ void GeneticScheduler::crossover(const std::vector &p1, cross(c1, p1, p2); cross(c2, p2, p1); - population_.emplace(func_(c1), c1); - population_.emplace(func_(c2), c2); + PARALLEL_CRITICAL + { + population_.emplace(func_(c1), c1); + population_.emplace(func_(c2), c2); + } } template -void GeneticScheduler::mutation(std::vector &c) +void GeneticScheduler::mutation(void) { - std::uniform_int_distribution dis(0, c.size() - 1); - unsigned int cut = dis(gen_); - Graph g = graph_; - std::vector buf; + std::uniform_real_distribution mdis(0., 1.); - for (unsigned int i = cut; i < c.size(); ++i) + if (mdis(gen_) < par_.mutationRate) { - g.removeVertex(c[i]); + auto &c = *select1(); + std::uniform_int_distribution cdis(0, c.size() - 1); + unsigned int cut = cdis(gen_); + std::vector buf1, buf2; + Graph g1 = graph_, g2 = graph_; + + for (unsigned int i = 0; i < cut; ++i) + { + g1.removeVertex(c[i]); + } + for (unsigned int i = cut; i < c.size(); ++i) + { + g2.removeVertex(c[i]); + } + if (g1.size() > 0) + { + buf1 = g1.topoSort(gen_); + } + if (g2.size() > 0) + { + buf2 = g2.topoSort(gen_); + } + for (unsigned int i = cut; i < c.size(); ++i) + { + buf2.push_back(buf1[i - cut]); + } + PARALLEL_CRITICAL + { + population_.emplace(func_(buf2), buf2); + } } - if (g.size() > 0) - { - buf = g.topoSort(gen_); - } - for (unsigned int i = cut; i < c.size(); ++i) - { - buf.push_back(c[i]); - } - c = buf; } END_HADRONS_NAMESPACE diff --git a/lib/Threads.h b/lib/Threads.h index 2f270b73..2f072633 100644 --- a/lib/Threads.h +++ b/lib/Threads.h @@ -46,11 +46,13 @@ Author: paboyle #endif #define PARALLEL_NESTED_LOOP2 _Pragma("omp parallel for collapse(2)") #define PARALLEL_REGION _Pragma("omp parallel") +#define PARALLEL_CRITICAL _Pragma("omp critical") #else #define PARALLEL_FOR_LOOP #define PARALLEL_FOR_LOOP_INTERN #define PARALLEL_NESTED_LOOP2 #define PARALLEL_REGION +#define PARALLEL_CRITICAL #endif namespace Grid { From 143c70e29f4785591e429277a7cdeb4461c9bfd4 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 7 Dec 2016 04:40:25 +0000 Subject: [PATCH 136/807] Debugged the threaded version. Cleaning up --- lib/cartesian/Cartesian_base.h | 36 ++-- lib/qcd/action/fermion/FermionOperatorImpl.h | 52 +++-- lib/qcd/action/fermion/WilsonFermion.cc | 12 +- lib/qcd/action/fermion/WilsonFermion5D.cc | 70 ++----- .../EvenOddSchurDifferentiable.h | 144 +++++++------- .../pseudofermion/TwoFlavourEvenOddRatio.h | 188 +++++++++--------- lib/qcd/hmc/integrators/Integrator.h | 25 +-- tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 1 + 8 files changed, 243 insertions(+), 285 deletions(-) diff --git a/lib/cartesian/Cartesian_base.h b/lib/cartesian/Cartesian_base.h index 334914e9..24ff5d4a 100644 --- a/lib/cartesian/Cartesian_base.h +++ b/lib/cartesian/Cartesian_base.h @@ -122,6 +122,12 @@ public: } + inline void InOutCoorToLocalCoor (std::vector &ocoor, std::vector &icoor, std::vector &lcoor) { + lcoor.resize(_ndimension); + for (int d = 0; d < _ndimension; d++) + lcoor[d] = ocoor[d] + _rdimensions[d] * icoor[d]; + } + ////////////////////////////////////////////////////////// // SIMD lane addressing ////////////////////////////////////////////////////////// @@ -129,6 +135,7 @@ public: { Lexicographic::CoorFromIndex(coor,lane,_simd_layout); } + inline int PermuteDim(int dimension){ return _simd_layout[dimension]>1; } @@ -175,20 +182,22 @@ public: inline const std::vector &VirtualLocalDimensions(void) { return _ldimensions;}; //////////////////////////////////////////////////////////////// - // Print decomposition + // Utility to print the full decomposition details //////////////////////////////////////////////////////////////// - void show_decomposition(){ - std::cout << GridLogMessage << "Full Dimensions : " << _fdimensions << std::endl; - std::cout << GridLogMessage << "Global Dimensions : " << _gdimensions << std::endl; - std::cout << GridLogMessage << "Local Dimensions : " << _ldimensions << std::endl; - std::cout << GridLogMessage << "Reduced Dimensions : " << _rdimensions << std::endl; - std::cout << GridLogMessage << "iSites : " << _isites << std::endl; - std::cout << GridLogMessage << "oSites : " << _osites << std::endl; - std::cout << GridLogMessage << "lSites : " << lSites() << std::endl; - std::cout << GridLogMessage << "gSites : " << gSites() << std::endl; - std::cout << GridLogMessage << "Nd : " << _ndimension << std::endl; - } + void show_decomposition(){ + std::cout << GridLogMessage << "Full Dimensions : " << _fdimensions << std::endl; + std::cout << GridLogMessage << "Global Dimensions : " << _gdimensions << std::endl; + std::cout << GridLogMessage << "Local Dimensions : " << _ldimensions << std::endl; + std::cout << GridLogMessage << "Reduced Dimensions : " << _rdimensions << std::endl; + std::cout << GridLogMessage << "Outer strides : " << _ostride << std::endl; + std::cout << GridLogMessage << "Inner strides : " << _istride << std::endl; + std::cout << GridLogMessage << "iSites : " << _isites << std::endl; + std::cout << GridLogMessage << "oSites : " << _osites << std::endl; + std::cout << GridLogMessage << "lSites : " << lSites() << std::endl; + std::cout << GridLogMessage << "gSites : " << gSites() << std::endl; + std::cout << GridLogMessage << "Nd : " << _ndimension << std::endl; + } //////////////////////////////////////////////////////////////// // Global addressing @@ -199,6 +208,9 @@ public: void LocalIndexToLocalCoor(int lidx,std::vector &lcoor){ Lexicographic::CoorFromIndex(lcoor,lidx,_ldimensions); } + + + void GlobalCoorToGlobalIndex(const std::vector & gcoor,int & gidx){ gidx=0; int mult=1; diff --git a/lib/qcd/action/fermion/FermionOperatorImpl.h b/lib/qcd/action/fermion/FermionOperatorImpl.h index be4f629f..78bc52b4 100644 --- a/lib/qcd/action/fermion/FermionOperatorImpl.h +++ b/lib/qcd/action/fermion/FermionOperatorImpl.h @@ -292,35 +292,43 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres } inline void InsertForce5D(GaugeField &mat, FermionField &Btilde, FermionField Ã, int mu) { - int LLs = Btilde._grid->_rdimensions[0]; - conformable(Atilde._grid,Btilde._grid); - GaugeLinkField tmp(mat._grid); - tmp = zero; typedef decltype(traceIndex(outerProduct(Btilde[0], Atilde[0]))) result_type; - std::vector v_scalar_object(Btilde._grid->Nsimd()); + unsigned int LLs = Btilde._grid->_rdimensions[0]; + conformable(Atilde._grid,Btilde._grid); + GridBase* grid = mat._grid; + GridBase* Bgrid = Btilde._grid; + unsigned int dimU = grid->Nd(); + unsigned int dimF = Bgrid->Nd(); + GaugeLinkField tmp(grid); + tmp = zero; + + // FIXME + // Current implementation works, thread safe, probably suboptimal PARALLEL_FOR_LOOP - for (int sss = 0; sss < tmp._grid->oSites(); sss++) { - std::vector ocoor; - tmp._grid->oCoorFromOindex(ocoor,sss); + for (int so = 0; so < grid->oSites(); so++) { + std::vector vres(Bgrid->Nsimd()); + std::vector ocoor; grid->oCoorFromOindex(ocoor,so); for (int si = 0; si < tmp._grid->iSites(); si++){ - typename result_type::scalar_object scalar_object; - scalar_object = zero; - std::vector local_coor(tmp._grid->Nd()); - std::vector icoor; - tmp._grid->iCoorFromIindex(icoor,si); - for (int i = 0; i < tmp._grid->Nd(); i++) local_coor[i] = ocoor[i] + tmp._grid->_rdimensions[i]*icoor[i]; - + typename result_type::scalar_object scalar_object; scalar_object = zero; + std::vector local_coor; + std::vector icoor; grid->iCoorFromIindex(icoor,si); + grid->InOutCoorToLocalCoor(ocoor, icoor, local_coor); + //for (int i = 0; i < dimU; i++) local_coor[i] = ocoor[i] + grid->_rdimensions[i]*icoor[i]; + //std::cout << "so: " << so << " si: "<< si << " local_coor: " << local_coor << std::endl; + for (int s = 0; s < LLs; s++) { - std::vector slocal_coor(Btilde._grid->Nd()); + std::vector slocal_coor(dimF); slocal_coor[0] = s; - for (int s4d = 1; s4d< Btilde._grid->Nd(); s4d++) slocal_coor[s4d] = local_coor[s4d-1]; - int sF = Btilde._grid->oIndexReduced(slocal_coor); - assert(sF < Btilde._grid->oSites()); - extract(traceIndex(outerProduct(Btilde[sF], Atilde[sF])), v_scalar_object); - for (int sv = 0; sv < v_scalar_object.size(); sv++) scalar_object += v_scalar_object[sv]; // sum across the 5d dimension + for (int s4d = 1; s4d< dimF; s4d++) slocal_coor[s4d] = local_coor[s4d-1]; + int sF = Bgrid->oIndexReduced(slocal_coor); + assert(sF < Bgrid->oSites()); + + extract(traceIndex(outerProduct(Btilde[sF], Atilde[sF])), vres); + // sum across the 5d dimension + for (auto v : vres) scalar_object += v; } - tmp._odata[sss].putlane(scalar_object, si); + tmp._odata[so].putlane(scalar_object, si); } } PokeIndex(mat, tmp, mu); diff --git a/lib/qcd/action/fermion/WilsonFermion.cc b/lib/qcd/action/fermion/WilsonFermion.cc index 99baa8a0..33f6b5ea 100644 --- a/lib/qcd/action/fermion/WilsonFermion.cc +++ b/lib/qcd/action/fermion/WilsonFermion.cc @@ -222,8 +222,7 @@ void WilsonFermion::DerivInternal(StencilImpl &st, DoubledGaugeField &U, //////////////////////// PARALLEL_FOR_LOOP for (int sss = 0; sss < B._grid->oSites(); sss++) { - Kernels::DiracOptDhopDir(st, U, st.CommBuf(), sss, sss, B, Btilde, mu, - gamma); + Kernels::DiracOptDhopDir(st, U, st.CommBuf(), sss, sss, B, Btilde, mu, gamma); } ////////////////////////////////////////////////// @@ -234,8 +233,7 @@ void WilsonFermion::DerivInternal(StencilImpl &st, DoubledGaugeField &U, } template -void WilsonFermion::DhopDeriv(GaugeField &mat, const FermionField &U, - const FermionField &V, int dag) { +void WilsonFermion::DhopDeriv(GaugeField &mat, const FermionField &U, const FermionField &V, int dag) { conformable(U._grid, _grid); conformable(U._grid, V._grid); conformable(U._grid, mat._grid); @@ -246,8 +244,7 @@ void WilsonFermion::DhopDeriv(GaugeField &mat, const FermionField &U, } template -void WilsonFermion::DhopDerivOE(GaugeField &mat, const FermionField &U, - const FermionField &V, int dag) { +void WilsonFermion::DhopDerivOE(GaugeField &mat, const FermionField &U, const FermionField &V, int dag) { conformable(U._grid, _cbgrid); conformable(U._grid, V._grid); conformable(U._grid, mat._grid); @@ -260,8 +257,7 @@ void WilsonFermion::DhopDerivOE(GaugeField &mat, const FermionField &U, } template -void WilsonFermion::DhopDerivEO(GaugeField &mat, const FermionField &U, - const FermionField &V, int dag) { +void WilsonFermion::DhopDerivEO(GaugeField &mat, const FermionField &U, const FermionField &V, int dag) { conformable(U._grid, _cbgrid); conformable(U._grid, V._grid); conformable(U._grid, mat._grid); diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/lib/qcd/action/fermion/WilsonFermion5D.cc index 8b8d1e2d..d930e87c 100644 --- a/lib/qcd/action/fermion/WilsonFermion5D.cc +++ b/lib/qcd/action/fermion/WilsonFermion5D.cc @@ -11,6 +11,7 @@ Author: Peter Boyle Author: Peter Boyle Author: Peter Boyle Author: paboyle +Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -132,48 +133,6 @@ WilsonFermion5D::WilsonFermion5D(GaugeField &_Umu, // Allocate the required comms buffer ImportGauge(_Umu); } - /* -template -WilsonFermion5D::WilsonFermion5D(int simd,GaugeField &_Umu, - GridCartesian &FiveDimGrid, - GridRedBlackCartesian &FiveDimRedBlackGrid, - GridCartesian &FourDimGrid, - RealD _M5,const ImplParams &p) : -{ - int nsimd = Simd::Nsimd(); - - // some assertions - assert(FiveDimGrid._ndimension==5); - assert(FiveDimRedBlackGrid._ndimension==5); - assert(FiveDimRedBlackGrid._checker_dim==0); // Checkerboard the s-direction - assert(FourDimGrid._ndimension==4); - - // Dimension zero of the five-d is the Ls direction - Ls=FiveDimGrid._fdimensions[0]; - assert(FiveDimGrid._processors[0] ==1); - assert(FiveDimGrid._simd_layout[0] ==nsimd); - - assert(FiveDimRedBlackGrid._fdimensions[0]==Ls); - assert(FiveDimRedBlackGrid._processors[0] ==1); - assert(FiveDimRedBlackGrid._simd_layout[0]==nsimd); - - // Other dimensions must match the decomposition of the four-D fields - for(int d=0;d<4;d++){ - assert(FiveDimRedBlackGrid._fdimensions[d+1]==FourDimGrid._fdimensions[d]); - assert(FiveDimRedBlackGrid._processors[d+1] ==FourDimGrid._processors[d]); - - assert(FourDimGrid._simd_layout[d]=1); - assert(FiveDimRedBlackGrid._simd_layout[d+1]==1); - - assert(FiveDimGrid._fdimensions[d+1] ==FourDimGrid._fdimensions[d]); - assert(FiveDimGrid._processors[d+1] ==FourDimGrid._processors[d]); - assert(FiveDimGrid._simd_layout[d+1] ==FourDimGrid._simd_layout[d]); - } - - { - } -} - */ template void WilsonFermion5D::Report(void) @@ -346,13 +305,14 @@ void WilsonFermion5D::DerivInternal(StencilImpl & st, template void WilsonFermion5D::DhopDeriv(GaugeField &mat, - const FermionField &A, - const FermionField &B, - int dag) + const FermionField &A, + const FermionField &B, + int dag) { conformable(A._grid,FermionGrid()); conformable(A._grid,B._grid); - //conformable(GaugeGrid(),mat._grid); + + //conformable(GaugeGrid(),mat._grid);// this is not general! leaving as a comment mat.checkerboard = A.checkerboard; @@ -361,12 +321,11 @@ void WilsonFermion5D::DhopDeriv(GaugeField &mat, template void WilsonFermion5D::DhopDerivEO(GaugeField &mat, - const FermionField &A, - const FermionField &B, - int dag) + const FermionField &A, + const FermionField &B, + int dag) { conformable(A._grid,FermionRedBlackGrid()); - //conformable(GaugeRedBlackGrid(),mat._grid); conformable(A._grid,B._grid); assert(B.checkerboard==Odd); @@ -379,12 +338,11 @@ void WilsonFermion5D::DhopDerivEO(GaugeField &mat, template void WilsonFermion5D::DhopDerivOE(GaugeField &mat, - const FermionField &A, - const FermionField &B, - int dag) + const FermionField &A, + const FermionField &B, + int dag) { conformable(A._grid,FermionRedBlackGrid()); - //conformable(GaugeRedBlackGrid(),mat._grid); conformable(A._grid,B._grid); assert(B.checkerboard==Even); @@ -396,8 +354,8 @@ void WilsonFermion5D::DhopDerivOE(GaugeField &mat, template void WilsonFermion5D::DhopInternal(StencilImpl & st, LebesgueOrder &lo, - DoubledGaugeField & U, - const FermionField &in, FermionField &out,int dag) + DoubledGaugeField & U, + const FermionField &in, FermionField &out,int dag) { // assert((dag==DaggerNo) ||(dag==DaggerYes)); Compressor compressor(dag); diff --git a/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h b/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h index 6965fea9..367a735d 100644 --- a/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h +++ b/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h @@ -7,6 +7,7 @@ Copyright (C) 2015 Author: Peter Boyle +Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,106 +46,97 @@ namespace Grid{ public: INHERIT_IMPL_TYPES(Impl); - typedef FermionOperator Matrix; + typedef FermionOperator Matrix; - SchurDifferentiableOperator (Matrix &Mat) : SchurDiagMooeeOperator(Mat) {}; + SchurDifferentiableOperator (Matrix &Mat) : SchurDiagMooeeOperator(Mat) {}; - void MpcDeriv(GaugeField &Force,const FermionField &U,const FermionField &V) { - - GridBase *fgrid = this->_Mat.FermionGrid(); - GridBase *fcbgrid = this->_Mat.FermionRedBlackGrid(); - GridBase *ugrid = this->_Mat.GaugeGrid(); - GridBase *ucbgrid = this->_Mat.GaugeRedBlackGrid(); + void MpcDeriv(GaugeField &Force,const FermionField &U,const FermionField &V) { + + GridBase *fgrid = this->_Mat.FermionGrid(); + GridBase *fcbgrid = this->_Mat.FermionRedBlackGrid(); - Real coeff = 1.0; + FermionField tmp1(fcbgrid); + FermionField tmp2(fcbgrid); - FermionField tmp1(fcbgrid); - FermionField tmp2(fcbgrid); + conformable(fcbgrid,U._grid); + conformable(fcbgrid,V._grid); - conformable(fcbgrid,U._grid); - conformable(fcbgrid,V._grid); + // Assert the checkerboard?? or code for either + assert(U.checkerboard==Odd); + assert(V.checkerboard==U.checkerboard); - // Assert the checkerboard?? or code for either - assert(U.checkerboard==Odd); - assert(V.checkerboard==U.checkerboard); - - // NOTE Guido: WE DO NOT WANT TO USE THIS GRID FOR THE FORCE - // INHERIT FROM THE Force field - //GaugeField ForceO(ucbgrid); - //GaugeField ForceE(ucbgrid); + // NOTE Guido: WE DO NOT WANT TO USE THE ucbgrid GRID FOR THE FORCE + // it is not conformable with the HMC force field + // INHERIT FROM THE Force field instead GridRedBlackCartesian* forcecb = new GridRedBlackCartesian(Force._grid); GaugeField ForceO(forcecb); GaugeField ForceE(forcecb); - // X^dag Der_oe MeeInv Meo Y - // Use Mooee as nontrivial but gauge field indept - this->_Mat.Meooe (V,tmp1); // odd->even -- implicit -0.5 factor to be applied - this->_Mat.MooeeInv(tmp1,tmp2); // even->even - this->_Mat.MoeDeriv(ForceO,U,tmp2,DaggerNo); - - // Accumulate X^dag M_oe MeeInv Der_eo Y - this->_Mat.MeooeDag (U,tmp1); // even->odd -- implicit -0.5 factor to be applied - this->_Mat.MooeeInvDag(tmp1,tmp2); // even->even - this->_Mat.MeoDeriv(ForceE,tmp2,V,DaggerNo); - - assert(ForceE.checkerboard==Even); - assert(ForceO.checkerboard==Odd); + // X^dag Der_oe MeeInv Meo Y + // Use Mooee as nontrivial but gauge field indept + this->_Mat.Meooe (V,tmp1); // odd->even -- implicit -0.5 factor to be applied + this->_Mat.MooeeInv(tmp1,tmp2); // even->even + this->_Mat.MoeDeriv(ForceO,U,tmp2,DaggerNo); + + // Accumulate X^dag M_oe MeeInv Der_eo Y + this->_Mat.MeooeDag (U,tmp1); // even->odd -- implicit -0.5 factor to be applied + this->_Mat.MooeeInvDag(tmp1,tmp2); // even->even + this->_Mat.MeoDeriv(ForceE,tmp2,V,DaggerNo); + + assert(ForceE.checkerboard==Even); + assert(ForceO.checkerboard==Odd); - setCheckerboard(Force,ForceE); - setCheckerboard(Force,ForceO); - Force=-Force; - } + setCheckerboard(Force,ForceE); + setCheckerboard(Force,ForceO); + Force=-Force; + + delete forcecb; + } - void MpcDagDeriv(GaugeField &Force,const FermionField &U,const FermionField &V) { - - GridBase *fgrid = this->_Mat.FermionGrid(); - GridBase *fcbgrid = this->_Mat.FermionRedBlackGrid(); - GridBase *ugrid = this->_Mat.GaugeGrid(); - GridBase *ucbgrid = this->_Mat.GaugeRedBlackGrid(); + void MpcDagDeriv(GaugeField &Force,const FermionField &U,const FermionField &V) { + + GridBase *fgrid = this->_Mat.FermionGrid(); + GridBase *fcbgrid = this->_Mat.FermionRedBlackGrid(); - Real coeff = 1.0; + FermionField tmp1(fcbgrid); + FermionField tmp2(fcbgrid); - FermionField tmp1(fcbgrid); - FermionField tmp2(fcbgrid); + conformable(fcbgrid,U._grid); + conformable(fcbgrid,V._grid); - conformable(fcbgrid,U._grid); - conformable(fcbgrid,V._grid); + // Assert the checkerboard?? or code for either + assert(V.checkerboard==Odd); + assert(V.checkerboard==V.checkerboard); - // Assert the checkerboard?? or code for either - assert(V.checkerboard==Odd); - assert(V.checkerboard==V.checkerboard); - - // NOTE Guido: WE DO NOT WANT TO USE THIS GRID FOR THE FORCE - // INHERIT FROM THE Force field - - //GaugeField ForceO(ucbgrid); - //GaugeField ForceE(ucbgrid); - GridRedBlackCartesian* forcecb = new GridRedBlackCartesian(Force._grid); + // NOTE Guido: WE DO NOT WANT TO USE THE ucbgrid GRID FOR THE FORCE + // it is not conformable with the HMC force field + // INHERIT FROM THE Force field instead + GridRedBlackCartesian* forcecb = new GridRedBlackCartesian(Force._grid); GaugeField ForceO(forcecb); GaugeField ForceE(forcecb); - // X^dag Der_oe MeeInv Meo Y - // Use Mooee as nontrivial but gauge field indept - this->_Mat.MeooeDag (V,tmp1); // odd->even -- implicit -0.5 factor to be applied - this->_Mat.MooeeInvDag(tmp1,tmp2); // even->even - this->_Mat.MoeDeriv(ForceO,U,tmp2,DaggerYes); - - // Accumulate X^dag M_oe MeeInv Der_eo Y - this->_Mat.Meooe (U,tmp1); // even->odd -- implicit -0.5 factor to be applied - this->_Mat.MooeeInv(tmp1,tmp2); // even->even - this->_Mat.MeoDeriv(ForceE,tmp2,V,DaggerYes); + // X^dag Der_oe MeeInv Meo Y + // Use Mooee as nontrivial but gauge field indept + this->_Mat.MeooeDag (V,tmp1); // odd->even -- implicit -0.5 factor to be applied + this->_Mat.MooeeInvDag(tmp1,tmp2); // even->even + this->_Mat.MoeDeriv(ForceO,U,tmp2,DaggerYes); + + // Accumulate X^dag M_oe MeeInv Der_eo Y + this->_Mat.Meooe (U,tmp1); // even->odd -- implicit -0.5 factor to be applied + this->_Mat.MooeeInv(tmp1,tmp2); // even->even + this->_Mat.MeoDeriv(ForceE,tmp2,V,DaggerYes); - assert(ForceE.checkerboard==Even); - assert(ForceO.checkerboard==Odd); + assert(ForceE.checkerboard==Even); + assert(ForceO.checkerboard==Odd); - setCheckerboard(Force,ForceE); - setCheckerboard(Force,ForceO); - Force=-Force; + setCheckerboard(Force,ForceE); + setCheckerboard(Force,ForceO); + Force=-Force; - - } + delete forcecb; + } }; diff --git a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h b/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h index d7a26695..0f6f3680 100644 --- a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h +++ b/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h @@ -52,68 +52,68 @@ namespace Grid{ public: TwoFlavourEvenOddRatioPseudoFermionAction(FermionOperator &_NumOp, - FermionOperator &_DenOp, - OperatorFunction & DS, - OperatorFunction & AS) : + FermionOperator &_DenOp, + OperatorFunction & DS, + OperatorFunction & AS) : NumOp(_NumOp), DenOp(_DenOp), DerivativeSolver(DS), ActionSolver(AS), PhiEven(_NumOp.FermionRedBlackGrid()), PhiOdd(_NumOp.FermionRedBlackGrid()) - { - conformable(_NumOp.FermionGrid(), _DenOp.FermionGrid()); - conformable(_NumOp.FermionRedBlackGrid(), _DenOp.FermionRedBlackGrid()); - conformable(_NumOp.GaugeGrid(), _DenOp.GaugeGrid()); - conformable(_NumOp.GaugeRedBlackGrid(), _DenOp.GaugeRedBlackGrid()); - }; + { + conformable(_NumOp.FermionGrid(), _DenOp.FermionGrid()); + conformable(_NumOp.FermionRedBlackGrid(), _DenOp.FermionRedBlackGrid()); + conformable(_NumOp.GaugeGrid(), _DenOp.GaugeGrid()); + conformable(_NumOp.GaugeRedBlackGrid(), _DenOp.GaugeRedBlackGrid()); + }; virtual std::string action_name(){return "TwoFlavourEvenOddRatioPseudoFermionAction";} virtual void refresh(const GaugeField &U, GridParallelRNG& pRNG) { - // P(phi) = e^{- phi^dag Vpc (MpcdagMpc)^-1 Vpcdag phi} - // - // NumOp == V - // DenOp == M - // - // Take phi_o = Vpcdag^{-1} Mpcdag eta_o ; eta_o = Mpcdag^{-1} Vpcdag Phi - // - // P(eta_o) = e^{- eta_o^dag eta_o} - // - // e^{x^2/2 sig^2} => sig^2 = 0.5. - // - RealD scale = std::sqrt(0.5); + // P(phi) = e^{- phi^dag Vpc (MpcdagMpc)^-1 Vpcdag phi} + // + // NumOp == V + // DenOp == M + // + // Take phi_o = Vpcdag^{-1} Mpcdag eta_o ; eta_o = Mpcdag^{-1} Vpcdag Phi + // + // P(eta_o) = e^{- eta_o^dag eta_o} + // + // e^{x^2/2 sig^2} => sig^2 = 0.5. + // + RealD scale = std::sqrt(0.5); - FermionField eta (NumOp.FermionGrid()); - FermionField etaOdd (NumOp.FermionRedBlackGrid()); - FermionField etaEven(NumOp.FermionRedBlackGrid()); - FermionField tmp (NumOp.FermionRedBlackGrid()); + FermionField eta (NumOp.FermionGrid()); + FermionField etaOdd (NumOp.FermionRedBlackGrid()); + FermionField etaEven(NumOp.FermionRedBlackGrid()); + FermionField tmp (NumOp.FermionRedBlackGrid()); - gaussian(pRNG,eta); + gaussian(pRNG,eta); - pickCheckerboard(Even,etaEven,eta); - pickCheckerboard(Odd,etaOdd,eta); + pickCheckerboard(Even,etaEven,eta); + pickCheckerboard(Odd,etaOdd,eta); - NumOp.ImportGauge(U); - DenOp.ImportGauge(U); + NumOp.ImportGauge(U); + DenOp.ImportGauge(U); - SchurDifferentiableOperator Mpc(DenOp); - SchurDifferentiableOperator Vpc(NumOp); + SchurDifferentiableOperator Mpc(DenOp); + SchurDifferentiableOperator Vpc(NumOp); - // Odd det factors - Mpc.MpcDag(etaOdd,PhiOdd); - tmp=zero; - ActionSolver(Vpc,PhiOdd,tmp); - Vpc.Mpc(tmp,PhiOdd); + // Odd det factors + Mpc.MpcDag(etaOdd,PhiOdd); + tmp=zero; + ActionSolver(Vpc,PhiOdd,tmp); + Vpc.Mpc(tmp,PhiOdd); - // Even det factors - DenOp.MooeeDag(etaEven,tmp); - NumOp.MooeeInvDag(tmp,PhiEven); + // Even det factors + DenOp.MooeeDag(etaEven,tmp); + NumOp.MooeeInvDag(tmp,PhiEven); - PhiOdd =PhiOdd*scale; - PhiEven=PhiEven*scale; - + PhiOdd =PhiOdd*scale; + PhiEven=PhiEven*scale; + }; ////////////////////////////////////////////////////// @@ -121,33 +121,33 @@ namespace Grid{ ////////////////////////////////////////////////////// virtual RealD S(const GaugeField &U) { - NumOp.ImportGauge(U); - DenOp.ImportGauge(U); + NumOp.ImportGauge(U); + DenOp.ImportGauge(U); - SchurDifferentiableOperator Mpc(DenOp); - SchurDifferentiableOperator Vpc(NumOp); + SchurDifferentiableOperator Mpc(DenOp); + SchurDifferentiableOperator Vpc(NumOp); - FermionField X(NumOp.FermionRedBlackGrid()); - FermionField Y(NumOp.FermionRedBlackGrid()); + FermionField X(NumOp.FermionRedBlackGrid()); + FermionField Y(NumOp.FermionRedBlackGrid()); - Vpc.MpcDag(PhiOdd,Y); // Y= Vdag phi - X=zero; - ActionSolver(Mpc,Y,X); // X= (MdagM)^-1 Vdag phi - //Mpc.Mpc(X,Y); // Y= Mdag^-1 Vdag phi - // Multiply by Ydag - RealD action = real(innerProduct(Y,X)); + Vpc.MpcDag(PhiOdd,Y); // Y= Vdag phi + X=zero; + ActionSolver(Mpc,Y,X); // X= (MdagM)^-1 Vdag phi + //Mpc.Mpc(X,Y); // Y= Mdag^-1 Vdag phi + // Multiply by Ydag + RealD action = real(innerProduct(Y,X)); - //RealD action = norm2(Y); + //RealD action = norm2(Y); - // The EE factorised block; normally can replace with zero if det is constant (gauge field indept) - // Only really clover term that creates this. Leave the EE portion as a future to do to make most - // rapid progresss on DWF for now. - // - NumOp.MooeeDag(PhiEven,X); - DenOp.MooeeInvDag(X,Y); - action = action + norm2(Y); + // The EE factorised block; normally can replace with zero if det is constant (gauge field indept) + // Only really clover term that creates this. Leave the EE portion as a future to do to make most + // rapid progresss on DWF for now. + // + NumOp.MooeeDag(PhiEven,X); + DenOp.MooeeInvDag(X,Y); + action = action + norm2(Y); - return action; + return action; }; ////////////////////////////////////////////////////// @@ -157,46 +157,44 @@ namespace Grid{ ////////////////////////////////////////////////////// virtual void deriv(const GaugeField &U,GaugeField & dSdU) { - NumOp.ImportGauge(U); - DenOp.ImportGauge(U); + NumOp.ImportGauge(U); + DenOp.ImportGauge(U); - SchurDifferentiableOperator Mpc(DenOp); - SchurDifferentiableOperator Vpc(NumOp); + SchurDifferentiableOperator Mpc(DenOp); + SchurDifferentiableOperator Vpc(NumOp); - FermionField X(NumOp.FermionRedBlackGrid()); - FermionField Y(NumOp.FermionRedBlackGrid()); + FermionField X(NumOp.FermionRedBlackGrid()); + FermionField Y(NumOp.FermionRedBlackGrid()); - //GaugeField force(NumOp.GaugeGrid()); - GaugeField force(dSdU._grid); - conformable(force._grid, dSdU._grid); + // This assignment is necessary to be compliant with the HMC grids + GaugeField force(dSdU._grid); - //Y=Vdag phi - //X = (Mdag M)^-1 V^dag phi - //Y = (Mdag)^-1 V^dag phi - Vpc.MpcDag(PhiOdd,Y); // Y= Vdag phi - X=zero; - DerivativeSolver(Mpc,Y,X); // X= (MdagM)^-1 Vdag phi - Mpc.Mpc(X,Y); // Y= Mdag^-1 Vdag phi + //Y=Vdag phi + //X = (Mdag M)^-1 V^dag phi + //Y = (Mdag)^-1 V^dag phi + Vpc.MpcDag(PhiOdd,Y); // Y= Vdag phi + X=zero; + DerivativeSolver(Mpc,Y,X); // X= (MdagM)^-1 Vdag phi + Mpc.Mpc(X,Y); // Y= Mdag^-1 Vdag phi - // phi^dag V (Mdag M)^-1 dV^dag phi - Vpc.MpcDagDeriv(force , X, PhiOdd ); dSdU=force; + // phi^dag V (Mdag M)^-1 dV^dag phi + Vpc.MpcDagDeriv(force , X, PhiOdd ); dSdU = force; - // phi^dag dV (Mdag M)^-1 V^dag phi - Vpc.MpcDeriv(force , PhiOdd, X ); dSdU=dSdU+force; + // phi^dag dV (Mdag M)^-1 V^dag phi + Vpc.MpcDeriv(force , PhiOdd, X ); dSdU = dSdU+force; - // - phi^dag V (Mdag M)^-1 Mdag dM (Mdag M)^-1 V^dag phi - // - phi^dag V (Mdag M)^-1 dMdag M (Mdag M)^-1 V^dag phi - Mpc.MpcDeriv(force,Y,X); dSdU=dSdU-force; - Mpc.MpcDagDeriv(force,X,Y); dSdU=dSdU-force; + // - phi^dag V (Mdag M)^-1 Mdag dM (Mdag M)^-1 V^dag phi + // - phi^dag V (Mdag M)^-1 dMdag M (Mdag M)^-1 V^dag phi + Mpc.MpcDeriv(force,Y,X); dSdU = dSdU-force; + Mpc.MpcDagDeriv(force,X,Y); dSdU = dSdU-force; - // FIXME No force contribution from EvenEven assumed here - // Needs a fix for clover. - assert(NumOp.ConstEE() == 1); - assert(DenOp.ConstEE() == 1); + // FIXME No force contribution from EvenEven assumed here + // Needs a fix for clover. + assert(NumOp.ConstEE() == 1); + assert(DenOp.ConstEE() == 1); - //dSdU = -Ta(dSdU); - dSdU = -dSdU; - + dSdU = -dSdU; + }; }; } diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index bc076085..db3712c0 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -57,7 +57,7 @@ struct IntegratorParameters { void print_parameters() { - std::cout << GridLogMessage << "[Integrator] Trajectory length : " << trajL << std::endl; + std::cout << GridLogMessage << "[Integrator] Trajectory length : " << trajL << std::endl; std::cout << GridLogMessage << "[Integrator] Number of MD steps : " << MDsteps << std::endl; std::cout << GridLogMessage << "[Integrator] Step size : " << stepsize << std::endl; } @@ -99,11 +99,9 @@ class Integrator { FieldType forceR(U._grid); // Implement smearing only for the fundamental representation now repr_set.at(a)->deriv(Rep.U, forceR); - GF force = - Rep.RtoFundamentalProject(forceR); // Ta for the fundamental rep - Real force_abs = std::sqrt(norm2(force)); - std::cout << GridLogIntegrator << "Hirep Force average: " - << force_abs / (U._grid->gSites()) << std::endl; + GF force = Rep.RtoFundamentalProject(forceR); // Ta for the fundamental rep + Real force_abs = std::sqrt(norm2(force)/(U._grid->gSites())); + std::cout << GridLogIntegrator << "Hirep Force average: " << force_abs << std::endl; Mom -= force * ep ; } } @@ -118,15 +116,11 @@ class Integrator { Field& Us = Smearer.get_U(as[level].actions.at(a)->is_smeared); as[level].actions.at(a)->deriv(Us, force); // deriv should NOT include Ta - std::cout << GridLogIntegrator - << "Smearing (on/off): " << as[level].actions.at(a)->is_smeared - << std::endl; + std::cout << GridLogIntegrator << "Smearing (on/off): " << as[level].actions.at(a)->is_smeared << std::endl; if (as[level].actions.at(a)->is_smeared) Smearer.smeared_force(force); force = FieldImplementation::projectForce(force); // Ta for gauge fields - Real force_abs = std::sqrt(norm2(force)); - std::cout << GridLogIntegrator - << "Force average: " << force_abs / (U._grid->gSites()) - << std::endl; + Real force_abs = std::sqrt(norm2(force)/U._grid->gSites()); + std::cout << GridLogIntegrator << "Force average: " << force_abs << std::endl; Mom -= force * ep; } @@ -139,10 +133,9 @@ class Integrator { t_U += ep; int fl = levels - 1; - std::cout << GridLogIntegrator << " " - << "[" << fl << "] U " - << " dt " << ep << " : t_U " << t_U << std::endl; + std::cout << GridLogIntegrator << " " << "[" << fl << "] U " << " dt " << ep << " : t_U " << t_U << std::endl; } + void update_U(MomentaField& Mom, Field& U, double ep) { // exponential of Mom*U in the gauge fields case FieldImplementation::update_field(Mom, U, ep); diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index 510de3ed..65833024 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -85,6 +85,7 @@ public: FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); */ + // temporarily need a gauge field LatticeGaugeField U(UGrid); From 2bd42339198d96e3df8fa938d5e62db0bf125e56 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 7 Dec 2016 04:56:37 +0000 Subject: [PATCH 137/807] Completed testing of the HMC for Ls vectorised version (on AVX2) --- lib/cartesian/Cartesian_base.h | 1 + lib/lattice/Lattice_rng.h | 28 +-- lib/qcd/action/fermion/FermionOperatorImpl.h | 5 +- .../Test_hmc_EODWFRatioLsVectorised_Binary.cc | 170 ++++++++++++++++++ tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 27 +-- 5 files changed, 193 insertions(+), 38 deletions(-) create mode 100644 tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc diff --git a/lib/cartesian/Cartesian_base.h b/lib/cartesian/Cartesian_base.h index 24ff5d4a..71563b2b 100644 --- a/lib/cartesian/Cartesian_base.h +++ b/lib/cartesian/Cartesian_base.h @@ -8,6 +8,7 @@ Author: Peter Boyle Author: paboyle +Author: Guido Cossu This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index c5607ed8..2d0e87c7 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -148,7 +148,7 @@ namespace Grid { ss<<_generators[gen]; ss.seekg(0,ss.beg); for(int i=0;i>saved[i]; + ss>>saved[i]; } } void SetState(std::vector & saved,int gen){ @@ -315,26 +315,26 @@ namespace Grid { for(int gidx=0;gidxGlobalIndexToGlobalCoor(gidx,gcoor); - _grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); + int rank,o_idx,i_idx; + _grid->GlobalIndexToGlobalCoor(gidx,gcoor); + _grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor); - int l_idx=generator_idx(o_idx,i_idx); + int l_idx=generator_idx(o_idx,i_idx); - const int num_rand_seed=16; - std::vector site_seeds(num_rand_seed); - for(int i=0;i site_seeds(num_rand_seed); + for(int i=0;iBroadcast(0,(void *)&site_seeds[0],sizeof(int)*site_seeds.size()); + _grid->Broadcast(0,(void *)&site_seeds[0],sizeof(int)*site_seeds.size()); - if( rank == _grid->ThisRank() ){ + if( rank == _grid->ThisRank() ){ fixedSeed ssrc(site_seeds); typename source::result_type sinit = ssrc(); _generators[l_idx] = RngEngine(sinit); - } + } } _seeded=1; } @@ -373,7 +373,7 @@ namespace Grid { for (int idx = 0; idx < words; idx++) fillScalar(pointer[idx], dist[gdx], _generators[gdx]); } - // merge into SIMD lanes + // merge into SIMD lanes, FIXME suboptimal implementation merge(l._odata[sm], buf); } } diff --git a/lib/qcd/action/fermion/FermionOperatorImpl.h b/lib/qcd/action/fermion/FermionOperatorImpl.h index 78bc52b4..f658872d 100644 --- a/lib/qcd/action/fermion/FermionOperatorImpl.h +++ b/lib/qcd/action/fermion/FermionOperatorImpl.h @@ -304,6 +304,8 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres // FIXME // Current implementation works, thread safe, probably suboptimal + // Passing through the local coordinate for grid transformation + // the force grid is in general very different from the Ls vectorized grid PARALLEL_FOR_LOOP for (int so = 0; so < grid->oSites(); so++) { @@ -314,9 +316,6 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres std::vector local_coor; std::vector icoor; grid->iCoorFromIindex(icoor,si); grid->InOutCoorToLocalCoor(ocoor, icoor, local_coor); - //for (int i = 0; i < dimU; i++) local_coor[i] = ocoor[i] + grid->_rdimensions[i]*icoor[i]; - //std::cout << "so: " << so << " si: "<< si << " local_coor: " << local_coor << std::endl; - for (int s = 0; s < LLs; s++) { std::vector slocal_coor(dimF); slocal_coor[0] = s; diff --git a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc new file mode 100644 index 00000000..13542e04 --- /dev/null +++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc @@ -0,0 +1,170 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_hmc_WilsonFermionGauge.cc + +Copyright (C) 2015 + +Author: Peter Boyle +Author: neo +Author: Guido Cossu + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +namespace Grid { +namespace QCD { + + class HMCRunnerParameters : Serializable { + public: + GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters, + double, beta, + double, mass, + int, MaxCGIterations, + double, StoppingCondition, + bool, smearedAction, + int, SaveInterval, + std::string, format, + std::string, conf_prefix, + std::string, rng_prefix, + double, rho, + int, SmearingLevels, + ); + + HMCRunnerParameters() {} + }; + +// Derive from the BinaryHmcRunner (templated for gauge fields) +class HmcRunner : public BinaryHmcRunner { +public: + void BuildTheAction(int argc, char **argv) + + { + typedef DomainWallVec5dImplR ImplPolicy; + typedef ScaledShamirFermion FermionAction; + typedef typename FermionAction::FermionField FermionField; + + const int Ls = 8; + + UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi()); + UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + + GridCartesian* sUGrid = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(),GridDefaultMpi()); + GridRedBlackCartesian* sUrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid); + + + FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls,UGrid); + FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls,UGrid); + + // temporarily need a gauge field + LatticeGaugeField U(UGrid); + + // Gauge action + double beta = 4.0; + WilsonGaugeActionR Waction(beta); + + Real mass = 0.04; + Real pv = 1.0; + RealD M5 = 1.5; + RealD scale = 2.0; + FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5,scale); + FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5,scale); + + double StoppingCondition = 1.0e-8; + double MaxCGIterations = 10000; + ConjugateGradient CG(StoppingCondition,MaxCGIterations); + TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); + + // Set smearing (true/false), default: false + Nf2.is_smeared = true; + + // Collect actions + // here an example of 2 level integration + ActionLevel Level1(1); + Level1.push_back(&Nf2); + + // this level will integrate with a + // step that is 4 times finer + // than the previous level + ActionLevel Level2(4); + Level2.push_back(&Waction); + + TheAction.push_back(Level1); + TheAction.push_back(Level2); + + // Add observables + int SaveInterval = 1; + std::string format = std::string("IEEE64BIG"); + std::string conf_prefix = std::string("DWF_ckpoint_lat"); + std::string rng_prefix = std::string("DWF_ckpoint_rng"); + BinaryHmcCheckpointer Checkpoint(conf_prefix, rng_prefix, SaveInterval, format); + // Can implement also a specific function in the hmcrunner + // AddCheckpoint (...) that takes the same parameters + a string/tag + // defining the type of the checkpointer + // with tags can be implemented by overloading and no ifs + // Then force all checkpoint to have few common functions + // return an object that is then passed to the Run function + + PlaquetteLogger PlaqLog(std::string("Plaquette")); + ObservablesList.push_back(&PlaqLog); + ObservablesList.push_back(&Checkpoint); + + // Smearing section, omit if not needed + double rho = 0.1; // smearing parameter + int Nsmear = 2; // number of smearing levels + Smear_Stout Stout(rho); + SmearedConfiguration SmearingPolicy( + UGrid, Nsmear, Stout); + /////////////////// + + Run(argc, argv, Checkpoint, SmearingPolicy); + //Run(argc, argv, Checkpoint); // no smearing +}; +}; +} +} + +int main(int argc, char **argv) { + Grid_init(&argc, &argv); + + int threads = GridThread::GetThreads(); + std::cout << GridLogMessage << "Grid is setup to use " << threads + << " threads" << std::endl; + + HmcRunner TheHMC; + + + // Seeds for the random number generators + std::vector SerSeed({1, 2, 3, 4, 5}); + std::vector ParSeed({6, 7, 8, 9, 5}); + TheHMC.RNGSeeds(SerSeed, ParSeed); + + TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + + TheHMC.BuildTheAction(argc, argv); + + Grid_finalize(); +} diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index 65833024..481ff96d 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -62,8 +62,7 @@ public: void BuildTheAction(int argc, char **argv) { - //typedef WilsonImplR ImplPolicy; - typedef DomainWallVec5dImplR ImplPolicy; + typedef WilsonImplR ImplPolicy; typedef ScaledShamirFermion FermionAction; typedef typename FermionAction::FermionField FermionField; @@ -71,37 +70,23 @@ public: UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi()); UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); - - - GridCartesian* sUGrid = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(),GridDefaultMpi()); - GridRedBlackCartesian* sUrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid); - - FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls,UGrid); - FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls,UGrid); - - /* FGrid = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid); FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); - */ - // temporarily need a gauge field LatticeGaugeField U(UGrid); // Gauge action double beta = 4.0; - WilsonGaugeActionR Iaction(beta); + WilsonGaugeActionR Waction(beta); Real mass = 0.04; Real pv = 1.0; RealD M5 = 1.5; RealD scale = 2.0; - FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5,scale); - FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5,scale); - - std::cout << GridLogMessage << "Frb Osites: " << FrbGrid->oSites() << std::endl; - std::cout << GridLogMessage << "sUGrid Osites: " << sUGrid->oSites() << std::endl; + FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale); + FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale); double StoppingCondition = 1.0e-8; double MaxCGIterations = 10000; @@ -109,7 +94,7 @@ public: TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); // Set smearing (true/false), default: false - Nf2.is_smeared = false; + Nf2.is_smeared = true; // Collect actions // here an example of 2 level integration @@ -120,7 +105,7 @@ public: // step that is 4 times finer // than the previous level ActionLevel Level2(4); - Level2.push_back(&Iaction); + Level2.push_back(&Waction); TheAction.push_back(Level1); TheAction.push_back(Level2); From 69ae817d1c59b94c9e1dfc0860831982bc49b337 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Thu, 8 Dec 2016 16:43:28 +0000 Subject: [PATCH 138/807] Updates for supporting Mobius better --- lib/simd/Grid_avx.h | 27 ++++++++++++++++++++++++++- lib/simd/Grid_avx512.h | 25 +++++++++++++++++++++++++ lib/simd/Grid_generic.h | 16 ++++++++++++++++ lib/simd/Grid_qpx.h | 9 +++++++++ lib/simd/Grid_sse4.h | 25 +++++++++++++++++++++++++ lib/simd/Grid_vector_types.h | 33 +++++++++++++++++++++++++++++++-- lib/simd/Intel512avx.h | 16 ++++++++++++---- lib/simd/Intel512common.h | 11 ++++++----- lib/simd/Intel512double.h | 2 ++ lib/simd/Intel512single.h | 2 ++ 10 files changed, 154 insertions(+), 12 deletions(-) diff --git a/lib/simd/Grid_avx.h b/lib/simd/Grid_avx.h index 36360102..e2729187 100644 --- a/lib/simd/Grid_avx.h +++ b/lib/simd/Grid_avx.h @@ -213,6 +213,29 @@ namespace Optimization { } }; + struct MultRealPart{ + inline __m256 operator()(__m256 a, __m256 b){ + __m256 ymm0; + ymm0 = _mm256_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(2,2,0,0)); // ymm0 <- ar ar, + return _mm256_mul_ps(ymm0,b); // ymm0 <- ar bi, ar br + } + inline __m256d operator()(__m256d a, __m256d b){ + __m256d ymm0; + ymm0 = _mm256_shuffle_pd(a,a,0x0); // ymm0 <- ar ar, ar,ar b'00,00 + return _mm256_mul_pd(ymm0,b); // ymm0 <- ar bi, ar br + } + }; + struct MaddRealPart{ + inline __m256 operator()(__m256 a, __m256 b, __m256 c){ + __m256 ymm0 = _mm256_moveldup_ps(a); // ymm0 <- ar ar, + _mm256_add_ps(_mm256_mul_ps( ymm0, b),c); + } + inline __m256d operator()(__m256d a, __m256d b, __m256d c){ + __m256d ymm0 = _mm256_shuffle_pd( a, a, 0x0 ); + return _mm256_add_pd(_mm256_mul_pd( ymm0, b),c); + } + }; + struct MultComplex{ // Complex float inline __m256 operator()(__m256 a, __m256 b){ @@ -627,7 +650,9 @@ namespace Optimization { typedef Optimization::Sub SubSIMD; typedef Optimization::Div DivSIMD; typedef Optimization::Mult MultSIMD; - typedef Optimization::MultComplex MultComplexSIMD; + typedef Optimization::MultComplex MultComplexSIMD; + typedef Optimization::MultRealPart MultRealPartSIMD; + typedef Optimization::MaddRealPart MaddRealPartSIMD; typedef Optimization::Conj ConjSIMD; typedef Optimization::TimesMinusI TimesMinusISIMD; typedef Optimization::TimesI TimesISIMD; diff --git a/lib/simd/Grid_avx512.h b/lib/simd/Grid_avx512.h index d6531d57..ebf99e16 100644 --- a/lib/simd/Grid_avx512.h +++ b/lib/simd/Grid_avx512.h @@ -189,6 +189,29 @@ namespace Optimization { // 2mul,4 mac +add+sub = 8 flop type insns // 3shuf + 2 (+shuf) = 5/6 simd perm and 1/2 the load. + struct MultRealPart{ + inline __m512 operator()(__m512 a, __m512 b){ + __m512 ymm0; + ymm0 = _mm512_moveldup_ps(a); // ymm0 <- ar ar, + return _mm512_mul_ps(ymm0,b); // ymm0 <- ar bi, ar br + } + inline __m512d operator()(__m512d a, __m512d b){ + __m512d ymm0; + ymm0 = _mm512_shuffle_pd(a,a,0x00); // ymm0 <- ar ar, ar,ar b'00,00 + return _mm512_mul_pd(ymm0,b); // ymm0 <- ar bi, ar br + } + }; + struct MaddRealPart{ + inline __m512 operator()(__m512 a, __m512 b, __m512 c){ + __m512 ymm0 = _mm512_moveldup_ps(a); // ymm0 <- ar ar, + return _mm512_fmadd_ps( ymm0, b, c); + } + inline __m512d operator()(__m512d a, __m512d b, __m512d c){ + __m512d ymm0 = _mm512_shuffle_pd( a, a, 0x00 ); + return _mm512_fmadd_pd( ymm0, b, c); + } + }; + struct MultComplex{ // Complex float inline __m512 operator()(__m512 a, __m512 b){ @@ -501,6 +524,8 @@ namespace Optimization { typedef Optimization::Mult MultSIMD; typedef Optimization::Div DivSIMD; typedef Optimization::MultComplex MultComplexSIMD; + typedef Optimization::MultRealPart MultRealPartSIMD; + typedef Optimization::MaddRealPart MaddRealPartSIMD; typedef Optimization::Conj ConjSIMD; typedef Optimization::TimesMinusI TimesMinusISIMD; typedef Optimization::TimesI TimesISIMD; diff --git a/lib/simd/Grid_generic.h b/lib/simd/Grid_generic.h index 62c78afb..91e9cda2 100644 --- a/lib/simd/Grid_generic.h +++ b/lib/simd/Grid_generic.h @@ -224,6 +224,21 @@ namespace Optimization { #define cmul(a, b, c, i)\ c[i] = a[i]*b[i] - a[i+1]*b[i+1];\ c[i+1] = a[i]*b[i+1] + a[i+1]*b[i]; + + struct MultRealPart{ + template + inline vec operator()(vec a, vec b){ + vec out; + + VECTOR_FOR(i, W::c, 1) + { + out.v[2*i] = a[2*i]*b[2*i]; + out.v[2*i+1] = a[2*i]*b[2*i+1]; + } + return out; + }; + }; + struct MultComplex{ // Complex @@ -456,6 +471,7 @@ namespace Optimization { typedef Optimization::Div DivSIMD; typedef Optimization::Mult MultSIMD; typedef Optimization::MultComplex MultComplexSIMD; + typedef Optimization::MultRealPart MultRealPartSIMD; typedef Optimization::Conj ConjSIMD; typedef Optimization::TimesMinusI TimesMinusISIMD; typedef Optimization::TimesI TimesISIMD; diff --git a/lib/simd/Grid_qpx.h b/lib/simd/Grid_qpx.h index bc86291d..99a9ea68 100644 --- a/lib/simd/Grid_qpx.h +++ b/lib/simd/Grid_qpx.h @@ -220,6 +220,14 @@ namespace Optimization { } }; + struct MultRealPart{ + // Complex double + inline vector4double operator()(vector4double a, vector4double b){ + // return vec_xmul(b, a); + return vec_xmul(a, b); + } + FLOAT_WRAP_2(operator(), inline) + }; struct MultComplex{ // Complex double inline vector4double operator()(vector4double a, vector4double b){ @@ -430,6 +438,7 @@ typedef Optimization::Sub SubSIMD; typedef Optimization::Mult MultSIMD; typedef Optimization::Div DivSIMD; typedef Optimization::MultComplex MultComplexSIMD; +typedef Optimization::MultRealPart MultRealPartSIMD; typedef Optimization::Conj ConjSIMD; typedef Optimization::TimesMinusI TimesMinusISIMD; typedef Optimization::TimesI TimesISIMD; diff --git a/lib/simd/Grid_sse4.h b/lib/simd/Grid_sse4.h index 560eda11..abd688ab 100644 --- a/lib/simd/Grid_sse4.h +++ b/lib/simd/Grid_sse4.h @@ -177,6 +177,29 @@ namespace Optimization { } }; + struct MultRealPart{ + inline __m128 operator()(__m128 a, __m128 b){ + __m128 ymm0; + ymm0 = _mm_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(2,2,0,0)); // ymm0 <- ar ar, + return _mm_mul_ps(ymm0,b); // ymm0 <- ar bi, ar br + } + inline __m128d operator()(__m128d a, __m128d b){ + __m128d ymm0; + ymm0 = _mm_shuffle_pd(a,a,0x0); // ymm0 <- ar ar, ar,ar b'00,00 + return _mm_mul_pd(ymm0,b); // ymm0 <- ar bi, ar br + } + }; + struct MaddRealPart{ + inline __m128 operator()(__m128 a, __m128 b, __m128 c){ + __m128 ymm0 = _mm_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(2,2,0,0)); // ymm0 <- ar ar, + _mm_add_ps(_mm_mul_ps( ymm0, b),c); + } + inline __m128d operator()(__m128d a, __m128d b, __m128 c){ + __m128d ymm0 = _mm_shuffle_pd( a, a, 0x0 ); + return _mm_add_pd(_mm_mul_pd( ymm0, b),c); + } + }; + struct MultComplex{ // Complex float inline __m128 operator()(__m128 a, __m128 b){ @@ -415,6 +438,8 @@ namespace Optimization { typedef Optimization::Div DivSIMD; typedef Optimization::Mult MultSIMD; typedef Optimization::MultComplex MultComplexSIMD; + typedef Optimization::MultRealPart MultRealPartSIMD; + typedef Optimization::MaddRealPart MaddRealPartSIMD; typedef Optimization::Conj ConjSIMD; typedef Optimization::TimesMinusI TimesMinusISIMD; typedef Optimization::TimesI TimesISIMD; diff --git a/lib/simd/Grid_vector_types.h b/lib/simd/Grid_vector_types.h index 42f28b34..8a6ab2e7 100644 --- a/lib/simd/Grid_vector_types.h +++ b/lib/simd/Grid_vector_types.h @@ -101,6 +101,11 @@ template using IfNotInteger = Invoke +Out trinary(Input1 src_1, Input2 src_2, Input3 src_3, Operation op) { + return op(src_1, src_2, src_3); +} + template Out binary(Input1 src_1, Input2 src_2, Operation op) { return op(src_1, src_2); @@ -178,6 +183,7 @@ class Grid_simd { const Grid_simd *__restrict__ r) { *y = (*l) * (*r); } + friend inline void sub(Grid_simd *__restrict__ y, const Grid_simd *__restrict__ l, const Grid_simd *__restrict__ r) { @@ -188,7 +194,6 @@ class Grid_simd { const Grid_simd *__restrict__ r) { *y = (*l) + (*r); } - friend inline void mac(Grid_simd *__restrict__ y, const Scalar_type *__restrict__ a, const Grid_simd *__restrict__ x) { @@ -260,7 +265,7 @@ class Grid_simd { } //////////////////////////// - // opreator scalar * simd + // operator scalar * simd //////////////////////////// friend inline Grid_simd operator*(const Scalar_type &a, Grid_simd b) { Grid_simd va; @@ -433,6 +438,11 @@ inline void vbroadcast(Grid_simd &ret,const Grid_simd &src,int lane){ S* typepun =(S*) &src; vsplat(ret,typepun[lane]); } +template =0> +inline void rbroadcast(Grid_simd &ret,const Grid_simd &src,int lane){ + S* typepun =(S*) &src; + ret.v = unary(real(typepun[lane]), VsplatSIMD()); +} /////////////////////// // Splat @@ -449,6 +459,10 @@ template inline void vsplat(Grid_simd &ret, EnableIf, S> c) { vsplat(ret, real(c), imag(c)); } +template +inline void rsplat(Grid_simd &ret, EnableIf, S> c) { + vsplat(ret, real(c), real(c)); +} // if real fill with a, if complex fill with a in the real part (first function // above) @@ -550,6 +564,21 @@ inline Grid_simd operator-(Grid_simd a, Grid_simd b) { return ret; }; +// Distinguish between complex types and others +template = 0> +inline Grid_simd real_mult(Grid_simd a, Grid_simd b) { + Grid_simd ret; + ret.v = binary(a.v, b.v, MultRealPartSIMD()); + return ret; +}; +template = 0> +inline Grid_simd real_madd(Grid_simd a, Grid_simd b, Grid_simd c) { + Grid_simd ret; + ret.v = trinary(a.v, b.v, c.v, MaddRealPartSIMD()); + return ret; +}; + + // Distinguish between complex types and others template = 0> inline Grid_simd operator*(Grid_simd a, Grid_simd b) { diff --git a/lib/simd/Intel512avx.h b/lib/simd/Intel512avx.h index 19157db4..7b5964ad 100644 --- a/lib/simd/Intel512avx.h +++ b/lib/simd/Intel512avx.h @@ -95,10 +95,14 @@ Author: paboyle #define VIDUPd(SRC,DEST) "vpshufd $0xee," #SRC"," #DEST ";\n" // 32 bit level: 3,2,3,2 #define VIDUPf(SRC,DEST) "vmovshdup " #SRC ", " #DEST ";\n" -#define VBCASTRDUPd(OFF,A,DEST) "vbroadcastsd (" #OFF "*16+0)(" #A ")," #DEST ";\n" -#define VBCASTIDUPd(OFF,A,DEST) "vbroadcastsd (" #OFF "*16+8)(" #A ")," #DEST ";\n" -#define VBCASTRDUPf(OFF,PTR,DEST) "vbroadcastss (" #OFF "*8 +0)(" #PTR "), " #DEST ";\n" -#define VBCASTIDUPf(OFF,PTR,DEST) "vbroadcastss (" #OFF "*8 +4)(" #PTR "), " #DEST ";\n" +#define VBCASTRDUPd(OFF,A,DEST) "vbroadcastsd (" #OFF "*16+0)(" #A ")," #DEST ";\n" +#define VBCASTIDUPd(OFF,A,DEST) "vbroadcastsd (" #OFF "*16+8)(" #A ")," #DEST ";\n" +#define VBCASTRDUPf(OFF,PTR,DEST) "vbroadcastss (" #OFF "*8 +0)(" #PTR "), " #DEST ";\n" +#define VBCASTIDUPf(OFF,PTR,DEST) "vbroadcastss (" #OFF "*8 +4)(" #PTR "), " #DEST ";\n" +#define VBCASTCDUPf(OFF,A,DEST) "vbroadcastsd (" #OFF "*64 )(" #A ")," #DEST ";\n" +#define VBCASTZDUPf(OFF,A,DEST) "vbroadcastf32x4 (" #OFF "*64 )(" #A ")," #DEST ";\n" +#define VBCASTCDUP(OFF,A,DEST) VBCASTCDUPf(OFF,A,DEST) +#define VBCASTZDUP(OFF,A,DEST) VBCASTZDUPf(OFF,A,DEST) #define VMADDSUBf(A,B,accum) "vfmaddsub231ps " #A "," #B "," #accum ";\n" #define VMADDSUBd(A,B,accum) "vfmaddsub231pd " #A "," #B "," #accum ";\n" @@ -106,11 +110,15 @@ Author: paboyle #define VMADDSUBMEMd(O,P,B,accum) "vfmaddsub231pd " #O"*64("#P "),"#B "," #accum ";\n" +#define VMADDRDUPf(O,P,B,accum) "vfmadd231ps (" #O"*8+0)("#P "){1to16},"#B "," #accum ";\n" +#define VMADDIDUPf(O,P,B,accum) "vfmadd231ps (" #O"*8+4)("#P "){1to16},"#B "," #accum ";\n" #define VMADDSUBRDUPf(O,P,B,accum) "vfmaddsub231ps (" #O"*8+0)("#P "){1to16},"#B "," #accum ";\n" #define VMADDSUBIDUPf(O,P,B,accum) "vfmaddsub231ps (" #O"*8+4)("#P "){1to16},"#B "," #accum ";\n" #define VMULRDUPf(O,P,B,accum) "vmulps (" #O"*8+0)("#P "){1to16},"#B "," #accum ";\n" #define VMULIDUPf(O,P,B,accum) "vmulps (" #O"*8+4)("#P "){1to16},"#B "," #accum ";\n" +#define VMADDRDUPd(O,P,B,accum) "vfmadd231pd (" #O"*16+0)("#P "){1to8},"#B "," #accum ";\n" +#define VMADDIDUPd(O,P,B,accum) "vfmadd231pd (" #O"*16+8)("#P "){1to8},"#B "," #accum ";\n" #define VMADDSUBRDUPd(O,P,B,accum) "vfmaddsub231pd (" #O"*16+0)("#P "){1to8},"#B "," #accum ";\n" #define VMADDSUBIDUPd(O,P,B,accum) "vfmaddsub231pd (" #O"*16+8)("#P "){1to8},"#B "," #accum ";\n" #define VMULRDUPd(O,P,B,accum) "vmulpd (" #O"*16+0)("#P "){1to8},"#B "," #accum ";\n" diff --git a/lib/simd/Intel512common.h b/lib/simd/Intel512common.h index cfa20c26..e69e541c 100644 --- a/lib/simd/Intel512common.h +++ b/lib/simd/Intel512common.h @@ -87,7 +87,8 @@ Author: paboyle VACCTIMESMINUSI1d(A,ACC,tmp) \ VACCTIMESMINUSI2d(A,ACC,tmp) -#define LOAD64i(A,ptr) __asm__ ( "movq %0, %" #A : : "r"(ptr) : #A ); +#define LOAD64a(A,ptr) "movq %0, %" #A : : "r"(ptr) : #A +#define LOAD64i(A,ptr) __asm__ ( LOAD64a(A,ptr)); #define LOAD64(A,ptr) LOAD64i(A,ptr) #define VMOVf(A,DEST) "vmovaps " #A ", " #DEST ";\n" @@ -108,8 +109,8 @@ Author: paboyle //"vprefetche0 "#O"*64("#A");\n" "vprefetche1 ("#O"+12)*64("#A");\n" // "clevict0 "#O"*64("#A");\n" -#define VLOADf(OFF,PTR,DEST) "vmovaps " #OFF "*64(" #PTR "), " #DEST ";\n" -#define VLOADd(OFF,PTR,DEST) "vmovapd " #OFF "*64(" #PTR "), " #DEST ";\n" +#define VLOADf(OFF,PTR,DEST) "vmovups " #OFF "*64(" #PTR "), " #DEST ";\n" +#define VLOADd(OFF,PTR,DEST) "vmovupd " #OFF "*64(" #PTR "), " #DEST ";\n" #define VADDf(A,B,DEST) "vaddps " #A "," #B "," #DEST ";\n" #define VADDd(A,B,DEST) "vaddpd " #A "," #B "," #DEST ";\n" @@ -143,8 +144,8 @@ Author: paboyle #define VSTOREf(OFF,PTR,SRC) "vmovntps " #SRC "," #OFF "*64(" #PTR ")" ";\n" #define VSTOREd(OFF,PTR,SRC) "vmovntpd " #SRC "," #OFF "*64(" #PTR ")" ";\n" #else -#define VSTOREf(OFF,PTR,SRC) "vmovaps " #SRC "," #OFF "*64(" #PTR ")" ";\n" -#define VSTOREd(OFF,PTR,SRC) "vmovapd " #SRC "," #OFF "*64(" #PTR ")" ";\n" +#define VSTOREf(OFF,PTR,SRC) "vmovups " #SRC "," #OFF "*64(" #PTR ")" ";\n" +#define VSTOREd(OFF,PTR,SRC) "vmovupd " #SRC "," #OFF "*64(" #PTR ")" ";\n" #endif // Swaps Re/Im ; could unify this with IMCI diff --git a/lib/simd/Intel512double.h b/lib/simd/Intel512double.h index 224c593d..632b5639 100644 --- a/lib/simd/Intel512double.h +++ b/lib/simd/Intel512double.h @@ -144,10 +144,12 @@ Author: paboyle #define VMADDSUBMEM(O,P,B,accum) VMADDSUBMEMd(O,P,B,accum) #define VMADDMEM(O,P,B,accum) VMADDMEMd(O,P,B,accum) #define VMULMEM(O,P,B,accum) VMULMEMd(O,P,B,accum) +#undef VMADDRDUP #undef VMADDSUBRDUP #undef VMADDSUBIDUP #undef VMULRDUP #undef VMULIDUP +#define VMADDRDUP(O,P,B,accum) VMADDRDUPd(O,P,B,accum) #define VMADDSUBRDUP(O,P,B,accum) VMADDSUBRDUPd(O,P,B,accum) #define VMADDSUBIDUP(O,P,B,accum) VMADDSUBIDUPd(O,P,B,accum) #define VMULRDUP(O,P,B,accum) VMULRDUPd(O,P,B,accum) diff --git a/lib/simd/Intel512single.h b/lib/simd/Intel512single.h index 3fa47668..ed135651 100644 --- a/lib/simd/Intel512single.h +++ b/lib/simd/Intel512single.h @@ -144,10 +144,12 @@ Author: paboyle #define VMADDMEM(O,P,B,accum) VMADDMEMf(O,P,B,accum) #define VMULMEM(O,P,B,accum) VMULMEMf(O,P,B,accum) +#undef VMADDRDUP #undef VMADDSUBRDUP #undef VMADDSUBIDUP #undef VMULRDUP #undef VMULIDUP +#define VMADDRDUP(O,P,B,accum) VMADDRDUPf(O,P,B,accum) #define VMADDSUBRDUP(O,P,B,accum) VMADDSUBRDUPf(O,P,B,accum) #define VMADDSUBIDUP(O,P,B,accum) VMADDSUBIDUPf(O,P,B,accum) #define VMULRDUP(O,P,B,accum) VMULRDUPf(O,P,B,accum) From 7a61feb6d3c49637ab3afb4182a9915734ba6e48 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Thu, 8 Dec 2016 16:58:01 +0000 Subject: [PATCH 139/807] Allocator added with caching for Linux VM subsystem optimisation --- lib/AlignedAllocator.cc | 65 +++++++++++++++++++++++++++++++++++++++++ lib/AlignedAllocator.h | 49 ++++++++++++++++++++++--------- 2 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 lib/AlignedAllocator.cc diff --git a/lib/AlignedAllocator.cc b/lib/AlignedAllocator.cc new file mode 100644 index 00000000..9df4ec1c --- /dev/null +++ b/lib/AlignedAllocator.cc @@ -0,0 +1,65 @@ + + + +#include + +namespace Grid { + +int PointerCache::victim; + + PointerCache::PointerCacheEntry PointerCache::Entries[PointerCache::Ncache]; + +void *PointerCache::Insert(void *ptr,size_t bytes) { + + if (bytes < 4096 ) return NULL; + +#ifdef _OPENMP + assert(omp_in_parallel()==0); +#endif + void * ret = NULL; + int v = -1; + + for(int e=0;e namespace Grid { + class PointerCache { + private: + + static const int Ncache=8; + static int victim; + + typedef struct { + void *address; + size_t bytes; + int valid; + } PointerCacheEntry; + + static PointerCacheEntry Entries[Ncache]; + + public: + + + static void *Insert(void *ptr,size_t bytes) ; + static void *Lookup(size_t bytes) ; + + }; + //////////////////////////////////////////////////////////////////// // A lattice of something, but assume the something is SIMDized. //////////////////////////////////////////////////////////////////// + template class alignedAllocator { public: @@ -66,27 +89,27 @@ public: pointer allocate(size_type __n, const void* _p= 0) { + size_type bytes = __n*sizeof(_Tp); + + _Tp *ptr = (_Tp *) PointerCache::Lookup(bytes); + #ifdef HAVE_MM_MALLOC_H - _Tp * ptr = (_Tp *) _mm_malloc(__n*sizeof(_Tp),128); + if ( ptr == (_Tp *) NULL ) ptr = (_Tp *) _mm_malloc(bytes,128); #else - _Tp * ptr = (_Tp *) memalign(128,__n*sizeof(_Tp)); + if ( ptr == (_Tp *) NULL ) ptr = (_Tp *) memalign(128,bytes); #endif - _Tp tmp; -#ifdef GRID_NUMA -#pragma omp parallel for schedule(static) - for(int i=0;i<__n;i++){ - ptr[i]=tmp; - } -#endif return ptr; } - void deallocate(pointer __p, size_type) { + void deallocate(pointer __p, size_type __n) { + size_type bytes = __n * sizeof(_Tp); + pointer __freeme = (pointer)PointerCache::Insert((void *)__p,bytes); + #ifdef HAVE_MM_MALLOC_H - _mm_free((void *)__p); + if ( __freeme ) _mm_free((void *)__freeme); #else - free((void *)__p); + if ( __freeme ) free((void *)__freeme); #endif } void construct(pointer __p, const _Tp& __val) { }; From 83fa038bdfb9fbaf9ecbeca0d7150a7dfc903edb Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Thu, 8 Dec 2016 16:58:42 +0000 Subject: [PATCH 140/807] Streaming stores --- lib/Stencil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Stencil.h b/lib/Stencil.h index 5c3a5ef9..89533b82 100644 --- a/lib/Stencil.h +++ b/lib/Stencil.h @@ -113,7 +113,7 @@ Gather_plane_simple_table (std::vector >& table,const Lattice { PARALLEL_FOR_LOOP for(int i=0;i Date: Thu, 8 Dec 2016 17:00:32 +0000 Subject: [PATCH 141/807] Ready for sim --- benchmarks/Benchmark_mooee.cc | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/benchmarks/Benchmark_mooee.cc b/benchmarks/Benchmark_mooee.cc index dfaea627..e8f0d16b 100644 --- a/benchmarks/Benchmark_mooee.cc +++ b/benchmarks/Benchmark_mooee.cc @@ -113,6 +113,22 @@ int main (int argc, char ** argv) std::cout<Barrier(); \ + t0=usecond(); \ + for(int i=0;iBarrier(); \ + Dw.CayleyReport(); \ + std::cout< Date: Thu, 8 Dec 2016 17:28:28 +0000 Subject: [PATCH 142/807] Lots of debug on performance Mobius --- lib/qcd/action/fermion/CayleyFermion5D.cc | 34 +- lib/qcd/action/fermion/CayleyFermion5D.h | 5 + lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 337 +++++++++++++++---- lib/qcd/action/fermion/FermionOperator.h | 2 + lib/qcd/action/fermion/WilsonFermion.cc | 4 +- lib/qcd/action/fermion/WilsonFermion.h | 3 + lib/qcd/action/fermion/WilsonFermion5D.cc | 3 +- lib/qcd/action/fermion/WilsonFermion5D.h | 3 + 8 files changed, 304 insertions(+), 87 deletions(-) diff --git a/lib/qcd/action/fermion/CayleyFermion5D.cc b/lib/qcd/action/fermion/CayleyFermion5D.cc index b8e98dce..d8978890 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.cc +++ b/lib/qcd/action/fermion/CayleyFermion5D.cc @@ -54,12 +54,11 @@ template void CayleyFermion5D::Dminus(const FermionField &psi, FermionField &chi) { int Ls=this->Ls; - FermionField tmp(psi._grid); - this->DW(psi,tmp,DaggerNo); + this->DW(psi,this->tmp(),DaggerNo); for(int s=0;stmp(),s,s);// chi = (1-c[s] D_W) psi } } @@ -87,8 +86,8 @@ template void CayleyFermion5D::CayleyReport(void) std::cout << GridLogMessage << "CayleyFermion5D Number of MooeeInv Calls : " << MooeeInvCalls << std::endl; std::cout << GridLogMessage << "CayleyFermion5D ComputeTime/Calls : " << MooeeInvTime / MooeeInvCalls << " us" << std::endl; - // Flops = 9*12*Ls*vol/2 - RealD mflops = 9.0*12*volume*MooeeInvCalls/MooeeInvTime/2; // 2 for red black counting + // Flops = MADD * Ls *Ls *4dvol * spin/colour/complex + RealD mflops = 2.0*24*this->Ls*volume*MooeeInvCalls/MooeeInvTime/2; // 2 for red black counting std::cout << GridLogMessage << "Average mflops/s per call : " << mflops << std::endl; std::cout << GridLogMessage << "Average mflops/s per call per rank : " << mflops/NP << std::endl; } @@ -110,12 +109,11 @@ template void CayleyFermion5D::DminusDag(const FermionField &psi, FermionField &chi) { int Ls=this->Ls; - FermionField tmp(psi._grid); - this->DW(psi,tmp,DaggerYes); + this->DW(psi,this->tmp(),DaggerYes); for(int s=0;stmp(),s,s);// chi = (1-c[s] D_W) psi } } template @@ -138,6 +136,7 @@ void CayleyFermion5D::Meooe5D (const FermionField &psi, FermionField &D lower[0] =-mass*lower[0]; M5D(psi,psi,Din,lower,diag,upper); } +// FIXME Redunant with the above routine; check this and eliminate template void CayleyFermion5D::Meo5D (const FermionField &psi, FermionField &chi) { int Ls=this->Ls; @@ -259,36 +258,33 @@ template void CayleyFermion5D::Meooe (const FermionField &psi, FermionField &chi) { int Ls=this->Ls; - FermionField tmp(psi._grid); - Meooe5D(psi,tmp); + Meooe5D(psi,this->tmp()); if ( psi.checkerboard == Odd ) { - this->DhopEO(tmp,chi,DaggerNo); + this->DhopEO(this->tmp(),chi,DaggerNo); } else { - this->DhopOE(tmp,chi,DaggerNo); + this->DhopOE(this->tmp(),chi,DaggerNo); } } template void CayleyFermion5D::MeooeDag (const FermionField &psi, FermionField &chi) { - FermionField tmp(psi._grid); // Apply 4d dslash if ( psi.checkerboard == Odd ) { - this->DhopEO(psi,tmp,DaggerYes); + this->DhopEO(psi,this->tmp(),DaggerYes); } else { - this->DhopOE(psi,tmp,DaggerYes); + this->DhopOE(psi,this->tmp(),DaggerYes); } - MeooeDag5D(tmp,chi); + MeooeDag5D(this->tmp(),chi); } template void CayleyFermion5D::Mdir (const FermionField &psi, FermionField &chi,int dir,int disp){ - FermionField tmp(psi._grid); - Meo5D(psi,tmp); + Meo5D(psi,this->tmp()); // Apply 4d dslash fragment - this->DhopDir(tmp,chi,dir,disp); + this->DhopDir(this->tmp(),chi,dir,disp); } // force terms; five routines; default to Dhop on diagonal template diff --git a/lib/qcd/action/fermion/CayleyFermion5D.h b/lib/qcd/action/fermion/CayleyFermion5D.h index 6fb58234..0eb68034 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.h +++ b/lib/qcd/action/fermion/CayleyFermion5D.h @@ -76,6 +76,11 @@ namespace Grid { std::vector &diag, std::vector &upper); void MooeeInternal(const FermionField &in, FermionField &out,int dag,int inv); + void MooeeInternalAsm(const FermionField &in, FermionField &out, + int LLs, int site, + Vector > &Matp, + Vector > &Matm); + virtual void Instantiatable(void)=0; diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index 35a10de2..29f10b0a 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -34,8 +34,7 @@ Author: paboyle namespace Grid { -namespace QCD { - /* +namespace QCD { /* * Dense matrix versions of routines */ template @@ -126,7 +125,6 @@ PARALLEL_FOR_LOOP for(int v=0;v(hp_00.v); hp_01.v = Optimization::Rotate::tRotate<2>(hp_01.v); @@ -165,42 +160,20 @@ PARALLEL_FOR_LOOP hm_12.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_12.v); } - /* - if ( ss==0) std::cout << " dphi_00 " <::M5Ddag(const FermionField &psi, M5Dtime-=usecond(); PARALLEL_FOR_LOOP for(int ss=0;ssoSites();ss+=LLs){ // adds LLs - +#if 0 alignas(64) SiteHalfSpinor hp; alignas(64) SiteHalfSpinor hm; alignas(64) SiteSpinor fp; @@ -287,9 +260,231 @@ PARALLEL_FOR_LOOP chi[ss+v] = chi[ss+v] +l[v]*fm; } +#else + for(int v=0;v(hp_00.v); + hp_01.v = Optimization::Rotate::tRotate<2>(hp_01.v); + hp_02.v = Optimization::Rotate::tRotate<2>(hp_02.v); + hp_10.v = Optimization::Rotate::tRotate<2>(hp_10.v); + hp_11.v = Optimization::Rotate::tRotate<2>(hp_11.v); + hp_12.v = Optimization::Rotate::tRotate<2>(hp_12.v); + } + if ( vm>=v ) { + hm_00.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_00.v); + hm_01.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_01.v); + hm_02.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_02.v); + hm_10.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_10.v); + hm_11.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_11.v); + hm_12.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_12.v); + } + + Simd p_00 = real_mult(d[v]()()(), phi[ss+v]()(0)(0)) + real_mult(u[v]()()(),hp_00); + Simd p_01 = real_mult(d[v]()()(), phi[ss+v]()(0)(1)) + real_mult(u[v]()()(),hp_01); + Simd p_02 = real_mult(d[v]()()(), phi[ss+v]()(0)(2)) + real_mult(u[v]()()(),hp_02); + Simd p_10 = real_mult(d[v]()()(), phi[ss+v]()(1)(0)) + real_mult(u[v]()()(),hp_10); + Simd p_11 = real_mult(d[v]()()(), phi[ss+v]()(1)(1)) + real_mult(u[v]()()(),hp_11); + Simd p_12 = real_mult(d[v]()()(), phi[ss+v]()(1)(2)) + real_mult(u[v]()()(),hp_12); + + Simd p_20 = real_mult(d[v]()()(), phi[ss+v]()(2)(0)) + real_mult(l[v]()()(),hm_00); + Simd p_21 = real_mult(d[v]()()(), phi[ss+v]()(2)(1)) + real_mult(l[v]()()(),hm_01); + Simd p_22 = real_mult(d[v]()()(), phi[ss+v]()(2)(2)) + real_mult(l[v]()()(),hm_02); + Simd p_30 = real_mult(d[v]()()(), phi[ss+v]()(3)(0)) + real_mult(l[v]()()(),hm_10); + Simd p_31 = real_mult(d[v]()()(), phi[ss+v]()(3)(1)) + real_mult(l[v]()()(),hm_11); + Simd p_32 = real_mult(d[v]()()(), phi[ss+v]()(3)(2)) + real_mult(l[v]()()(),hm_12); + + vstream(chi[ss+v]()(0)(0),p_00); + vstream(chi[ss+v]()(0)(1),p_01); + vstream(chi[ss+v]()(0)(2),p_02); + vstream(chi[ss+v]()(1)(0),p_10); + vstream(chi[ss+v]()(1)(1),p_11); + vstream(chi[ss+v]()(1)(2),p_12); + vstream(chi[ss+v]()(2)(0),p_20); + vstream(chi[ss+v]()(2)(1),p_21); + vstream(chi[ss+v]()(2)(2),p_22); + vstream(chi[ss+v]()(3)(0),p_30); + vstream(chi[ss+v]()(3)(1),p_31); + vstream(chi[ss+v]()(3)(2),p_32); + } +#endif } M5Dtime+=usecond(); } + + +#include +#include +#include + + +template +void CayleyFermion5D::MooeeInternalAsm(const FermionField &psi, FermionField &chi, + int LLs, int site, + Vector > &Matp, + Vector > &Matm) +{ +#if 0 + { + SiteHalfSpinor BcastP; + SiteHalfSpinor BcastM; + SiteHalfSpinor SiteChiP; + SiteHalfSpinor SiteChiM; + + // Ls*Ls * 2 * 12 * vol flops + for(int s1=0;s1); + for(int s1=0;s1 void CayleyFermion5D::MooeeInternal(const FermionField &psi, FermionField &chi,int dag, int inv) { @@ -342,37 +537,38 @@ void CayleyFermion5D::MooeeInternal(const FermionField &psi, FermionField for(int s1=0;s1 SitePplus(LLs); - Vector SitePminus(LLs); - Vector SiteChiP(LLs); - Vector SiteChiM(LLs); - Vector SiteChi(LLs); - - SiteHalfSpinor BcastP; - SiteHalfSpinor BcastM; + std::vector SitePplus(LLs); + std::vector SitePminus(LLs); + std::vector SiteChiP(LLs); + std::vector SiteChiM(LLs); + std::vector SiteChi(LLs); #pragma omp for for(auto site=0;site::MooeeInternal(const FermionField &psi, FermionField SiteChiP[s1]=SiteChiP[s1]+Matp[LLs*s+s1]*BcastP; SiteChiM[s1]=SiteChiM[s1]+Matm[LLs*s+s1]*BcastM; } - s++; - }} + s++; + } + } for(int s=0;s::MooeeInternal(const FermionField &psi, FermionField accumRecon5m(SiteChi[s],SiteChiM[s]); chi[lex] = SiteChi[s]*0.5; } + }} +#else + PARALLEL_FOR_LOOP + for(auto site=0;site::WilsonFermion(GaugeField &_Umu, GridCartesian &Fgrid, LebesgueEvenOdd(_cbgrid), Umu(&Fgrid), UmuEven(&Hgrid), - UmuOdd(&Hgrid) { + UmuOdd(&Hgrid), + _tmp(&Hgrid) +{ // Allocate the required comms buffer ImportGauge(_Umu); } diff --git a/lib/qcd/action/fermion/WilsonFermion.h b/lib/qcd/action/fermion/WilsonFermion.h index 40fbd1bf..933be732 100644 --- a/lib/qcd/action/fermion/WilsonFermion.h +++ b/lib/qcd/action/fermion/WilsonFermion.h @@ -58,6 +58,9 @@ class WilsonFermion : public WilsonKernels, public WilsonFermionStatic { GridBase *FermionGrid(void) { return _grid; } GridBase *FermionRedBlackGrid(void) { return _cbgrid; } + FermionField _tmp; + FermionField &tmp(void) { return _tmp; } + ////////////////////////////////////////////////////////////////// // override multiply; cut number routines if pass dagger argument // and also make interface more uniformly consistent diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/lib/qcd/action/fermion/WilsonFermion5D.cc index d2ac96e3..d70c98c3 100644 --- a/lib/qcd/action/fermion/WilsonFermion5D.cc +++ b/lib/qcd/action/fermion/WilsonFermion5D.cc @@ -60,7 +60,8 @@ WilsonFermion5D::WilsonFermion5D(GaugeField &_Umu, UmuEven(_FourDimRedBlackGrid), UmuOdd (_FourDimRedBlackGrid), Lebesgue(_FourDimGrid), - LebesgueEvenOdd(_FourDimRedBlackGrid) + LebesgueEvenOdd(_FourDimRedBlackGrid), + _tmp(&FiveDimRedBlackGrid) { if (Impl::LsVectorised) { diff --git a/lib/qcd/action/fermion/WilsonFermion5D.h b/lib/qcd/action/fermion/WilsonFermion5D.h index ffb5c58e..fb4fa925 100644 --- a/lib/qcd/action/fermion/WilsonFermion5D.h +++ b/lib/qcd/action/fermion/WilsonFermion5D.h @@ -74,6 +74,9 @@ namespace QCD { typedef WilsonKernels Kernels; PmuStat stat; + FermionField _tmp; + FermionField &tmp(void) { return _tmp; } + void Report(void); void ZeroCounters(void); double DhopCalls; From 0091b50f499c17b17208febe24b466aa9cf8ed97 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Fri, 9 Dec 2016 22:51:32 +0000 Subject: [PATCH 143/807] Zmobius working -- not asm yet --- lib/qcd/action/fermion/CayleyFermion5D.cc | 86 +++++- lib/qcd/action/fermion/CayleyFermion5D.h | 18 ++ lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 305 ++++++++++++------- 3 files changed, 303 insertions(+), 106 deletions(-) diff --git a/lib/qcd/action/fermion/CayleyFermion5D.cc b/lib/qcd/action/fermion/CayleyFermion5D.cc index d8978890..781380e5 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.cc +++ b/lib/qcd/action/fermion/CayleyFermion5D.cc @@ -29,6 +29,7 @@ Author: paboyle *************************************************************************************/ /* END LEGAL */ +#include #include @@ -48,7 +49,8 @@ namespace QCD { FourDimGrid, FourDimRedBlackGrid,_M5,p), mass(_mass) - { } + { + } template void CayleyFermion5D::Dminus(const FermionField &psi, FermionField &chi) @@ -455,9 +457,91 @@ void CayleyFermion5D::SetCoefficientsInternal(RealD zolo_hi,std::vectorMooeeInternalCompute(0,inv,MatpInv,MatmInv); + this->MooeeInternalCompute(1,inv,MatpInvDag,MatmInvDag); + } +template +void CayleyFermion5D::MooeeInternalCompute(int dag, int inv, + Vector > & Matp, + Vector > & Matm) +{ + int Ls=this->Ls; + + GridBase *grid = this->FermionRedBlackGrid(); + int LLs = grid->_rdimensions[0]; + + if ( LLs == Ls ) return; // Not vectorised in 5th direction + + Eigen::MatrixXcd Pplus = Eigen::MatrixXcd::Zero(Ls,Ls); + Eigen::MatrixXcd Pminus = Eigen::MatrixXcd::Zero(Ls,Ls); + + for(int s=0;s::iscomplex() ) { + sp[l] = PplusMat (l*istride+s1*ostride,s2); + sm[l] = PminusMat(l*istride+s1*ostride,s2); + } else { + // if real + scalar_type tmp; + tmp = PplusMat (l*istride+s1*ostride,s2); + sp[l] = scalar_type(tmp.real(),tmp.real()); + tmp = PminusMat(l*istride+s1*ostride,s2); + sm[l] = scalar_type(tmp.real(),tmp.real()); + } + } + Matp[LLs*s2+s1] = Vp; + Matm[LLs*s2+s1] = Vm; + }} +} + FermOpTemplateInstantiate(CayleyFermion5D); GparityFermOpTemplateInstantiate(CayleyFermion5D); diff --git a/lib/qcd/action/fermion/CayleyFermion5D.h b/lib/qcd/action/fermion/CayleyFermion5D.h index 0eb68034..2392fcf0 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.h +++ b/lib/qcd/action/fermion/CayleyFermion5D.h @@ -33,6 +33,11 @@ namespace Grid { namespace QCD { + template struct switcheroo { static int iscomplex() { return 0; } }; + template<> struct switcheroo { static int iscomplex() { return 1; } }; + template<> struct switcheroo { static int iscomplex() { return 1; } }; + + template class CayleyFermion5D : public WilsonFermion5D { @@ -75,11 +80,18 @@ namespace Grid { std::vector &lower, std::vector &diag, std::vector &upper); + void MooeeInternal(const FermionField &in, FermionField &out,int dag,int inv); + void MooeeInternalCompute(int dag, int inv, Vector > & Matp, Vector > & Matm); + void MooeeInternalAsm(const FermionField &in, FermionField &out, int LLs, int site, Vector > &Matp, Vector > &Matm); + void MooeeInternalZAsm(const FermionField &in, FermionField &out, + int LLs, int site, + Vector > &Matp, + Vector > &Matm); virtual void Instantiatable(void)=0; @@ -117,6 +129,12 @@ namespace Grid { std::vector ueem; std::vector dee; + // Matrices of 5d ee inverse params + Vector > MatpInv; + Vector > MatmInv; + Vector > MatpInvDag; + Vector > MatmInvDag; + // Constructors CayleyFermion5D(GaugeField &_Umu, GridCartesian &FiveDimGrid, diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index 29f10b0a..6d07d5de 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -29,7 +29,7 @@ Author: paboyle *************************************************************************************/ /* END LEGAL */ -#include + #include @@ -343,7 +343,7 @@ void CayleyFermion5D::MooeeInternalAsm(const FermionField &psi, FermionFie Vector > &Matp, Vector > &Matm) { -#if 0 +#ifndef AVX512 { SiteHalfSpinor BcastP; SiteHalfSpinor BcastM; @@ -485,6 +485,177 @@ void CayleyFermion5D::MooeeInternalAsm(const FermionField &psi, FermionFie #endif }; + // Z-mobius version +template +void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionField &chi, + int LLs, int site, Vector > &Matp, Vector > &Matm) +{ +#if 1 + { + SiteHalfSpinor BcastP; + SiteHalfSpinor BcastM; + SiteHalfSpinor SiteChiP; + SiteHalfSpinor SiteChiM; + + // Ls*Ls * 2 * 12 * vol flops + for(int s1=0;s1); + for(int s1=0;s1 void CayleyFermion5D::MooeeInternal(const FermionField &psi, FermionField &chi,int dag, int inv) { @@ -494,118 +665,41 @@ void CayleyFermion5D::MooeeInternal(const FermionField &psi, FermionField chi.checkerboard=psi.checkerboard; - Eigen::MatrixXcd Pplus = Eigen::MatrixXcd::Zero(Ls,Ls); - Eigen::MatrixXcd Pminus = Eigen::MatrixXcd::Zero(Ls,Ls); + Vector > Matp; + Vector > Matm; + Vector > *_Matp; + Vector > *_Matm; - for(int s=0;s > Matp(Ls*LLs); - Vector > Matm(Ls*LLs); + assert(_Matp->size()==Ls*LLs); - for(int s2=0;s2 SitePplus(LLs); - std::vector SitePminus(LLs); - std::vector SiteChiP(LLs); - std::vector SiteChiM(LLs); - std::vector SiteChi(LLs); - -#pragma omp for - for(auto site=0;site::iscomplex() ) { PARALLEL_FOR_LOOP - for(auto site=0;site::MooeeInternal(const Fermion template void CayleyFermion5D::MooeeInternal(const FermionField &psi, FermionField &chi,int dag, int inv); template void CayleyFermion5D::MooeeInternal(const FermionField &psi, FermionField &chi,int dag, int inv); + }} From fe187e9ed3960772417cc49845abb6a18ecdaaf0 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 10 Dec 2016 00:47:48 +0000 Subject: [PATCH 144/807] Compiles and passes under ZMobius with assembler --- lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 194 ++++++++++++------- 1 file changed, 125 insertions(+), 69 deletions(-) diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index 6d07d5de..91ab386a 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -336,7 +336,6 @@ PARALLEL_FOR_LOOP #include #include - template void CayleyFermion5D::MooeeInternalAsm(const FermionField &psi, FermionField &chi, int LLs, int site, @@ -482,6 +481,31 @@ void CayleyFermion5D::MooeeInternalAsm(const FermionField &psi, FermionFie } } } +#undef Chi_00 +#undef Chi_01 +#undef Chi_02 +#undef Chi_10 +#undef Chi_11 +#undef Chi_12 +#undef Chi_20 +#undef Chi_21 +#undef Chi_22 +#undef Chi_30 +#undef Chi_31 +#undef Chi_32 + +#undef BCAST0 +#undef BCAST1 +#undef BCAST2 +#undef BCAST3 +#undef BCAST4 +#undef BCAST5 +#undef BCAST6 +#undef BCAST7 +#undef BCAST8 +#undef BCAST9 +#undef BCAST10 +#undef BCAST11 #endif }; @@ -541,31 +565,31 @@ void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionFi { // pointers // MASK_REGS; -#define Chi_00 %%zmm0 -#define Chi_01 %%zmm1 -#define Chi_02 %%zmm2 -#define Chi_10 %%zmm3 -#define Chi_11 %%zmm4 -#define Chi_12 %%zmm5 -#define Chi_20 %%zmm6 -#define Chi_21 %%zmm7 -#define Chi_22 %%zmm8 -#define Chi_30 %%zmm9 -#define Chi_31 %%zmm10 -#define Chi_32 %%zmm11 +#define Chi_00 %zmm0 +#define Chi_01 %zmm1 +#define Chi_02 %zmm2 +#define Chi_10 %zmm3 +#define Chi_11 %zmm4 +#define Chi_12 %zmm5 +#define Chi_20 %zmm6 +#define Chi_21 %zmm7 +#define Chi_22 %zmm8 +#define Chi_30 %zmm9 +#define Chi_31 %zmm10 +#define Chi_32 %zmm11 -#define BCAST0 %%zmm12 -#define BCAST1 %%zmm13 -#define BCAST2 %%zmm14 -#define BCAST3 %%zmm15 -#define BCAST4 %%zmm16 -#define BCAST5 %%zmm17 -#define BCAST6 %%zmm18 -#define BCAST7 %%zmm19 -#define BCAST8 %%zmm20 -#define BCAST9 %%zmm21 -#define BCAST10 %%zmm22 -#define BCAST11 %%zmm23 +#define BCAST0 %zmm12 +#define BCAST1 %zmm13 +#define BCAST2 %zmm14 +#define BCAST3 %zmm15 +#define BCAST4 %zmm16 +#define BCAST5 %zmm17 +#define BCAST6 %zmm18 +#define BCAST7 %zmm19 +#define BCAST8 %zmm20 +#define BCAST9 %zmm21 +#define BCAST10 %zmm22 +#define BCAST11 %zmm23 int incr=LLs*LLs*sizeof(iSinglet); for(int s1=0;s1::MooeeInternalZAsm(const FermionField &psi, FermionFi uint64_t a2 = (uint64_t)&psi[lex]; for(int l=0; l::MooeeInternalZAsm(const FermionField &psi, FermionFi } } } +#undef Chi_00 +#undef Chi_01 +#undef Chi_02 +#undef Chi_10 +#undef Chi_11 +#undef Chi_12 +#undef Chi_20 +#undef Chi_21 +#undef Chi_22 +#undef Chi_30 +#undef Chi_31 +#undef Chi_32 + +#undef BCAST0 +#undef BCAST1 +#undef BCAST2 +#undef BCAST3 +#undef BCAST4 +#undef BCAST5 +#undef BCAST6 +#undef BCAST7 +#undef BCAST8 +#undef BCAST9 +#undef BCAST10 +#undef BCAST11 + #endif }; From 4a8748636595443642bb4a896006f439e9f5e04b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sat, 10 Dec 2016 21:14:13 +0100 Subject: [PATCH 145/807] Hadrons: a bit of cleaning in the scheduler --- extras/Hadrons/GeneticScheduler.hpp | 176 ++++++++++++++-------------- 1 file changed, 91 insertions(+), 85 deletions(-) diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index 0d0692cc..46272a83 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -40,7 +40,9 @@ template class GeneticScheduler { public: - typedef std::function &)> ObjFunc; + typedef std::vector Gene; + typedef std::pair GenePair; + typedef std::function ObjFunc; struct Parameters { double mutationRate; @@ -53,8 +55,8 @@ public: // destructor virtual ~GeneticScheduler(void) = default; // access - const std::vector & getMinSchedule(void); - int getMinValue(void); + const Gene & getMinSchedule(void); + int getMinValue(void); // breed a new generation void nextGeneration(void); // print population @@ -71,19 +73,20 @@ public: return out; } private: - // randomly initialize population + // evolution steps void initPopulation(void); + void doCrossover(void); + void doMutation(void); // genetic operators - std::vector * select1(void); - std::pair *, std::vector *> select2(void); - void crossover(void); - void mutation(void); + GenePair selectPair(void); + void crossover(Gene &c, const Gene &p1, const Gene &p2); + void mutation(Gene &m, const Gene &c); private: - Graph &graph_; - const ObjFunc &func_; - const Parameters par_; - std::multimap> population_; - std::mt19937 gen_; + Graph &graph_; + const ObjFunc &func_; + const Parameters par_; + std::multimap population_; + std::mt19937 gen_; }; /****************************************************************************** @@ -102,7 +105,8 @@ GeneticScheduler::GeneticScheduler(Graph &graph, const ObjFunc &func, // access ////////////////////////////////////////////////////////////////////// template -const std::vector & GeneticScheduler::getMinSchedule(void) +const typename GeneticScheduler::Gene & +GeneticScheduler::getMinSchedule(void) { return population_.begin()->second; } @@ -128,7 +132,7 @@ void GeneticScheduler::nextGeneration(void) PARALLEL_FOR_LOOP for (unsigned int i = 0; i < par_.popSize; ++i) { - mutation(); + doMutation(); } LOG(Debug) << "After mutations:\n" << *this << std::endl; @@ -136,7 +140,7 @@ void GeneticScheduler::nextGeneration(void) PARALLEL_FOR_LOOP for (unsigned int i = 0; i < par_.popSize/2; ++i) { - crossover(); + doCrossover(); } LOG(Debug) << "After mating:\n" << *this << std::endl; @@ -148,7 +152,7 @@ void GeneticScheduler::nextGeneration(void) LOG(Debug) << "After grim reaper:\n" << *this << std::endl; } -// randomly initialize population ////////////////////////////////////////////// +// evolution steps ///////////////////////////////////////////////////////////// template void GeneticScheduler::initPopulation(void) { @@ -161,24 +165,50 @@ void GeneticScheduler::initPopulation(void) } } -// genetic operators /////////////////////////////////////////////////////////// template -std::vector * GeneticScheduler::select1(void) +void GeneticScheduler::doCrossover(void) { - std::uniform_int_distribution pdis(0, population_.size() - 1); + auto p = selectPair(); + auto &p1 = *(p.first), &p2 = *(p.second); + Gene c1, c2; - auto it = population_.begin(); - std::advance(it, pdis(gen_)); - - return &(it->second); + crossover(c1, p1, p2); + crossover(c2, p2, p1); + PARALLEL_CRITICAL + { + population_.emplace(func_(c1), c1); + population_.emplace(func_(c2), c2); + } } template -std::pair *, std::vector *> GeneticScheduler::select2(void) +void GeneticScheduler::doMutation(void) +{ + std::uniform_real_distribution mdis(0., 1.); + std::uniform_int_distribution pdis(0, population_.size() - 1); + + if (mdis(gen_) < par_.mutationRate) + { + Gene m; + auto it = population_.begin(); + + std::advance(it, pdis(gen_)); + mutation(m, it->second); + PARALLEL_CRITICAL + { + population_.erase(it); + population_.emplace(func_(m), m); + } + } +} + +// genetic operators /////////////////////////////////////////////////////////// +template +typename GeneticScheduler::GenePair GeneticScheduler::selectPair(void) { std::vector prob; unsigned int ind; - std::vector *p1, *p2; + Gene *p1, *p2; for (auto &c: population_) { @@ -206,76 +236,52 @@ std::pair *, std::vector *> GeneticScheduler::select2(void) } template -void GeneticScheduler::crossover(void) +void GeneticScheduler::crossover(Gene &c, const Gene &p1, const Gene &p2) { - auto p = select2(); - auto &p1 = *(p.first), - &p2 = *(p.second); - std::uniform_int_distribution dis2(0, p1.size() - 1); - unsigned int cut = dis2(gen_); - std::vector c1, c2, buf; + Gene buf; + std::uniform_int_distribution dis(0, p1.size() - 1); + unsigned int cut = dis(gen_); - auto cross = [&buf, cut](std::vector &c, const std::vector &p1, - const std::vector &p2) + c.clear(); + buf = p1; + for (unsigned int i = 0; i < cut; ++i) { - buf = p1; - for (unsigned int i = 0; i < cut; ++i) - { - c.push_back(p2[i]); - buf.erase(std::find(buf.begin(), buf.end(), p2[i])); - } - for (unsigned int i = 0; i < buf.size(); ++i) - { - c.push_back(buf[i]); - } - }; - - cross(c1, p1, p2); - cross(c2, p2, p1); - PARALLEL_CRITICAL + c.push_back(p2[i]); + buf.erase(std::find(buf.begin(), buf.end(), p2[i])); + } + for (unsigned int i = 0; i < buf.size(); ++i) { - population_.emplace(func_(c1), c1); - population_.emplace(func_(c2), c2); + c.push_back(buf[i]); } } template -void GeneticScheduler::mutation(void) +void GeneticScheduler::mutation(Gene &m, const Gene &c) { - std::uniform_real_distribution mdis(0., 1.); + Gene buf; + std::uniform_int_distribution dis(0, c.size() - 1); + unsigned int cut = dis(gen_); + Graph g1 = graph_, g2 = graph_; - if (mdis(gen_) < par_.mutationRate) + for (unsigned int i = 0; i < cut; ++i) { - auto &c = *select1(); - std::uniform_int_distribution cdis(0, c.size() - 1); - unsigned int cut = cdis(gen_); - std::vector buf1, buf2; - Graph g1 = graph_, g2 = graph_; - - for (unsigned int i = 0; i < cut; ++i) - { - g1.removeVertex(c[i]); - } - for (unsigned int i = cut; i < c.size(); ++i) - { - g2.removeVertex(c[i]); - } - if (g1.size() > 0) - { - buf1 = g1.topoSort(gen_); - } - if (g2.size() > 0) - { - buf2 = g2.topoSort(gen_); - } - for (unsigned int i = cut; i < c.size(); ++i) - { - buf2.push_back(buf1[i - cut]); - } - PARALLEL_CRITICAL - { - population_.emplace(func_(buf2), buf2); - } + g1.removeVertex(c[i]); + } + for (unsigned int i = cut; i < c.size(); ++i) + { + g2.removeVertex(c[i]); + } + if (g1.size() > 0) + { + buf = g1.topoSort(gen_); + } + if (g2.size() > 0) + { + m = g2.topoSort(gen_); + } + for (unsigned int i = cut; i < c.size(); ++i) + { + m.push_back(buf[i - cut]); } } From 7bc206511390b532f998b3646a10723f15ce4018 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 12 Dec 2016 04:21:34 +0000 Subject: [PATCH 146/807] Adding report at the end of the DWF HMC tests --- .../Test_hmc_EODWFRatioLsVectorised_Binary.cc | 26 +++++++++++++++---- tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 9 +++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc index 13542e04..a2fb8a8b 100644 --- a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc @@ -63,7 +63,8 @@ public: { typedef DomainWallVec5dImplR ImplPolicy; - typedef ScaledShamirFermion FermionAction; + //typedef ScaledShamirFermion FermionAction; + typedef DomainWallFermion FermionAction; typedef typename FermionAction::FermionField FermionField; const int Ls = 8; @@ -83,15 +84,21 @@ public: LatticeGaugeField U(UGrid); // Gauge action - double beta = 4.0; + double beta = 5.6; WilsonGaugeActionR Waction(beta); Real mass = 0.04; Real pv = 1.0; RealD M5 = 1.5; RealD scale = 2.0; + /* + // Scaled Shamir FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5,scale); FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5,scale); + */ + // Std Domain wall fermion + FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5); + FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5); double StoppingCondition = 1.0e-8; double MaxCGIterations = 10000; @@ -99,7 +106,7 @@ public: TwoFlavourEvenOddRatioPseudoFermionAction Nf2(NumOp, DenOp,CG,CG); // Set smearing (true/false), default: false - Nf2.is_smeared = true; + Nf2.is_smeared = false; // Collect actions // here an example of 2 level integration @@ -140,8 +147,17 @@ public: UGrid, Nsmear, Stout); /////////////////// - Run(argc, argv, Checkpoint, SmearingPolicy); - //Run(argc, argv, Checkpoint); // no smearing + NumOp.ZeroCounters(); + DenOp.ZeroCounters(); + //Run(argc, argv, Checkpoint, SmearingPolicy); + Run(argc, argv, Checkpoint); // no smearing + + + std::cout << GridLogMessage << "Numerator report, Pauli-Villars term : " << std::endl; + NumOp.Report(); + std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl; + DenOp.Report(); + }; }; } diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index 481ff96d..dccad55c 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -135,8 +135,17 @@ public: UGrid, Nsmear, Stout); /////////////////// + NumOp.ZeroCounters(); + DenOp.ZeroCounters(); Run(argc, argv, Checkpoint, SmearingPolicy); //Run(argc, argv, Checkpoint); // no smearing + + + + std::cout << GridLogMessage << "Numerator report, Pauli-Villars term : " << std::endl; + NumOp.Report(); + std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl; + DenOp.Report(); }; }; } From ef72f322d2ec5953118cb450ecce1e98750a20da Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 13 Dec 2016 02:24:20 +0000 Subject: [PATCH 147/807] consistency of tests --- lib/serialisation/TextIO.cc | 22 ++++++--- lib/supported_compilers.h | 49 +++++++++++++++++++ .../Test_hmc_EODWFRatioLsVectorised_Binary.cc | 4 +- tests/hmc/Test_hmc_EODWFRatio_Binary.cc | 24 +++++---- 4 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 lib/supported_compilers.h diff --git a/lib/serialisation/TextIO.cc b/lib/serialisation/TextIO.cc index 9d733099..b27b4f1c 100644 --- a/lib/serialisation/TextIO.cc +++ b/lib/serialisation/TextIO.cc @@ -28,10 +28,14 @@ *************************************************************************************/ /* END LEGAL */ #include +#include using namespace Grid; using namespace std; +#define GRID_TEXT_INDENT 2 //number of spaces for indentation of levels + + // Writer implementation /////////////////////////////////////////////////////// TextWriter::TextWriter(const string &fileName) : file_(fileName, ios::out) @@ -50,9 +54,8 @@ void TextWriter::pop(void) void TextWriter::indent(void) { for (int i = 0; i < level_; ++i) - { - file_ << '\t';//is this portable? - } + for (int t = 0; t < GRID_TEXT_INDENT; t++) + file_ << ' '; }; // Reader implementation /////////////////////////////////////////////////////// @@ -61,7 +64,7 @@ TextReader::TextReader(const string &fileName) file_.open(fileName, ios::in); if (!file_.is_open()) { std::cout << GridLogMessage << "TextReader: Error opening file " << fileName << std::endl; - exit(0);// write better error handling + exit(1);// write better error handling } } @@ -81,12 +84,15 @@ void TextReader::checkIndent(void) for (int i = 0; i < level_; ++i) { + bool check = true; + for (int t = 0; t< GRID_TEXT_INDENT; t++){ file_.get(c); - if (c != '\t') + check = check && isspace(c); + } + if (!check) { - cerr << "TextReader: mismatch on tab " << c << " level " << level_; - cerr << " i "<< i << endl; - abort(); + cerr << "TextReader: mismatch on level " << level_ << std::endl; + exit(1); } } } diff --git a/lib/supported_compilers.h b/lib/supported_compilers.h new file mode 100644 index 00000000..cec68713 --- /dev/null +++ b/lib/supported_compilers.h @@ -0,0 +1,49 @@ + /************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/supported_compilers.h + + Copyright (C) 2016 + + Author: Guido Cossu + + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution directory + *************************************************************************************/ + /* END LEGAL */ + + + +#ifndef COMPILER_CHECK_H +#define COMPILER_CHECK_H + +// exclude unsupported compilers +#if defined(__clang__) + #define CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) + #if CLANG_VERSION < 30800 + #error "unsupported Clang version" + #endif +#elif defined(__GNUC__) + #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) + #if GCC_VERSION < 40800 + #error "unsupported GCC version" + #endif +#endif + + +#endif diff --git a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc index a2fb8a8b..ee2df810 100644 --- a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc @@ -175,10 +175,10 @@ int main(int argc, char **argv) { // Seeds for the random number generators std::vector SerSeed({1, 2, 3, 4, 5}); - std::vector ParSeed({6, 7, 8, 9, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); TheHMC.RNGSeeds(SerSeed, ParSeed); - TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + TheHMC.MDparameters.set(40, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc index dccad55c..49d4e94d 100644 --- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc +++ b/tests/hmc/Test_hmc_EODWFRatio_Binary.cc @@ -63,7 +63,8 @@ public: { typedef WilsonImplR ImplPolicy; - typedef ScaledShamirFermion FermionAction; + //typedef ScaledShamirFermion FermionAction; + typedef DomainWallFermionR FermionAction; typedef typename FermionAction::FermionField FermionField; const int Ls = 8; @@ -78,15 +79,19 @@ public: LatticeGaugeField U(UGrid); // Gauge action - double beta = 4.0; + double beta = 5.6; WilsonGaugeActionR Waction(beta); Real mass = 0.04; Real pv = 1.0; RealD M5 = 1.5; RealD scale = 2.0; + /* FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale); FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale); + */ + FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); + FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5); double StoppingCondition = 1.0e-8; double MaxCGIterations = 10000; @@ -100,15 +105,16 @@ public: // here an example of 2 level integration ActionLevel Level1(1); Level1.push_back(&Nf2); + Level1.push_back(&Waction); // this level will integrate with a // step that is 4 times finer // than the previous level - ActionLevel Level2(4); - Level2.push_back(&Waction); + //ActionLevel Level2(4); + TheAction.push_back(Level1); - TheAction.push_back(Level2); + //TheAction.push_back(Level2); // Add observables int SaveInterval = 1; @@ -137,8 +143,8 @@ public: NumOp.ZeroCounters(); DenOp.ZeroCounters(); - Run(argc, argv, Checkpoint, SmearingPolicy); - //Run(argc, argv, Checkpoint); // no smearing + //Run(argc, argv, Checkpoint, SmearingPolicy); + Run(argc, argv, Checkpoint); // no smearing @@ -163,10 +169,10 @@ int main(int argc, char **argv) { // Seeds for the random number generators std::vector SerSeed({1, 2, 3, 4, 5}); - std::vector ParSeed({6, 7, 8, 9, 5}); + std::vector ParSeed({6, 7, 8, 9, 10}); TheHMC.RNGSeeds(SerSeed, ParSeed); - TheHMC.MDparameters.set(20, 1.0);// MDsteps, traj length + TheHMC.MDparameters.set(40, 1.0);// MDsteps, traj length TheHMC.BuildTheAction(argc, argv); From e0be2b6e6c4f47c41589529610ea6bdeb7f473b7 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 13 Dec 2016 04:59:18 +0000 Subject: [PATCH 148/807] Adding a new tests for the Ls vec CG --- tests/solver/Test_dwf_cg_prec_LsVec.cc | 111 +++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 tests/solver/Test_dwf_cg_prec_LsVec.cc diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc new file mode 100644 index 00000000..744f0065 --- /dev/null +++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc @@ -0,0 +1,111 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: ./tests/Test_dwf_cg_prec.cc + +Copyright (C) 2016 + +Author: Guido Cossu + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution +directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +template +struct scal { + d internal; +}; + +Gamma::GammaMatrix Gmu[] = {Gamma::GammaX, Gamma::GammaY, Gamma::GammaZ, + Gamma::GammaT}; + +int main(int argc, char** argv) { + Grid_init(&argc, &argv); + + const int Ls = 16; + + GridCartesian* UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); + GridRedBlackCartesian* UrbGrid = + SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + + GridCartesian* sUGrid = + SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(), GridDefaultMpi()); + GridRedBlackCartesian* sUrbGrid = + SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid); + + GridCartesian* FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls, UGrid); + GridRedBlackCartesian* FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls, UGrid); + + std::vector seeds4({1, 2, 3, 4}); + std::vector seeds5({5, 6, 7, 8}); + GridParallelRNG RNG5(FGrid); + RNG5.SeedFixedIntegers(seeds5); + GridParallelRNG RNG4(UGrid); + RNG4.SeedFixedIntegers(seeds4); + + LatticeFermion src(FGrid); + random(RNG5, src); + LatticeFermion result(FGrid); + result = zero; + LatticeGaugeField Umu(UGrid); + + SU3::HotConfiguration(RNG4, Umu); + + std::cout << GridLogMessage << "Lattice dimensions: " << GridDefaultLatt() + << " Ls: " << Ls << std::endl; + + std::vector U(4, UGrid); + for (int mu = 0; mu < Nd; mu++) { + U[mu] = PeekIndex(Umu, mu); + } + + RealD mass = 0.01; + RealD M5 = 1.8; + DomainWallFermionVec5dR Ddwf(Umu, *FGrid, *FrbGrid, *sUGrid, *sUrbGrid, mass, M5); + + LatticeFermion src_o(FrbGrid); + LatticeFermion result_o(FrbGrid); + pickCheckerboard(Odd, src_o, src); + result_o = zero; + + GridStopWatch CGTimer; + + SchurDiagMooeeOperator HermOpEO(Ddwf); + ConjugateGradient CG(1.0e-8, 10000, 0);// switch off the assert + + Ddwf.ZeroCounters(); + CGTimer.Start(); + CG(HermOpEO, src_o, result_o); + CGTimer.Stop(); + + std::cout << GridLogMessage << "Total CG time : " << CGTimer.Elapsed() + << std::endl; + + std::cout << GridLogMessage << "######## Dhop calls summary" << std::endl; + Ddwf.Report(); + + Grid_finalize(); +} From 5c74b6028bbe90d2dbcb03103861d7ecabc5379c Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 13 Dec 2016 06:35:30 +0000 Subject: [PATCH 149/807] Commit for debugging, lot of IO --- lib/algorithms/LinearOperator.h | 8 +++++++- lib/algorithms/iterative/ConjugateGradient.h | 6 +++++- lib/qcd/action/fermion/CayleyFermion5D.cc | 4 ++++ tests/solver/Test_dwf_cg_prec_LsVec.cc | 8 +++----- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/algorithms/LinearOperator.h b/lib/algorithms/LinearOperator.h index ea47d43b..19375827 100644 --- a/lib/algorithms/LinearOperator.h +++ b/lib/algorithms/LinearOperator.h @@ -234,11 +234,17 @@ namespace Grid { virtual RealD MpcDag (const Field &in, Field &out){ Field tmp(in._grid); + std::cout << "norm in :" << norm2(in) << std::endl; _Mat.MeooeDag(in,tmp); - _Mat.MooeeInvDag(tmp,out); + std::cout << "norm tmp :" << norm2(tmp) << std::endl; + _Mat.MooeeInvDag(tmp,out); + std::cout << "norm out :" << norm2(out) << std::endl; _Mat.MeooeDag(out,tmp); + std::cout << "norm tmp :" << norm2(tmp) << std::endl; + _Mat.MooeeDag(in,out); + std::cout << "norm out :" << norm2(out) << std::endl; return axpy_norm(out,-1.0,tmp,out); } }; diff --git a/lib/algorithms/iterative/ConjugateGradient.h b/lib/algorithms/iterative/ConjugateGradient.h index cf3872c8..6fb69540 100644 --- a/lib/algorithms/iterative/ConjugateGradient.h +++ b/lib/algorithms/iterative/ConjugateGradient.h @@ -128,8 +128,12 @@ class ConjugateGradient : public OperatorFunction { p = p * b + r; LinalgTimer.Stop(); + std::cout << GridLogIterative << "ConjugateGradient: Iteration " << k << " residual " << cp << " target " << rsq << std::endl; + std::cout << GridLogDebug << "a = "<< a << " b_pred = "<< b_pred << " b = "<< b << std::endl; + std::cout << GridLogDebug << "qq = "<< qq << " d = "<< d << " c = "<< c << std::endl; + // Stopping condition if (cp <= rsq) { @@ -161,7 +165,7 @@ class ConjugateGradient : public OperatorFunction { } std::cout << GridLogMessage << "ConjugateGradient did NOT converge" << std::endl; - if (ErrorOnNoConverge) assert(0); + if (ErrorOnNoConverge) exit(1); } }; } diff --git a/lib/qcd/action/fermion/CayleyFermion5D.cc b/lib/qcd/action/fermion/CayleyFermion5D.cc index b8e98dce..e99a34be 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.cc +++ b/lib/qcd/action/fermion/CayleyFermion5D.cc @@ -214,7 +214,9 @@ void CayleyFermion5D::MeooeDag5D (const FermionField &psi, FermionField std::vector lower=cs; upper[Ls-1]=-mass*upper[Ls-1]; lower[0] =-mass*lower[0]; + std::cout << "MeooeDag5D: psi: " << norm2(psi) << std::endl; M5Ddag(psi,psi,Din,lower,diag,upper); + std::cout << "MeooeDag5D: Din: " << norm2(Din) << std::endl; } template @@ -280,7 +282,9 @@ void CayleyFermion5D::MeooeDag (const FermionField &psi, FermionField & } else { this->DhopOE(psi,tmp,DaggerYes); } + std::cout << "MeooeDag: tmp: " << norm2(tmp) << std::endl; MeooeDag5D(tmp,chi); + std::cout << "MeooeDag: chi: " << norm2(chi) << std::endl; } template diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc index 744f0065..c6308958 100644 --- a/tests/solver/Test_dwf_cg_prec_LsVec.cc +++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc @@ -51,12 +51,10 @@ int main(int argc, char** argv) { GridRedBlackCartesian* UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); - GridCartesian* sUGrid = - SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(), GridDefaultMpi()); - GridRedBlackCartesian* sUrbGrid = - SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid); + GridCartesian* sUGrid = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(), GridDefaultMpi()); + GridRedBlackCartesian* sUrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid); - GridCartesian* FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls, UGrid); + GridCartesian* FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls, UGrid); GridRedBlackCartesian* FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls, UGrid); std::vector seeds4({1, 2, 3, 4}); From 2fb92dbc6e73f5a74812decb24490a8aab13beb5 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 13 Dec 2016 07:53:43 +0000 Subject: [PATCH 150/807] Cleaning up previous debug lines --- lib/algorithms/LinearOperator.h | 6 ------ lib/qcd/action/fermion/CayleyFermion5D.cc | 4 ---- tests/hmc/Test_hmc_EODWFRatio.cc | 6 +++--- tests/solver/Test_dwf_cg_prec_LsVec.cc | 1 + 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/algorithms/LinearOperator.h b/lib/algorithms/LinearOperator.h index 19375827..6cb77296 100644 --- a/lib/algorithms/LinearOperator.h +++ b/lib/algorithms/LinearOperator.h @@ -234,17 +234,11 @@ namespace Grid { virtual RealD MpcDag (const Field &in, Field &out){ Field tmp(in._grid); - std::cout << "norm in :" << norm2(in) << std::endl; _Mat.MeooeDag(in,tmp); - std::cout << "norm tmp :" << norm2(tmp) << std::endl; _Mat.MooeeInvDag(tmp,out); - std::cout << "norm out :" << norm2(out) << std::endl; _Mat.MeooeDag(out,tmp); - std::cout << "norm tmp :" << norm2(tmp) << std::endl; - _Mat.MooeeDag(in,out); - std::cout << "norm out :" << norm2(out) << std::endl; return axpy_norm(out,-1.0,tmp,out); } }; diff --git a/lib/qcd/action/fermion/CayleyFermion5D.cc b/lib/qcd/action/fermion/CayleyFermion5D.cc index e99a34be..b8e98dce 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.cc +++ b/lib/qcd/action/fermion/CayleyFermion5D.cc @@ -214,9 +214,7 @@ void CayleyFermion5D::MeooeDag5D (const FermionField &psi, FermionField std::vector lower=cs; upper[Ls-1]=-mass*upper[Ls-1]; lower[0] =-mass*lower[0]; - std::cout << "MeooeDag5D: psi: " << norm2(psi) << std::endl; M5Ddag(psi,psi,Din,lower,diag,upper); - std::cout << "MeooeDag5D: Din: " << norm2(Din) << std::endl; } template @@ -282,9 +280,7 @@ void CayleyFermion5D::MeooeDag (const FermionField &psi, FermionField & } else { this->DhopOE(psi,tmp,DaggerYes); } - std::cout << "MeooeDag: tmp: " << norm2(tmp) << std::endl; MeooeDag5D(tmp,chi); - std::cout << "MeooeDag: chi: " << norm2(chi) << std::endl; } template diff --git a/tests/hmc/Test_hmc_EODWFRatio.cc b/tests/hmc/Test_hmc_EODWFRatio.cc index 02b312b8..6010ea03 100644 --- a/tests/hmc/Test_hmc_EODWFRatio.cc +++ b/tests/hmc/Test_hmc_EODWFRatio.cc @@ -60,9 +60,9 @@ public: // Gauge action WilsonGaugeActionR Waction(5.6); - Real mass=0.04; - Real pv =1.0; - RealD M5=1.5; + Real mass= 0.04; + Real pv = 1.0; + RealD M5 = 1.5; FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5); FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5); diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc index c6308958..790e4e06 100644 --- a/tests/solver/Test_dwf_cg_prec_LsVec.cc +++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc @@ -64,6 +64,7 @@ int main(int argc, char** argv) { GridParallelRNG RNG4(UGrid); RNG4.SeedFixedIntegers(seeds4); + std::cout << GridLogMessage << "Generating source field" << std::endl; LatticeFermion src(FGrid); random(RNG5, src); LatticeFermion result(FGrid); From de8f80cf941f20d7a3040b42776d58b7f8cfb3d4 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 13 Dec 2016 19:02:05 +0000 Subject: [PATCH 151/807] Hadrons: genetic operators improvement --- extras/Hadrons/GeneticScheduler.hpp | 36 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index 46272a83..88ab41f8 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -79,8 +79,9 @@ private: void doMutation(void); // genetic operators GenePair selectPair(void); - void crossover(Gene &c, const Gene &p1, const Gene &p2); + void crossover(Gene &c1, Gene &c2, const Gene &p1, const Gene &p2); void mutation(Gene &m, const Gene &c); + private: Graph &graph_; const ObjFunc &func_; @@ -169,11 +170,10 @@ template void GeneticScheduler::doCrossover(void) { auto p = selectPair(); - auto &p1 = *(p.first), &p2 = *(p.second); + Gene &p1 = *(p.first), &p2 = *(p.second); Gene c1, c2; - crossover(c1, p1, p2); - crossover(c2, p2, p1); + crossover(c1, c2, p1, p2); PARALLEL_CRITICAL { population_.emplace(func_(c1), c1); @@ -196,7 +196,6 @@ void GeneticScheduler::doMutation(void) mutation(m, it->second); PARALLEL_CRITICAL { - population_.erase(it); population_.emplace(func_(m), m); } } @@ -236,22 +235,37 @@ typename GeneticScheduler::GenePair GeneticScheduler::selectPair(void) } template -void GeneticScheduler::crossover(Gene &c, const Gene &p1, const Gene &p2) +void GeneticScheduler::crossover(Gene &c1, Gene &c2, const Gene &p1, + const Gene &p2) { Gene buf; std::uniform_int_distribution dis(0, p1.size() - 1); unsigned int cut = dis(gen_); - c.clear(); - buf = p1; + c1.clear(); + buf = p2; for (unsigned int i = 0; i < cut; ++i) { - c.push_back(p2[i]); - buf.erase(std::find(buf.begin(), buf.end(), p2[i])); + c1.push_back(p1[i]); + buf.erase(std::find(buf.begin(), buf.end(), p1[i])); } for (unsigned int i = 0; i < buf.size(); ++i) { - c.push_back(buf[i]); + c1.push_back(buf[i]); + } + c2.clear(); + buf = p2; + for (unsigned int i = cut; i < p1.size(); ++i) + { + buf.erase(std::find(buf.begin(), buf.end(), p1[i])); + } + for (unsigned int i = 0; i < buf.size(); ++i) + { + c2.push_back(buf[i]); + } + for (unsigned int i = cut; i < p1.size(); ++i) + { + c2.push_back(p1[i]); } } From 16693bd69d359bcc192261fd93dddc4ecc937ea1 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 13 Dec 2016 19:02:32 +0000 Subject: [PATCH 152/807] Hadrons: scheduler heuristic benchmark --- extras/Hadrons/GeneticScheduler.hpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index 88ab41f8..857a4099 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -59,6 +59,8 @@ public: int getMinValue(void); // breed a new generation void nextGeneration(void); + // heuristic benchmarks + void benchmarkCrossover(const unsigned int nIt); // print population friend std::ostream & operator<<(std::ostream &out, const GeneticScheduler &s) @@ -299,6 +301,27 @@ void GeneticScheduler::mutation(Gene &m, const Gene &c) } } +template +void GeneticScheduler::benchmarkCrossover(const unsigned int nIt) +{ + Gene p1, p2, c1, c2; + double neg = 0., eq = 0., pos = 0., total; + int improvement; + + LOG(Message) << "Benchmarking crossover..." << std::endl; + for (unsigned int i = 0; i < nIt; ++i) + { + p1 = graph_.topoSort(gen_); + p2 = graph_.topoSort(gen_); + crossover(c1, c2, p1, p2); + improvement = (func_(c1) + func_(c2) - func_(p1) - func_(p2))/2; + if (improvement < 0) neg++; else if (improvement == 0) eq++; else pos++; + } + total = neg + eq + pos; + LOG(Message) << " -: " << neg/total << " =: " << eq/total + << " +: " << pos/total << std::endl; +} + END_HADRONS_NAMESPACE #endif // Hadrons_GeneticScheduler_hpp_ From 013e710c7d7d0f5c54f1042a6346d06acf39a0a8 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 13 Dec 2016 19:04:43 +0000 Subject: [PATCH 153/807] Hadrons: 3pt function test improvement --- tests/hadrons/Test_hadrons_meson_3pt.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/hadrons/Test_hadrons_meson_3pt.cc b/tests/hadrons/Test_hadrons_meson_3pt.cc index 159981d0..b3156918 100644 --- a/tests/hadrons/Test_hadrons_meson_3pt.cc +++ b/tests/hadrons/Test_hadrons_meson_3pt.cc @@ -50,14 +50,14 @@ int main(int argc, char *argv[]) // global parameters Application::GlobalPar globalPar; - globalPar.trajCounter.start = 1500; - globalPar.trajCounter.end = 1520; - globalPar.trajCounter.step = 20; - globalPar.seed = "1 2 3 4"; - globalPar.genetic.maxGen = 5000; - globalPar.genetic.maxCstGen = 100; - globalPar.genetic.popSize = 50; - globalPar.genetic.mutationRate = .25; + globalPar.trajCounter.start = 1500; + globalPar.trajCounter.end = 1520; + globalPar.trajCounter.step = 20; + globalPar.seed = "1 2 3 4"; + globalPar.genetic.maxGen = 1000; + globalPar.genetic.maxCstGen = 200; + globalPar.genetic.popSize = 20; + globalPar.genetic.mutationRate = .1; application.setPar(globalPar); // gauge field @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) application.createModule("CG_" + flavour[i], solverPar); } - for (unsigned int t = 0; t < nt; t += 8) + for (unsigned int t = 0; t < nt; t += 1) { std::string srcName; std::vector qName; @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) for (unsigned int mu = 0; mu < Nd; ++mu) { quarkPar.source = seqName[i][mu]; - seqName[i][mu] = qName[i] + "-" + seqName[i][mu]; + seqName[i][mu] = "Q_" + flavour[i] + "-" + seqName[i][mu]; application.createModule(seqName[i][mu], quarkPar); } } @@ -159,7 +159,6 @@ int main(int argc, char *argv[]) } } - Environment::getInstance().printContent(); // execution application.run(); From af0ccdd8e9d85da5bd0e185170c12d912f355093 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 14 Dec 2016 02:02:42 +0000 Subject: [PATCH 154/807] Moving output order --- tests/solver/Test_dwf_cg_prec_LsVec.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc index 790e4e06..3fbec4d3 100644 --- a/tests/solver/Test_dwf_cg_prec_LsVec.cc +++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc @@ -57,6 +57,9 @@ int main(int argc, char** argv) { GridCartesian* FGrid = SpaceTimeGrid::makeFiveDimDWFGrid(Ls, UGrid); GridRedBlackCartesian* FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls, UGrid); + std::cout << GridLogMessage << "Lattice dimensions: " << GridDefaultLatt() + << " Ls: " << Ls << std::endl; + std::vector seeds4({1, 2, 3, 4}); std::vector seeds5({5, 6, 7, 8}); GridParallelRNG RNG5(FGrid); @@ -64,17 +67,17 @@ int main(int argc, char** argv) { GridParallelRNG RNG4(UGrid); RNG4.SeedFixedIntegers(seeds4); - std::cout << GridLogMessage << "Generating source field" << std::endl; + std::cout << GridLogMessage << "Generating random ferrmion field" << std::endl; LatticeFermion src(FGrid); random(RNG5, src); LatticeFermion result(FGrid); result = zero; LatticeGaugeField Umu(UGrid); + std::cout << GridLogMessage << "Generating random gauge field" << std::endl; SU3::HotConfiguration(RNG4, Umu); - std::cout << GridLogMessage << "Lattice dimensions: " << GridDefaultLatt() - << " Ls: " << Ls << std::endl; + std::vector U(4, UGrid); for (int mu = 0; mu < Nd; mu++) { From 0bd296dda42b7cd65becf643fa62b4b1ad0be53d Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 14 Dec 2016 03:15:09 +0000 Subject: [PATCH 155/807] Adding check of the Dag part in the benchmark --- benchmarks/Benchmark_dwf.cc | 95 +++++++++++++++----- lib/algorithms/iterative/ConjugateGradient.h | 1 - lib/simd/Grid_avx.h | 4 +- 3 files changed, 76 insertions(+), 24 deletions(-) diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc index 10e4521b..76625973 100644 --- a/benchmarks/Benchmark_dwf.cc +++ b/benchmarks/Benchmark_dwf.cc @@ -163,6 +163,24 @@ int main (int argc, char ** argv) Dw.Report(); } + if (1) { // Naive wilson dag implementation + ref = zero; + for (int mu = 0; mu < Nd; mu++) { + // ref = src - Gamma(Gamma::GammaX)* src ; // 1+gamma_x + tmp = U[mu] * Cshift(src, mu + 1, 1); + for (int i = 0; i < ref._odata.size(); i++) { + ref._odata[i] += tmp._odata[i] + Gamma(Gmu[mu]) * tmp._odata[i]; + } + + tmp = adj(U[mu]) * src; + tmp = Cshift(tmp, mu + 1, -1); + for (int i = 0; i < ref._odata.size(); i++) { + ref._odata[i] += tmp._odata[i] - Gamma(Gmu[mu]) * tmp._odata[i]; + } + } + ref = -0.5 * ref; + } + if (1) { @@ -245,6 +263,33 @@ int main (int argc, char ** argv) std::cout<::Dhop to naive wilson implementation Dag to verify correctness" << std::endl; + sDw.Dhop(ssrc,sresult,1); + sum=0; + for(int x=0;x site({s,x,y,z,t}); + SpinColourVector normal, simd; + peekSite(normal,ref,site); + peekSite(simd,sresult,site); + sum=sum+norm2(normal-simd); + if (norm2(normal-simd) > 1.0e-6 ) { + std::cout << "site "<1.0e-4) { setCheckerboard(ssrc,ssrc_o); setCheckerboard(ssrc,ssrc_e); std::cout<< ssrc << std::endl; } + + // Check the dag + std::cout << GridLogMessage << "Compare WilsonFermion5D::DhopEO to Dhop to verify correctness" << std::endl; + pickCheckerboard(Even,ssrc_e,ssrc); + pickCheckerboard(Odd,ssrc_o,ssrc); + sDw.DhopEO(ssrc_o,sr_e,DaggerYes); + sDw.DhopOE(ssrc_e,sr_o,DaggerYes); + sDw.Dhop (ssrc ,sresult,DaggerYes); + + pickCheckerboard(Even,ssrc_e,sresult); + pickCheckerboard(Odd ,ssrc_o,sresult); + ssrc_e = ssrc_e - sr_e; + error = norm2(ssrc_e); + + std::cout<1.0e-4) { + setCheckerboard(ssrc,ssrc_o); + setCheckerboard(ssrc,ssrc_e); + std::cout<< ssrc << std::endl; + } + + } } - if (1) - { // Naive wilson dag implementation - ref = zero; - for(int mu=0;mu { std::cout << GridLogDebug << "a = "<< a << " b_pred = "<< b_pred << " b = "<< b << std::endl; std::cout << GridLogDebug << "qq = "<< qq << " d = "<< d << " c = "<< c << std::endl; - // Stopping condition if (cp <= rsq) { SolverTimer.Stop(); diff --git a/lib/simd/Grid_avx.h b/lib/simd/Grid_avx.h index 36360102..77927b10 100644 --- a/lib/simd/Grid_avx.h +++ b/lib/simd/Grid_avx.h @@ -514,7 +514,7 @@ namespace Optimization { template static inline __m256 tRotate(__m256 in){ __m256 tmp = Permute::Permute0(in); - __m256 ret; + __m256 ret = in; if ( n > 3 ) { _mm256_alignr_epi32_grid(ret,in,tmp,n); } else { @@ -526,7 +526,7 @@ namespace Optimization { template static inline __m256d tRotate(__m256d in){ __m256d tmp = Permute::Permute0(in); - __m256d ret; + __m256d ret = in; if ( n > 1 ) { _mm256_alignr_epi64_grid(ret,in,tmp,n); } else { From 3af663e17b6f3678a37321d3ddfbb9a8dac03813 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 17:59:45 +0000 Subject: [PATCH 156/807] Hadrons: modules remember their factory registration name --- extras/Hadrons/Module.cc | 7 +++++ extras/Hadrons/Module.hpp | 28 +++++++++++++++++-- extras/Hadrons/Modules/MAction/DWF.hpp | 12 ++++---- extras/Hadrons/Modules/MAction/Wilson.hpp | 8 ++---- .../Hadrons/Modules/MContraction/Baryon.hpp | 4 +-- extras/Hadrons/Modules/MContraction/Meson.hpp | 6 ++-- extras/Hadrons/Modules/MGauge/Load.cc | 12 ++++---- extras/Hadrons/Modules/MGauge/Load.hpp | 10 +++---- extras/Hadrons/Modules/MGauge/Random.cc | 12 ++++---- extras/Hadrons/Modules/MGauge/Random.hpp | 10 +++---- extras/Hadrons/Modules/MGauge/Unit.cc | 12 ++++---- extras/Hadrons/Modules/MGauge/Unit.hpp | 10 +++---- extras/Hadrons/Modules/MSolver/RBPrecCG.hpp | 6 ++-- extras/Hadrons/Modules/MSource/Point.hpp | 6 ++-- extras/Hadrons/Modules/MSource/SeqGamma.hpp | 6 ++-- extras/Hadrons/Modules/MSource/Z2.hpp | 6 ++-- extras/Hadrons/Modules/Quark.hpp | 6 ++-- 17 files changed, 87 insertions(+), 74 deletions(-) diff --git a/extras/Hadrons/Module.cc b/extras/Hadrons/Module.cc index e8a80f07..dccae582 100644 --- a/extras/Hadrons/Module.cc +++ b/extras/Hadrons/Module.cc @@ -51,6 +51,13 @@ Environment & ModuleBase::env(void) const return env_; } +// get factory registration name if available +std::string ModuleBase::getRegisteredName(void) +{ + HADRON_ERROR("module '" + getName() + "' has a type not registered" + + " in the factory"); +} + // execution /////////////////////////////////////////////////////////////////// void ModuleBase::operator()(void) { diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index d7065650..78ce8a6a 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -34,7 +34,17 @@ directory. BEGIN_HADRONS_NAMESPACE // module registration macros -#define MODULE_REGISTER(mod)\ +#define MODULE_REGISTER(mod, base)\ +class mod: public base\ +{\ +public:\ + typedef base Base;\ + using Base::Base;\ + virtual std::string getRegisteredName(void)\ + {\ + return std::string(#mod);\ + }\ +};\ class mod##ModuleRegistrar\ {\ public:\ @@ -49,7 +59,17 @@ public:\ };\ static mod##ModuleRegistrar mod##ModuleRegistrarInstance; -#define MODULE_REGISTER_NS(mod, ns)\ +#define MODULE_REGISTER_NS(mod, base, ns)\ +class mod: public base\ +{\ +public:\ + typedef base Base;\ + using Base::Base;\ + virtual std::string getRegisteredName(void)\ + {\ + return std::string(#ns "::" #mod);\ + }\ +};\ class ns##mod##ModuleRegistrar\ {\ public:\ @@ -64,6 +84,8 @@ public:\ };\ static ns##mod##ModuleRegistrar ns##mod##ModuleRegistrarInstance; +#define ARG(...) __VA_ARGS__ + /****************************************************************************** * Module class * ******************************************************************************/ @@ -78,6 +100,8 @@ public: // access std::string getName(void) const; Environment &env(void) const; + // get factory registration name if available + virtual std::string getRegisteredName(void); // dependencies/products virtual std::vector getInput(void) = 0; virtual std::vector getOutput(void) = 0; diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index ceec975c..3f38c671 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -68,6 +68,8 @@ public: virtual void execute(void); }; +MODULE_REGISTER_NS(DWF, TDWF, MAction); + /****************************************************************************** * DWF template implementation * ******************************************************************************/ @@ -109,9 +111,9 @@ template void TDWF::execute(void) { LOG(Message) << "Setting up domain wall fermion matrix with m= " - << par().mass << ", M5= " << par().M5 << " and Ls= " - << par().Ls << " using gauge field '" << par().gauge << "'" - << std::endl; + << par().mass << ", M5= " << par().M5 << " and Ls= " + << par().Ls << " using gauge field '" << par().gauge << "'" + << std::endl; env().createGrid(par().Ls); auto &U = *env().template getObject(par().gauge); auto &g4 = *env().getGrid(); @@ -123,12 +125,8 @@ void TDWF::execute(void) env().setObject(getName(), fMatPt); } -typedef TDWF DWF; - END_MODULE_NAMESPACE -MODULE_REGISTER_NS(DWF, MAction); - END_HADRONS_NAMESPACE #endif // Hadrons_DWF_hpp_ diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp index 6a4528ca..6a01d92e 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -66,6 +66,8 @@ public: virtual void execute(void); }; +MODULE_REGISTER_NS(Wilson, TWilson, MAction); + /****************************************************************************** * TWilson template implementation * ******************************************************************************/ @@ -98,7 +100,7 @@ void TWilson::setup(void) { unsigned int size; - size = 3*env().template lattice4dSize(); + size = 2*env().template lattice4dSize(); env().registerObject(getName(), size); } @@ -115,12 +117,8 @@ void TWilson::execute() env().setObject(getName(), fMatPt); } -typedef TWilson Wilson; - END_MODULE_NAMESPACE -MODULE_REGISTER_NS(Wilson, MAction); - END_HADRONS_NAMESPACE #endif // Hadrons_Wilson_hpp_ diff --git a/extras/Hadrons/Modules/MContraction/Baryon.hpp b/extras/Hadrons/Modules/MContraction/Baryon.hpp index e8191793..6ae9c1ab 100644 --- a/extras/Hadrons/Modules/MContraction/Baryon.hpp +++ b/extras/Hadrons/Modules/MContraction/Baryon.hpp @@ -47,7 +47,7 @@ public: virtual void execute(void); }; -typedef TBaryon Baryon; +MODULE_REGISTER_NS(Baryon, ARG(TBaryon), MContraction); /****************************************************************************** * TBaryon implementation * @@ -97,8 +97,6 @@ void TBaryon::execute(void) END_MODULE_NAMESPACE -MODULE_REGISTER_NS(Baryon, MContraction); - END_HADRONS_NAMESPACE #endif // Hadrons_Baryon_hpp_ diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index b2625b3e..438f3740 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -72,6 +72,8 @@ public: virtual void execute(void); }; +MODULE_REGISTER_NS(Meson, ARG(TMeson), MContraction); + /****************************************************************************** * TMeson implementation * ******************************************************************************/ @@ -137,12 +139,8 @@ void TMeson::execute(void) write(writer, "meson", result); } -typedef TMeson Meson; - END_MODULE_NAMESPACE -MODULE_REGISTER_NS(Meson, MContraction); - END_HADRONS_NAMESPACE #endif // Hadrons_Meson_hpp_ diff --git a/extras/Hadrons/Modules/MGauge/Load.cc b/extras/Hadrons/Modules/MGauge/Load.cc index 1a6cec0a..82920d97 100644 --- a/extras/Hadrons/Modules/MGauge/Load.cc +++ b/extras/Hadrons/Modules/MGauge/Load.cc @@ -32,22 +32,22 @@ using namespace Hadrons; using namespace MGauge; /****************************************************************************** -* Load implementation * +* TLoad implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Load::Load(const std::string name) +TLoad::TLoad(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector Load::getInput(void) +std::vector TLoad::getInput(void) { std::vector in; return in; } -std::vector Load::getOutput(void) +std::vector TLoad::getOutput(void) { std::vector out = {getName()}; @@ -55,13 +55,13 @@ std::vector Load::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void Load::setup(void) +void TLoad::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void Load::execute(void) +void TLoad::execute(void) { NerscField header; std::string fileName = par().file + "." diff --git a/extras/Hadrons/Modules/MGauge/Load.hpp b/extras/Hadrons/Modules/MGauge/Load.hpp index ff7cc128..21f9331c 100644 --- a/extras/Hadrons/Modules/MGauge/Load.hpp +++ b/extras/Hadrons/Modules/MGauge/Load.hpp @@ -46,13 +46,13 @@ public: std::string, file); }; -class Load: public Module +class TLoad: public Module { public: // constructor - Load(const std::string name); + TLoad(const std::string name); // destructor - virtual ~Load(void) = default; + virtual ~TLoad(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -62,9 +62,9 @@ public: virtual void execute(void); }; -END_MODULE_NAMESPACE +MODULE_REGISTER_NS(Load, TLoad, MGauge); -MODULE_REGISTER_NS(Load, MGauge); +END_MODULE_NAMESPACE END_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/Random.cc b/extras/Hadrons/Modules/MGauge/Random.cc index 6d5e0ec9..2c25f7c1 100644 --- a/extras/Hadrons/Modules/MGauge/Random.cc +++ b/extras/Hadrons/Modules/MGauge/Random.cc @@ -32,20 +32,20 @@ using namespace Hadrons; using namespace MGauge; /****************************************************************************** -* Random implementation * +* TRandom implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Random::Random(const std::string name) +TRandom::TRandom(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector Random::getInput(void) +std::vector TRandom::getInput(void) { return std::vector(); } -std::vector Random::getOutput(void) +std::vector TRandom::getOutput(void) { std::vector out = {getName()}; @@ -53,13 +53,13 @@ std::vector Random::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void Random::setup(void) +void TRandom::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void Random::execute(void) +void TRandom::execute(void) { LOG(Message) << "Generating random gauge configuration" << std::endl; LatticeGaugeField &U = *env().createLattice(getName()); diff --git a/extras/Hadrons/Modules/MGauge/Random.hpp b/extras/Hadrons/Modules/MGauge/Random.hpp index afa03de8..95db726c 100644 --- a/extras/Hadrons/Modules/MGauge/Random.hpp +++ b/extras/Hadrons/Modules/MGauge/Random.hpp @@ -39,13 +39,13 @@ BEGIN_HADRONS_NAMESPACE ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MGauge) -class Random: public Module +class TRandom: public Module { public: // constructor - Random(const std::string name); + TRandom(const std::string name); // destructor - virtual ~Random(void) = default; + virtual ~TRandom(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -55,9 +55,9 @@ public: virtual void execute(void); }; -END_MODULE_NAMESPACE +MODULE_REGISTER_NS(Random, TRandom, MGauge); -MODULE_REGISTER_NS(Random, MGauge); +END_MODULE_NAMESPACE END_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc index b9cfeac7..16dcff83 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.cc +++ b/extras/Hadrons/Modules/MGauge/Unit.cc @@ -32,20 +32,20 @@ using namespace Hadrons; using namespace MGauge; /****************************************************************************** -* Unit implementation * +* TUnit implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -Unit::Unit(const std::string name) +TUnit::TUnit(const std::string name) : Module(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector Unit::getInput(void) +std::vector TUnit::getInput(void) { return std::vector(); } -std::vector Unit::getOutput(void) +std::vector TUnit::getOutput(void) { std::vector out = {getName()}; @@ -53,13 +53,13 @@ std::vector Unit::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void Unit::setup(void) +void TUnit::setup(void) { env().registerLattice(getName()); } // execution /////////////////////////////////////////////////////////////////// -void Unit::execute(void) +void TUnit::execute(void) { LOG(Message) << "Creating unit gauge configuration" << std::endl; LatticeGaugeField &U = *env().createLattice(getName()); diff --git a/extras/Hadrons/Modules/MGauge/Unit.hpp b/extras/Hadrons/Modules/MGauge/Unit.hpp index da26dd37..d9566958 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.hpp +++ b/extras/Hadrons/Modules/MGauge/Unit.hpp @@ -39,13 +39,13 @@ BEGIN_HADRONS_NAMESPACE ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MGauge) -class Unit: public Module +class TUnit: public Module { public: // constructor - Unit(const std::string name); + TUnit(const std::string name); // destructor - virtual ~Unit(void) = default; + virtual ~TUnit(void) = default; // dependencies/products virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -55,9 +55,9 @@ public: virtual void execute(void); }; -END_MODULE_NAMESPACE +MODULE_REGISTER_NS(Unit, TUnit, MGauge); -MODULE_REGISTER_NS(Unit, MGauge); +END_MODULE_NAMESPACE END_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index 57ebb816..82f2eafa 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -66,6 +66,8 @@ public: virtual void execute(void); }; +MODULE_REGISTER_NS(RBPrecCG, TRBPrecCG, MSolver); + /****************************************************************************** * TRBPrecCG template implementation * ******************************************************************************/ @@ -121,12 +123,8 @@ void TRBPrecCG::execute(void) env().setObject(getName(), new SolverFn(solver)); } -typedef TRBPrecCG RBPrecCG; - END_MODULE_NAMESPACE -MODULE_REGISTER_NS(RBPrecCG, MSolver); - END_HADRONS_NAMESPACE #endif // Hadrons_RBPrecCG_hpp_ diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index 456de76c..84952512 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -76,6 +76,8 @@ public: virtual void execute(void); }; +MODULE_REGISTER_NS(Point, TPoint, MSource); + /****************************************************************************** * TPoint template implementation * ******************************************************************************/ @@ -124,12 +126,8 @@ void TPoint::execute(void) pokeSite(id, src, position); } -typedef TPoint Point; - END_MODULE_NAMESPACE -MODULE_REGISTER_NS(Point, MSource); - END_HADRONS_NAMESPACE #endif // Hadrons_Point_hpp_ diff --git a/extras/Hadrons/Modules/MSource/SeqGamma.hpp b/extras/Hadrons/Modules/MSource/SeqGamma.hpp index e3dad26a..70b603fe 100644 --- a/extras/Hadrons/Modules/MSource/SeqGamma.hpp +++ b/extras/Hadrons/Modules/MSource/SeqGamma.hpp @@ -57,10 +57,10 @@ public: virtual void execute(void); }; -typedef TSeqGamma SeqGamma; +MODULE_REGISTER_NS(SeqGamma, TSeqGamma, MSource); /****************************************************************************** - * TSeqGamma implementation * + * TSeqGamma implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// template @@ -130,8 +130,6 @@ void TSeqGamma::execute(void) END_MODULE_NAMESPACE -MODULE_REGISTER_NS(SeqGamma, MSource); - END_HADRONS_NAMESPACE #endif // Hadrons_SeqGamma_hpp_ diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp index 76fefc8f..e50b2a73 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -80,6 +80,8 @@ public: virtual void execute(void); }; +MODULE_REGISTER_NS(Z2, TZ2, MSource); + /****************************************************************************** * TZ2 template implementation * ******************************************************************************/ @@ -140,12 +142,8 @@ void TZ2::execute(void) src = src*eta; } -typedef TZ2 Z2; - END_MODULE_NAMESPACE -MODULE_REGISTER_NS(Z2, MSource); - END_HADRONS_NAMESPACE #endif // Hadrons_Z2_hpp_ diff --git a/extras/Hadrons/Modules/Quark.hpp b/extras/Hadrons/Modules/Quark.hpp index 59274546..81b74755 100644 --- a/extras/Hadrons/Modules/Quark.hpp +++ b/extras/Hadrons/Modules/Quark.hpp @@ -67,6 +67,8 @@ private: SolverFn *solver_{nullptr}; }; +MODULE_REGISTER(Quark, TQuark); + /****************************************************************************** * TQuark implementation * ******************************************************************************/ @@ -176,10 +178,6 @@ void TQuark::execute(void) } } -typedef TQuark Quark; - -MODULE_REGISTER(Quark); - END_HADRONS_NAMESPACE #endif // Hadrons_Quark_hpp_ From 34df71e7557d558c298a836275407b2cbe770d7f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 18:01:56 +0000 Subject: [PATCH 157/807] Hadrons: function to save an application as an XML file --- extras/Hadrons/Application.cc | 35 ++++++++++++++++++++++++++++++---- extras/Hadrons/Application.hpp | 8 +++++--- extras/Hadrons/Environment.cc | 5 +++++ extras/Hadrons/Environment.hpp | 1 + extras/Hadrons/Module.hpp | 13 +++++++++++++ 5 files changed, 55 insertions(+), 7 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 62c69230..07971a16 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -79,12 +79,17 @@ void Application::setPar(const Application::GlobalPar &par) env_.setSeed(strToVec(par_.seed)); } +const Application::GlobalPar & Application::getPar(void) +{ + return par_; +} + // execute ///////////////////////////////////////////////////////////////////// void Application::run(void) { if (!parameterFileName_.empty()) { - parseParameterFile(); + parseParameterFile(parameterFileName_); } schedule(); configLoop(); @@ -99,13 +104,13 @@ public: std::string, type); }; -void Application::parseParameterFile(void) +void Application::parseParameterFile(const std::string parameterFileName) { - XmlReader reader(parameterFileName_); + XmlReader reader(parameterFileName); GlobalPar par; ObjectId id; - LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl; + LOG(Message) << "Reading '" << parameterFileName << "'..." << std::endl; read(reader, "parameters", par); setPar(par); push(reader, "modules"); @@ -119,6 +124,28 @@ void Application::parseParameterFile(void) pop(reader); } +void Application::saveParameterFile(const std::string parameterFileName) +{ + XmlWriter writer(parameterFileName); + ObjectId id; + const unsigned int nMod = env_.getNModule(); + + LOG(Message) << "Writing '" << parameterFileName << "'..." << std::endl; + write(writer, "parameters", getPar()); + push(writer, "modules"); + for (unsigned int i = 0; i < nMod; ++i) + { + push(writer, "module"); + id.name = env_.getModuleName(i); + id.type = env_.getModule(i)->getRegisteredName(); + write(writer, "id", id); + env_.getModule(i)->saveParameters(writer, "options"); + pop(writer); + } + pop(writer); + pop(writer); +} + // schedule computation //////////////////////////////////////////////////////// #define MEM_MSG(size)\ sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" diff --git a/extras/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp index 846b4dfa..65e9ad34 100644 --- a/extras/Hadrons/Application.hpp +++ b/extras/Hadrons/Application.hpp @@ -77,7 +77,8 @@ public: // destructor virtual ~Application(void) = default; // access - void setPar(const GlobalPar &par); + void setPar(const GlobalPar &par); + const GlobalPar & getPar(void); // module creation template void createModule(const std::string name); @@ -85,8 +86,9 @@ public: void createModule(const std::string name, const typename M::Par &par); // execute void run(void); - // parse parameter file - void parseParameterFile(void); + // XML parameter file I/O + void parseParameterFile(const std::string parameterFileName); + void saveParameterFile(const std::string parameterFileName); // schedule computation void schedule(void); // loop on configurations diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 67880cd3..600ca855 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -190,6 +190,11 @@ void Environment::pushModule(Environment::ModPt &pt) } } +unsigned int Environment::getNModule(void) const +{ + return module_.size(); +} + void Environment::createModule(const std::string name, const std::string type, XmlReader &reader) { diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index 88661c2e..065c889a 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -117,6 +117,7 @@ public: void createModule(const std::string name, const std::string type, XmlReader &reader); + unsigned int getNModule(void) const; ModuleBase * getModule(const unsigned int address) const; ModuleBase * getModule(const std::string name) const; template diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index 78ce8a6a..358621f4 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -107,6 +107,7 @@ public: virtual std::vector getOutput(void) = 0; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name) = 0; + virtual void saveParameters(XmlWriter &writer, const std::string name) = 0; // setup virtual void setup(void) {}; // execution @@ -130,6 +131,7 @@ public: virtual ~Module(void) = default; // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name); + virtual void saveParameters(XmlWriter &writer, const std::string name); // parameter access const P & par(void) const; void setPar(const P &par); @@ -150,6 +152,11 @@ public: virtual ~Module(void) = default; // parse parameters (do nothing) virtual void parseParameters(XmlReader &reader, const std::string name) {}; + virtual void saveParameters(XmlWriter &writer, const std::string name) + { + push(writer, "options"); + pop(writer); + }; }; /****************************************************************************** @@ -166,6 +173,12 @@ void Module

::parseParameters(XmlReader &reader, const std::string name) read(reader, name, par_); } +template +void Module

::saveParameters(XmlWriter &writer, const std::string name) +{ + write(writer, name, par_); +} + template const P & Module

::par(void) const { From ea40854e0b823f2cc5cf7ce3e00f2aa4c00a1173 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 18:02:18 +0000 Subject: [PATCH 158/807] Hadrons: type names are demangled --- extras/Hadrons/Environment.cc | 7 +++---- extras/Hadrons/Global.cc | 15 ++++++++++++++ extras/Hadrons/Global.hpp | 39 +++++++++++++++-------------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 600ca855..60d8da00 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -250,7 +250,7 @@ std::string Environment::getModuleType(const unsigned int address) const { if (hasModule(address)) { - return module_[address].type->name(); + return typeName(module_[address].type); } else { @@ -473,7 +473,7 @@ std::string Environment::getObjectType(const unsigned int address) const { if (hasRegisteredObject(address)) { - return object_[address].type->name(); + return typeName(object_[address].type); } else if (hasObject(address)) { @@ -689,8 +689,7 @@ void Environment::printContent(void) for (unsigned int i = 0; i < module_.size(); ++i) { LOG(Message) << std::setw(4) << i << ": " - << getModuleName(i) << " (" - << getModuleType(i) << ")" << std::endl; + << getModuleName(i) << std::endl; } LOG(Message) << "Objects: " << std::endl; for (unsigned int i = 0; i < object_.size(); ++i) diff --git a/extras/Hadrons/Global.cc b/extras/Hadrons/Global.cc index 62997e1f..5c915172 100644 --- a/extras/Hadrons/Global.cc +++ b/extras/Hadrons/Global.cc @@ -63,3 +63,18 @@ std::string Hadrons::sizeString(long unsigned int bytes) return std::string(buf); } + +// type utilities ////////////////////////////////////////////////////////////// +constexpr unsigned int maxNameSize = 1024u; + +std::string Hadrons::typeName(const std::type_info *info) +{ + char *buf; + std::string name; + + buf = abi::__cxa_demangle(info->name(), nullptr, nullptr, nullptr); + name = buf; + free(buf); + + return name; +} diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index 3107ef12..1ecbe7cf 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -31,6 +31,7 @@ directory. #include #include #include +#include #define BEGIN_HADRONS_NAMESPACE \ namespace Grid {\ @@ -56,11 +57,6 @@ using Grid::operator<<; BEGIN_HADRONS_NAMESPACE // type aliases -//typedef FermionOperator FMat; -//typedef FIMPL::FermionField FermionField; -//typedef FIMPL::PropagatorField PropagatorField; -//typedef std::function SolverFn; - #define TYPE_ALIASES(FImpl, suffix)\ typedef FermionOperator FMat##suffix; \ typedef typename FImpl::FermionField FermionField##suffix; \ @@ -120,34 +116,33 @@ private:\ // pretty size formating std::string sizeString(long unsigned int bytes); -template -std::string typeName(const T &x) -{ - std::string name(typeid(x).name()); - - return name; -} - -template -std::string typeName(void) -{ - std::string name(typeid(T).name()); - - return name; -} - +// type utilities template const std::type_info * typeIdPt(const T &x) { return &typeid(x); } +std::string typeName(const std::type_info *info); + template -const std::type_info * typeName(void) +const std::type_info * typeIdPt(void) { return &typeid(T); } +template +std::string typeName(const T &x) +{ + return typeName(typeIdPt(x)); +} + +template +std::string typeName(void) +{ + return typeName(typeIdPt()); +} + END_HADRONS_NAMESPACE #endif // Hadrons_Global_hpp_ From e1653a9f94e2188fb6c1d103a69da8f1cabd0eec Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 18:02:36 +0000 Subject: [PATCH 159/807] Hadrons: size fix in DWF module --- extras/Hadrons/Modules/MAction/DWF.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index 3f38c671..4bed2596 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -102,7 +102,7 @@ void TDWF::setup(void) { unsigned int size; - size = 3*env().template lattice4dSize(); + size = 2*env().template lattice4dSize(); env().registerObject(getName(), size, par().Ls); } From 7e2482aad1c6b3c7f36bafa2e0754d7599b3e142 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 18:04:21 +0000 Subject: [PATCH 160/807] Hadrons: cpde cleaning --- tests/hadrons/Test_hadrons_meson_3pt.cc | 9 ++++----- tests/hadrons/Test_hadrons_spectrum.cc | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/hadrons/Test_hadrons_meson_3pt.cc b/tests/hadrons/Test_hadrons_meson_3pt.cc index b3156918..2645bfbe 100644 --- a/tests/hadrons/Test_hadrons_meson_3pt.cc +++ b/tests/hadrons/Test_hadrons_meson_3pt.cc @@ -42,11 +42,10 @@ int main(int argc, char *argv[]) LOG(Message) << "Grid initialized" << std::endl; // run setup /////////////////////////////////////////////////////////////// - Application application; - - std::vector flavour = {"l", "s", "c1", "c2", "c3"}; - std::vector mass = {.01, .04, .2 , .25 , .3 }; - unsigned int nt = GridDefaultLatt()[Tp]; + Application application; + std::vector flavour = {"l", "s", "c1", "c2", "c3"}; + std::vector mass = {.01, .04, .2 , .25 , .3 }; + unsigned int nt = GridDefaultLatt()[Tp]; // global parameters Application::GlobalPar globalPar; diff --git a/tests/hadrons/Test_hadrons_spectrum.cc b/tests/hadrons/Test_hadrons_spectrum.cc index 93d31fed..7e66ea9b 100644 --- a/tests/hadrons/Test_hadrons_spectrum.cc +++ b/tests/hadrons/Test_hadrons_spectrum.cc @@ -42,8 +42,7 @@ int main(int argc, char *argv[]) LOG(Message) << "Grid initialized" << std::endl; // run setup /////////////////////////////////////////////////////////////// - Application application; - + Application application; std::vector flavour = {"l", "s", "c1", "c2", "c3"}; std::vector mass = {.01, .04, .2 , .25 , .3 }; From decbb61ec1e64015e52fe5fbcaf8bbd8e768e533 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 18:19:24 +0000 Subject: [PATCH 161/807] Hadrons: XML driven program is again a binary installed with Grid --- .../Hadrons/{Hadrons.cc => HadronsXmlRun.cc} | 0 extras/Hadrons/Makefile.am | 4 ++ tests/hadrons/Test_hadrons_xmldriven.cc | 66 ------------------- 3 files changed, 4 insertions(+), 66 deletions(-) rename extras/Hadrons/{Hadrons.cc => HadronsXmlRun.cc} (100%) delete mode 100644 tests/hadrons/Test_hadrons_xmldriven.cc diff --git a/extras/Hadrons/Hadrons.cc b/extras/Hadrons/HadronsXmlRun.cc similarity index 100% rename from extras/Hadrons/Hadrons.cc rename to extras/Hadrons/HadronsXmlRun.cc diff --git a/extras/Hadrons/Makefile.am b/extras/Hadrons/Makefile.am index 6fd459dc..5d4a5c5e 100644 --- a/extras/Hadrons/Makefile.am +++ b/extras/Hadrons/Makefile.am @@ -1,4 +1,5 @@ lib_LIBRARIES = libHadrons.a +bin_PROGRAMS = HadronsXmlRun include modules.inc @@ -20,3 +21,6 @@ nobase_libHadrons_a_HEADERS = \ Module.hpp \ Modules.hpp \ ModuleFactory.hpp + +HadronsXmlRun_SOURCES = HadronsXmlRun.cc +HadronsXmlRun_LDADD = -lGrid libHadrons.a diff --git a/tests/hadrons/Test_hadrons_xmldriven.cc b/tests/hadrons/Test_hadrons_xmldriven.cc deleted file mode 100644 index feb547e9..00000000 --- a/tests/hadrons/Test_hadrons_xmldriven.cc +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* -Grid physics library, www.github.com/paboyle/Grid - -Source file: tests/hadrons/Test_hadrons_xmldriven.cc - -Copyright (C) 2015 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ - -#include - -using namespace Grid; -using namespace QCD; -using namespace Hadrons; - -int main(int argc, char *argv[]) -{ - // parse command line - std::string parameterFileName; - - if (argc < 2) - { - std::cerr << "usage: " << argv[0] << " [Grid options]"; - std::cerr << std::endl; - std::exit(EXIT_FAILURE); - } - parameterFileName = argv[1]; - - // initialization - Grid_init(&argc, &argv); - HadronsLogError.Active(GridLogError.isActive()); - HadronsLogWarning.Active(GridLogWarning.isActive()); - HadronsLogMessage.Active(GridLogMessage.isActive()); - HadronsLogIterative.Active(GridLogIterative.isActive()); - HadronsLogDebug.Active(GridLogDebug.isActive()); - LOG(Message) << "Grid initialized" << std::endl; - - // execution - Application application(parameterFileName); - - application.run(); - - // epilogue - LOG(Message) << "Grid is finalizing now" << std::endl; - Grid_finalize(); - - return EXIT_SUCCESS; -} From f3e49e4b73f4b450920f2a1fbd4cd1d2a9335861 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 18:19:46 +0000 Subject: [PATCH 162/807] Hadrons: module templates update --- extras/Hadrons/Modules/templates/Module.cc.template | 12 ++++++------ extras/Hadrons/Modules/templates/Module.hpp.template | 8 ++++---- .../Modules/templates/Module_in_NS.cc.template | 12 ++++++------ .../Modules/templates/Module_in_NS.hpp.template | 10 +++++----- .../Modules/templates/Module_tmp.hpp.template | 4 +--- .../Modules/templates/Module_tmp_in_NS.hpp.template | 4 +--- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/extras/Hadrons/Modules/templates/Module.cc.template b/extras/Hadrons/Modules/templates/Module.cc.template index 5cd7664d..0c509d6d 100644 --- a/extras/Hadrons/Modules/templates/Module.cc.template +++ b/extras/Hadrons/Modules/templates/Module.cc.template @@ -4,22 +4,22 @@ using namespace Grid; using namespace Hadrons; /****************************************************************************** -* ___FILEBASENAME___ implementation * +* T___FILEBASENAME___ implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -___FILEBASENAME___::___FILEBASENAME___(const std::string name) +T___FILEBASENAME___::T___FILEBASENAME___(const std::string name) : Module<___FILEBASENAME___Par>(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector ___FILEBASENAME___::getInput(void) +std::vector T___FILEBASENAME___::getInput(void) { std::vector in; return in; } -std::vector ___FILEBASENAME___::getOutput(void) +std::vector T___FILEBASENAME___::getOutput(void) { std::vector out = {getName()}; @@ -27,13 +27,13 @@ std::vector ___FILEBASENAME___::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void ___FILEBASENAME___::setup(void) +void T___FILEBASENAME___::setup(void) { } // execution /////////////////////////////////////////////////////////////////// -void ___FILEBASENAME___::execute(void) +void T___FILEBASENAME___::execute(void) { } diff --git a/extras/Hadrons/Modules/templates/Module.hpp.template b/extras/Hadrons/Modules/templates/Module.hpp.template index bee4e618..fb43260f 100644 --- a/extras/Hadrons/Modules/templates/Module.hpp.template +++ b/extras/Hadrons/Modules/templates/Module.hpp.template @@ -17,13 +17,13 @@ public: unsigned int, i); }; -class ___FILEBASENAME___: public Module<___FILEBASENAME___Par> +class T___FILEBASENAME___: public Module<___FILEBASENAME___Par> { public: // constructor - ___FILEBASENAME___(const std::string name); + T___FILEBASENAME___(const std::string name); // destructor - virtual ~___FILEBASENAME___(void) = default; + virtual ~T___FILEBASENAME___(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -33,7 +33,7 @@ public: virtual void execute(void); }; -MODULE_REGISTER(___FILEBASENAME___); +MODULE_REGISTER(___FILEBASENAME___, T___FILEBASENAME___); END_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.cc.template b/extras/Hadrons/Modules/templates/Module_in_NS.cc.template index 64bc7aa9..8b2a0ec0 100644 --- a/extras/Hadrons/Modules/templates/Module_in_NS.cc.template +++ b/extras/Hadrons/Modules/templates/Module_in_NS.cc.template @@ -5,22 +5,22 @@ using namespace Hadrons; using namespace ___NAMESPACE___; /****************************************************************************** -* ___FILEBASENAME___ implementation * +* T___FILEBASENAME___ implementation * ******************************************************************************/ // constructor ///////////////////////////////////////////////////////////////// -___FILEBASENAME___::___FILEBASENAME___(const std::string name) +T___FILEBASENAME___::T___FILEBASENAME___(const std::string name) : Module<___FILEBASENAME___Par>(name) {} // dependencies/products /////////////////////////////////////////////////////// -std::vector ___FILEBASENAME___::getInput(void) +std::vector T___FILEBASENAME___::getInput(void) { std::vector in; return in; } -std::vector ___FILEBASENAME___::getOutput(void) +std::vector T___FILEBASENAME___::getOutput(void) { std::vector out = {getName()}; @@ -28,13 +28,13 @@ std::vector ___FILEBASENAME___::getOutput(void) } // setup /////////////////////////////////////////////////////////////////////// -void ___FILEBASENAME___::setup(void) +void T___FILEBASENAME___::setup(void) { } // execution /////////////////////////////////////////////////////////////////// -void ___FILEBASENAME___::execute(void) +void T___FILEBASENAME___::execute(void) { } diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template index 490e5a78..ece2bb58 100644 --- a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template @@ -19,13 +19,13 @@ public: unsigned int, i); }; -class ___FILEBASENAME___: public Module<___FILEBASENAME___Par> +class T___FILEBASENAME___: public Module<___FILEBASENAME___Par> { public: // constructor - ___FILEBASENAME___(const std::string name); + T___FILEBASENAME___(const std::string name); // destructor - virtual ~___FILEBASENAME___(void) = default; + virtual ~T___FILEBASENAME___(void) = default; // dependency relation virtual std::vector getInput(void); virtual std::vector getOutput(void); @@ -35,9 +35,9 @@ public: virtual void execute(void); }; -END_MODULE_NAMESPACE +MODULE_REGISTER_NS(___FILEBASENAME___, T___FILEBASENAME___, ___NAMESPACE___); -MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___); +END_MODULE_NAMESPACE END_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/templates/Module_tmp.hpp.template b/extras/Hadrons/Modules/templates/Module_tmp.hpp.template index 53bee52b..2ee053a9 100644 --- a/extras/Hadrons/Modules/templates/Module_tmp.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_tmp.hpp.template @@ -34,7 +34,7 @@ public: virtual void execute(void); }; -typedef T___FILEBASENAME___ ___FILEBASENAME___; +MODULE_REGISTER(___FILEBASENAME___, T___FILEBASENAME___); /****************************************************************************** * T___FILEBASENAME___ implementation * @@ -76,8 +76,6 @@ void T___FILEBASENAME___::execute(void) } -MODULE_REGISTER(___FILEBASENAME___); - END_HADRONS_NAMESPACE #endif // Hadrons____FILEBASENAME____hpp_ 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 e7ff8ace..a330652d 100644 --- a/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template +++ b/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template @@ -36,7 +36,7 @@ public: virtual void execute(void); }; -typedef T___FILEBASENAME___ ___FILEBASENAME___; +MODULE_REGISTER_NS(___FILEBASENAME___, T___FILEBASENAME___, ___NAMESPACE___); /****************************************************************************** * T___FILEBASENAME___ implementation * @@ -80,8 +80,6 @@ void T___FILEBASENAME___::execute(void) END_MODULE_NAMESPACE -MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___); - END_HADRONS_NAMESPACE #endif // Hadrons____FILEBASENAME____hpp_ From 846272b0378626640b9fd674e74eff050690ba8a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 19:40:36 +0000 Subject: [PATCH 163/807] Hadrons: option to save and load a schedule --- extras/Hadrons/Application.cc | 113 +++++++++++++++++++++++++-------- extras/Hadrons/Application.hpp | 15 +++-- 2 files changed, 96 insertions(+), 32 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 07971a16..3a7c93fa 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -87,11 +87,15 @@ const Application::GlobalPar & Application::getPar(void) // execute ///////////////////////////////////////////////////////////////////// void Application::run(void) { - if (!parameterFileName_.empty()) + if (!parameterFileName_.empty() and (env_.getNModule() == 0)) { parseParameterFile(parameterFileName_); } - schedule(); + if (!scheduled_) + { + schedule(); + } + printSchedule(); configLoop(); } @@ -110,7 +114,7 @@ void Application::parseParameterFile(const std::string parameterFileName) GlobalPar par; ObjectId id; - LOG(Message) << "Reading '" << parameterFileName << "'..." << std::endl; + LOG(Message) << "Building application from '" << parameterFileName << "'..." << std::endl; read(reader, "parameters", par); setPar(par); push(reader, "modules"); @@ -130,7 +134,7 @@ void Application::saveParameterFile(const std::string parameterFileName) ObjectId id; const unsigned int nMod = env_.getNModule(); - LOG(Message) << "Writing '" << parameterFileName << "'..." << std::endl; + LOG(Message) << "Saving application to '" << parameterFileName << "'..." << std::endl; write(writer, "parameters", getPar()); push(writer, "modules"); for (unsigned int i = 0; i < nMod; ++i) @@ -150,29 +154,31 @@ void Application::saveParameterFile(const std::string parameterFileName) #define MEM_MSG(size)\ sizeString((size)*locVol_) << " (" << sizeString(size) << "/site)" +#define DEFINE_MEMPEAK \ +auto memPeak = [this](const std::vector &program)\ +{\ + unsigned int memPeak;\ + bool msg;\ + \ + msg = HadronsLogMessage.isActive();\ + HadronsLogMessage.Active(false);\ + env_.dryRun(true);\ + memPeak = env_.executeProgram(program);\ + env_.dryRun(false);\ + env_.freeAll();\ + HadronsLogMessage.Active(true);\ + \ + return memPeak;\ +} + void Application::schedule(void) { - // memory peak function - auto memPeak = [this](const std::vector &program) - { - unsigned int memPeak; - bool msg; - - msg = HadronsLogMessage.isActive(); - HadronsLogMessage.Active(false); - env_.dryRun(true); - memPeak = env_.executeProgram(program); - env_.dryRun(false); - env_.freeAll(); - HadronsLogMessage.Active(true); - - return memPeak; - }; + DEFINE_MEMPEAK; // build module dependency graph LOG(Message) << "Building module graph..." << std::endl; - auto graph = env_.makeModuleGraph(); - auto con = graph.getConnectedComponents(); + auto graph = env_.makeModuleGraph(); + auto con = graph.getConnectedComponents(); // constrained topological sort using a genetic algorithm LOG(Message) << "Scheduling computation..." << std::endl; @@ -189,6 +195,7 @@ void Application::schedule(void) par.popSize = par_.genetic.popSize; par.mutationRate = par_.genetic.mutationRate; par.seed = rd(); + memPeak_ = 0; CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed)); for (unsigned int i = 0; i < con.size(); ++i) { @@ -222,16 +229,68 @@ void Application::schedule(void) } while ((gen < par_.genetic.maxGen) and (nCstPeak < par_.genetic.maxCstGen)); auto &t = scheduler.getMinSchedule(); - LOG(Message) << "Program " << i + 1 << " (memory peak: " - << MEM_MSG(scheduler.getMinValue()) << "):" << std::endl; + if (scheduler.getMinValue() > memPeak_) + { + memPeak_ = scheduler.getMinValue(); + } for (unsigned int j = 0; j < t.size(); ++j) { program_.push_back(t[j]); - LOG(Message) << std::setw(4) << k + 1 << ": " - << env_.getModuleName(program_[k]) << std::endl; - k++; } } + scheduled_ = true; +} + +void Application::saveSchedule(const std::string filename) +{ + TextWriter writer(filename); + std::vector program; + + if (!scheduled_) + { + HADRON_ERROR("Computation not scheduled"); + } + LOG(Message) << "Saving current schedule to '" << filename << "'..." + << std::endl; + for (auto address: program_) + { + program.push_back(env_.getModuleName(address)); + } + write(writer, "schedule", program); +} + +void Application::loadSchedule(const std::string filename) +{ + DEFINE_MEMPEAK; + + TextReader reader(filename); + std::vector program; + + LOG(Message) << "Loading schedule from '" << filename << "'..." + << std::endl; + read(reader, "schedule", program); + program_.clear(); + for (auto &name: program) + { + program_.push_back(env_.getModuleAddress(name)); + } + scheduled_ = true; + memPeak_ = memPeak(program_); +} + +void Application::printSchedule(void) +{ + if (!scheduled_) + { + HADRON_ERROR("Computation not scheduled"); + } + LOG(Message) << "Schedule (memory peak: " << MEM_MSG(memPeak_) << "):" + << std::endl; + for (unsigned int i = 0; i < program_.size(); ++i) + { + LOG(Message) << std::setw(4) << i + 1 << ": " + << env_.getModuleName(program_[i]) << std::endl; + } } // loop on configurations ////////////////////////////////////////////////////// diff --git a/extras/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp index 65e9ad34..f84b0caa 100644 --- a/extras/Hadrons/Application.hpp +++ b/extras/Hadrons/Application.hpp @@ -91,14 +91,19 @@ public: void saveParameterFile(const std::string parameterFileName); // schedule computation void schedule(void); + void saveSchedule(const std::string filename); + void loadSchedule(const std::string filename); + void printSchedule(void); // loop on configurations void configLoop(void); private: - long unsigned int locVol_; - std::string parameterFileName_{""}; - GlobalPar par_; - Environment &env_; - std::vector program_; + long unsigned int locVol_; + std::string parameterFileName_{""}; + GlobalPar par_; + Environment &env_; + std::vector program_; + Environment::Size memPeak_; + bool scheduled_{false}; }; /****************************************************************************** From ab92de89abb61be943e90e1f93aeadbf6b5670d9 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 19:41:04 +0000 Subject: [PATCH 164/807] Hadrons: utility to schedule a run --- extras/Hadrons/HadronsXmlSchedule.cc | 70 ++++++++++++++++++++++++++++ extras/Hadrons/Makefile.am | 5 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 extras/Hadrons/HadronsXmlSchedule.cc diff --git a/extras/Hadrons/HadronsXmlSchedule.cc b/extras/Hadrons/HadronsXmlSchedule.cc new file mode 100644 index 00000000..09c61c5f --- /dev/null +++ b/extras/Hadrons/HadronsXmlSchedule.cc @@ -0,0 +1,70 @@ +/******************************************************************************* + Grid physics library, www.github.com/paboyle/Grid + + Source file: programs/Hadrons/HadronsXmlSchedule.cc + + Copyright (C) 2015 + + Author: Antonin Portelli + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution + directory. + *******************************************************************************/ + +#include + +using namespace Grid; +using namespace QCD; +using namespace Hadrons; + +int main(int argc, char *argv[]) +{ + // parse command line + std::string parameterFileName, scheduleFileName; + + if (argc < 3) + { + std::cerr << "usage: " << argv[0] << " [Grid options]"; + std::cerr << std::endl; + std::exit(EXIT_FAILURE); + } + parameterFileName = argv[1]; + scheduleFileName = argv[2]; + + // initialization + Grid_init(&argc, &argv); + HadronsLogError.Active(GridLogError.isActive()); + HadronsLogWarning.Active(GridLogWarning.isActive()); + HadronsLogMessage.Active(GridLogMessage.isActive()); + HadronsLogIterative.Active(GridLogIterative.isActive()); + HadronsLogDebug.Active(GridLogDebug.isActive()); + LOG(Message) << "Grid initialized" << std::endl; + + // execution + Application application; + + application.parseParameterFile(parameterFileName); + application.schedule(); + application.printSchedule(); + application.saveSchedule(scheduleFileName); + + // epilogue + LOG(Message) << "Grid is finalizing now" << std::endl; + Grid_finalize(); + + return EXIT_SUCCESS; +} diff --git a/extras/Hadrons/Makefile.am b/extras/Hadrons/Makefile.am index 5d4a5c5e..bdc23efb 100644 --- a/extras/Hadrons/Makefile.am +++ b/extras/Hadrons/Makefile.am @@ -1,5 +1,5 @@ lib_LIBRARIES = libHadrons.a -bin_PROGRAMS = HadronsXmlRun +bin_PROGRAMS = HadronsXmlRun HadronsXmlSchedule include modules.inc @@ -24,3 +24,6 @@ nobase_libHadrons_a_HEADERS = \ HadronsXmlRun_SOURCES = HadronsXmlRun.cc HadronsXmlRun_LDADD = -lGrid libHadrons.a + +HadronsXmlSchedule_SOURCES = HadronsXmlSchedule.cc +HadronsXmlSchedule_LDADD = -lGrid libHadrons.a From f63fac0c69d41dee091e0ff0a7e5f150517f41f9 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 19:41:30 +0000 Subject: [PATCH 165/807] Hadrons: the XML runner can use a precomputed schedule --- extras/Hadrons/HadronsXmlRun.cc | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/extras/Hadrons/HadronsXmlRun.cc b/extras/Hadrons/HadronsXmlRun.cc index ad43b6cc..b7384424 100644 --- a/extras/Hadrons/HadronsXmlRun.cc +++ b/extras/Hadrons/HadronsXmlRun.cc @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Hadrons.cc +Source file: programs/Hadrons/HadronsXmlRun.cc Copyright (C) 2015 @@ -34,15 +34,22 @@ using namespace Hadrons; int main(int argc, char *argv[]) { // parse command line - std::string parameterFileName; + std::string parameterFileName, scheduleFileName = ""; if (argc < 2) { - std::cerr << "usage: " << argv[0] << " [Grid options]"; + std::cerr << "usage: " << argv[0] << " [] [Grid options]"; std::cerr << std::endl; std::exit(EXIT_FAILURE); } parameterFileName = argv[1]; + if (argc > 2) + { + if (argv[2][0] != '-') + { + scheduleFileName = argv[2]; + } + } // initialization Grid_init(&argc, &argv); @@ -56,6 +63,11 @@ int main(int argc, char *argv[]) // execution Application application(parameterFileName); + application.parseParameterFile(parameterFileName); + if (!scheduleFileName.empty()) + { + application.loadSchedule(scheduleFileName); + } application.run(); // epilogue From cad158e42f305a0b097dd7c1ce0b47fdb88fa939 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 14 Dec 2016 19:41:51 +0000 Subject: [PATCH 166/807] Hadrons: tests improvement --- tests/hadrons/Test_hadrons_meson_3pt.cc | 3 ++- tests/hadrons/Test_hadrons_spectrum.cc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/hadrons/Test_hadrons_meson_3pt.cc b/tests/hadrons/Test_hadrons_meson_3pt.cc index 2645bfbe..56d0efa7 100644 --- a/tests/hadrons/Test_hadrons_meson_3pt.cc +++ b/tests/hadrons/Test_hadrons_meson_3pt.cc @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) { // sequential sources MSource::SeqGamma::Par seqPar; - qName.push_back("QZ2_" + flavour[i] + srcName); + qName.push_back("QZ2_" + flavour[i] + "_" + std::to_string(t)); seqPar.q = qName[i]; seqPar.tA = (t + nt/4) % nt; seqPar.tB = (t + nt/4) % nt; @@ -159,6 +159,7 @@ int main(int argc, char *argv[]) } // execution + application.saveParameterFile("meson3pt.xml"); application.run(); // epilogue diff --git a/tests/hadrons/Test_hadrons_spectrum.cc b/tests/hadrons/Test_hadrons_spectrum.cc index 7e66ea9b..ea6e4479 100644 --- a/tests/hadrons/Test_hadrons_spectrum.cc +++ b/tests/hadrons/Test_hadrons_spectrum.cc @@ -121,6 +121,7 @@ int main(int argc, char *argv[]) } // execution + application.saveParameterFile("spectrum.xml"); application.run(); // epilogue From 596dd570c76b8e22c7a426a4ff7871a7b630e3a4 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 15 Dec 2016 12:26:53 +0000 Subject: [PATCH 167/807] Linux linking fix --- extras/Hadrons/Makefile.am | 4 ++-- scripts/filelist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/Hadrons/Makefile.am b/extras/Hadrons/Makefile.am index bdc23efb..9cb23600 100644 --- a/extras/Hadrons/Makefile.am +++ b/extras/Hadrons/Makefile.am @@ -23,7 +23,7 @@ nobase_libHadrons_a_HEADERS = \ ModuleFactory.hpp HadronsXmlRun_SOURCES = HadronsXmlRun.cc -HadronsXmlRun_LDADD = -lGrid libHadrons.a +HadronsXmlRun_LDADD = libHadrons.a -lGrid HadronsXmlSchedule_SOURCES = HadronsXmlSchedule.cc -HadronsXmlSchedule_LDADD = -lGrid libHadrons.a +HadronsXmlSchedule_LDADD = libHadrons.a -lGrid diff --git a/scripts/filelist b/scripts/filelist index ca7425c0..1ab95c7c 100755 --- a/scripts/filelist +++ b/scripts/filelist @@ -24,11 +24,11 @@ for subdir in $dirs; do echo "tests: ${TESTLIST} ${SUB}" > Make.inc echo ${PREF}_PROGRAMS = ${TESTLIST} >> Make.inc echo >> Make.inc - HADLINK=`[ $subdir = './hadrons' ] && echo '-lHadrons'` + HADLINK=`[ $subdir = './hadrons' ] && echo '-lHadrons '` for f in $TESTS; do BNAME=`basename $f .cc` echo ${BNAME}_SOURCES=$f >> Make.inc - echo ${BNAME}_LDADD=-lGrid ${HADLINK} >> Make.inc + echo ${BNAME}_LDADD=${HADLINK}-lGrid >> Make.inc echo >> Make.inc done if [ $subdir != '.' ]; then From b791c274b0ec610fdaef91e3d894cbb2bbab4f8f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 15 Dec 2016 18:15:35 +0000 Subject: [PATCH 168/807] Revert "AVX: uninitialised variable fix" This reverts commit c22c3db9ad652eadbd334fde70235aace90faa75. --- lib/simd/Grid_avx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/simd/Grid_avx.h b/lib/simd/Grid_avx.h index 77927b10..36360102 100644 --- a/lib/simd/Grid_avx.h +++ b/lib/simd/Grid_avx.h @@ -514,7 +514,7 @@ namespace Optimization { template static inline __m256 tRotate(__m256 in){ __m256 tmp = Permute::Permute0(in); - __m256 ret = in; + __m256 ret; if ( n > 3 ) { _mm256_alignr_epi32_grid(ret,in,tmp,n); } else { @@ -526,7 +526,7 @@ namespace Optimization { template static inline __m256d tRotate(__m256d in){ __m256d tmp = Permute::Permute0(in); - __m256d ret = in; + __m256d ret; if ( n > 1 ) { _mm256_alignr_epi64_grid(ret,in,tmp,n); } else { From 80cef1c78ff0efaf726a6b926ca46a49941fc950 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 15 Dec 2016 18:21:52 +0000 Subject: [PATCH 169/807] Hadrons: legal banner fix --- extras/Hadrons/Application.cc | 1 + extras/Hadrons/Application.hpp | 1 + extras/Hadrons/Environment.cc | 1 + extras/Hadrons/Environment.hpp | 1 + extras/Hadrons/Factory.hpp | 1 + extras/Hadrons/GeneticScheduler.hpp | 1 + extras/Hadrons/Global.cc | 1 + extras/Hadrons/Global.hpp | 1 + extras/Hadrons/Graph.hpp | 1 + extras/Hadrons/HadronsXmlRun.cc | 1 + extras/Hadrons/HadronsXmlSchedule.cc | 1 + extras/Hadrons/Module.cc | 1 + extras/Hadrons/Module.hpp | 1 + extras/Hadrons/ModuleFactory.hpp | 1 + extras/Hadrons/Modules/MAction/DWF.hpp | 1 + extras/Hadrons/Modules/MAction/Wilson.hpp | 3 ++- extras/Hadrons/Modules/MContraction/Meson.hpp | 2 +- extras/Hadrons/Modules/MGauge/Load.cc | 1 + extras/Hadrons/Modules/MGauge/Load.hpp | 1 + extras/Hadrons/Modules/MGauge/Random.cc | 1 + extras/Hadrons/Modules/MGauge/Random.hpp | 1 + extras/Hadrons/Modules/MGauge/Unit.cc | 1 + extras/Hadrons/Modules/MGauge/Unit.hpp | 1 + extras/Hadrons/Modules/MSolver/RBPrecCG.hpp | 3 ++- extras/Hadrons/Modules/MSource/Point.hpp | 3 ++- extras/Hadrons/Modules/MSource/Z2.hpp | 3 ++- extras/Hadrons/Modules/Quark.hpp | 3 ++- 27 files changed, 32 insertions(+), 6 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 3a7c93fa..85eda97a 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include #include diff --git a/extras/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp index f84b0caa..05179e97 100644 --- a/extras/Hadrons/Application.hpp +++ b/extras/Hadrons/Application.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Application_hpp_ #define Hadrons_Application_hpp_ diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 60d8da00..62e611c3 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include #include diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index 065c889a..b3ff160b 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Environment_hpp_ #define Hadrons_Environment_hpp_ diff --git a/extras/Hadrons/Factory.hpp b/extras/Hadrons/Factory.hpp index ea358c21..65de9b96 100644 --- a/extras/Hadrons/Factory.hpp +++ b/extras/Hadrons/Factory.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Factory_hpp_ #define Hadrons_Factory_hpp_ diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index 857a4099..c93ac2e5 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_GeneticScheduler_hpp_ #define Hadrons_GeneticScheduler_hpp_ diff --git a/extras/Hadrons/Global.cc b/extras/Hadrons/Global.cc index 5c915172..296038e4 100644 --- a/extras/Hadrons/Global.cc +++ b/extras/Hadrons/Global.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index 1ecbe7cf..e6d2adaa 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Global_hpp_ #define Hadrons_Global_hpp_ diff --git a/extras/Hadrons/Graph.hpp b/extras/Hadrons/Graph.hpp index 37ad077d..8f5beb30 100644 --- a/extras/Hadrons/Graph.hpp +++ b/extras/Hadrons/Graph.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Graph_hpp_ #define Hadrons_Graph_hpp_ diff --git a/extras/Hadrons/HadronsXmlRun.cc b/extras/Hadrons/HadronsXmlRun.cc index b7384424..a022c285 100644 --- a/extras/Hadrons/HadronsXmlRun.cc +++ b/extras/Hadrons/HadronsXmlRun.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/HadronsXmlSchedule.cc b/extras/Hadrons/HadronsXmlSchedule.cc index 09c61c5f..5e213ab3 100644 --- a/extras/Hadrons/HadronsXmlSchedule.cc +++ b/extras/Hadrons/HadronsXmlSchedule.cc @@ -24,6 +24,7 @@ See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/Module.cc b/extras/Hadrons/Module.cc index dccae582..fabc6557 100644 --- a/extras/Hadrons/Module.cc +++ b/extras/Hadrons/Module.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index 358621f4..abb9cfd3 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Module_hpp_ #define Hadrons_Module_hpp_ diff --git a/extras/Hadrons/ModuleFactory.hpp b/extras/Hadrons/ModuleFactory.hpp index 01cc130c..b893cb8a 100644 --- a/extras/Hadrons/ModuleFactory.hpp +++ b/extras/Hadrons/ModuleFactory.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_ModuleFactory_hpp_ #define Hadrons_ModuleFactory_hpp_ diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index 4bed2596..15654627 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_DWF_hpp_ #define Hadrons_DWF_hpp_ diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp index 6a01d92e..cff6d482 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/TWilson.hpp +Source file: programs/Hadrons/Wilson.hpp Copyright (C) 2016 @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Wilson_hpp_ #define Hadrons_Wilson_hpp_ diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index 438f3740..755cc7c8 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/TMeson.hpp +Source file: programs/Hadrons/Meson.hpp Copyright (C) 2015 diff --git a/extras/Hadrons/Modules/MGauge/Load.cc b/extras/Hadrons/Modules/MGauge/Load.cc index 82920d97..ba0d3a99 100644 --- a/extras/Hadrons/Modules/MGauge/Load.cc +++ b/extras/Hadrons/Modules/MGauge/Load.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/Modules/MGauge/Load.hpp b/extras/Hadrons/Modules/MGauge/Load.hpp index 21f9331c..32274104 100644 --- a/extras/Hadrons/Modules/MGauge/Load.hpp +++ b/extras/Hadrons/Modules/MGauge/Load.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Load_hpp_ #define Hadrons_Load_hpp_ diff --git a/extras/Hadrons/Modules/MGauge/Random.cc b/extras/Hadrons/Modules/MGauge/Random.cc index 2c25f7c1..bff989a4 100644 --- a/extras/Hadrons/Modules/MGauge/Random.cc +++ b/extras/Hadrons/Modules/MGauge/Random.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/Modules/MGauge/Random.hpp b/extras/Hadrons/Modules/MGauge/Random.hpp index 95db726c..dbc185a5 100644 --- a/extras/Hadrons/Modules/MGauge/Random.hpp +++ b/extras/Hadrons/Modules/MGauge/Random.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Random_hpp_ #define Hadrons_Random_hpp_ diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc index 16dcff83..d6d6da76 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.cc +++ b/extras/Hadrons/Modules/MGauge/Unit.cc @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #include diff --git a/extras/Hadrons/Modules/MGauge/Unit.hpp b/extras/Hadrons/Modules/MGauge/Unit.hpp index d9566958..86a4e128 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.hpp +++ b/extras/Hadrons/Modules/MGauge/Unit.hpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Unit_hpp_ #define Hadrons_Unit_hpp_ diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index 82f2eafa..874957c0 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/TRBPrecCG.hpp +Source file: programs/Hadrons/RBPrecCG.hpp Copyright (C) 2016 @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_RBPrecCG_hpp_ #define Hadrons_RBPrecCG_hpp_ diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index 84952512..be3ad982 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/TPoint.hpp +Source file: programs/Hadrons/Point.hpp Copyright (C) 2016 @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Point_hpp_ #define Hadrons_Point_hpp_ diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp index e50b2a73..1bcd276d 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/TZ2.hpp +Source file: programs/Hadrons/Z2.hpp Copyright (C) 2016 @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Z2_hpp_ #define Hadrons_Z2_hpp_ diff --git a/extras/Hadrons/Modules/Quark.hpp b/extras/Hadrons/Modules/Quark.hpp index 81b74755..e2c11aaa 100644 --- a/extras/Hadrons/Modules/Quark.hpp +++ b/extras/Hadrons/Modules/Quark.hpp @@ -1,7 +1,7 @@ /******************************************************************************* Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/TQuark.hpp +Source file: programs/Hadrons/Quark.hpp Copyright (C) 2015 @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., See the full license in the file "LICENSE" in the top level distribution directory. *******************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Quark_hpp_ #define Hadrons_Quark_hpp_ From 67d72000e78863a825f5e1952c69ea0c3213bd77 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 15 Dec 2016 18:26:39 +0000 Subject: [PATCH 170/807] Hadrons: more legal banner fixes --- extras/Hadrons/Application.cc | 11 ++-- extras/Hadrons/Application.hpp | 11 ++-- extras/Hadrons/Environment.cc | 11 ++-- extras/Hadrons/Environment.hpp | 11 ++-- extras/Hadrons/Factory.hpp | 11 ++-- extras/Hadrons/GeneticScheduler.hpp | 11 ++-- extras/Hadrons/Global.cc | 11 ++-- extras/Hadrons/Global.hpp | 11 ++-- extras/Hadrons/Graph.hpp | 11 ++-- extras/Hadrons/HadronsXmlRun.cc | 11 ++-- extras/Hadrons/HadronsXmlSchedule.cc | 53 ++++++++++--------- extras/Hadrons/Module.cc | 11 ++-- extras/Hadrons/Module.hpp | 11 ++-- extras/Hadrons/ModuleFactory.hpp | 11 ++-- extras/Hadrons/Modules.hpp | 28 ++++++++++ extras/Hadrons/Modules/MAction/DWF.hpp | 11 ++-- extras/Hadrons/Modules/MAction/Wilson.hpp | 11 ++-- .../Hadrons/Modules/MContraction/Baryon.hpp | 29 ++++++++++ extras/Hadrons/Modules/MContraction/Meson.hpp | 12 +++-- extras/Hadrons/Modules/MGauge/Load.cc | 11 ++-- extras/Hadrons/Modules/MGauge/Load.hpp | 11 ++-- extras/Hadrons/Modules/MGauge/Random.cc | 11 ++-- extras/Hadrons/Modules/MGauge/Random.hpp | 11 ++-- extras/Hadrons/Modules/MGauge/Unit.cc | 11 ++-- extras/Hadrons/Modules/MGauge/Unit.hpp | 11 ++-- extras/Hadrons/Modules/MSolver/RBPrecCG.hpp | 11 ++-- extras/Hadrons/Modules/MSource/Point.hpp | 11 ++-- extras/Hadrons/Modules/MSource/SeqGamma.hpp | 29 ++++++++++ extras/Hadrons/Modules/MSource/Z2.hpp | 11 ++-- extras/Hadrons/Modules/Quark.hpp | 11 ++-- 30 files changed, 270 insertions(+), 156 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index 85eda97a..cf7906eb 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Application.cc +Source file: extras/Hadrons/Application.cc Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Application.hpp b/extras/Hadrons/Application.hpp index 05179e97..4ea262df 100644 --- a/extras/Hadrons/Application.hpp +++ b/extras/Hadrons/Application.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Application.hpp +Source file: extras/Hadrons/Application.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Application_hpp_ diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 62e611c3..4b230e20 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Environment.cc +Source file: extras/Hadrons/Environment.cc Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index b3ff160b..41a7a008 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Environment.hpp +Source file: extras/Hadrons/Environment.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Environment_hpp_ diff --git a/extras/Hadrons/Factory.hpp b/extras/Hadrons/Factory.hpp index 65de9b96..da86acae 100644 --- a/extras/Hadrons/Factory.hpp +++ b/extras/Hadrons/Factory.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Factory.hpp +Source file: extras/Hadrons/Factory.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Factory_hpp_ diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index c93ac2e5..7b5fc183 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/GeneticScheduler.hpp +Source file: extras/Hadrons/GeneticScheduler.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_GeneticScheduler_hpp_ diff --git a/extras/Hadrons/Global.cc b/extras/Hadrons/Global.cc index 296038e4..7b0b8fb6 100644 --- a/extras/Hadrons/Global.cc +++ b/extras/Hadrons/Global.cc @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Global.cc +Source file: extras/Hadrons/Global.cc Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index e6d2adaa..81afab13 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Global.hpp +Source file: extras/Hadrons/Global.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Global_hpp_ diff --git a/extras/Hadrons/Graph.hpp b/extras/Hadrons/Graph.hpp index 8f5beb30..df255517 100644 --- a/extras/Hadrons/Graph.hpp +++ b/extras/Hadrons/Graph.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Graph.hpp +Source file: extras/Hadrons/Graph.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Graph_hpp_ diff --git a/extras/Hadrons/HadronsXmlRun.cc b/extras/Hadrons/HadronsXmlRun.cc index a022c285..0dff8f9a 100644 --- a/extras/Hadrons/HadronsXmlRun.cc +++ b/extras/Hadrons/HadronsXmlRun.cc @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/HadronsXmlRun.cc +Source file: extras/Hadrons/HadronsXmlRun.cc Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/HadronsXmlSchedule.cc b/extras/Hadrons/HadronsXmlSchedule.cc index 5e213ab3..a8ca9a63 100644 --- a/extras/Hadrons/HadronsXmlSchedule.cc +++ b/extras/Hadrons/HadronsXmlSchedule.cc @@ -1,29 +1,30 @@ -/******************************************************************************* - Grid physics library, www.github.com/paboyle/Grid - - Source file: programs/Hadrons/HadronsXmlSchedule.cc - - Copyright (C) 2015 - - Author: Antonin Portelli - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - See the full license in the file "LICENSE" in the top level distribution - directory. - *******************************************************************************/ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/HadronsXmlSchedule.cc + +Copyright (C) 2015 +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Module.cc b/extras/Hadrons/Module.cc index fabc6557..2549a931 100644 --- a/extras/Hadrons/Module.cc +++ b/extras/Hadrons/Module.cc @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Module.cc +Source file: extras/Hadrons/Module.cc Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index abb9cfd3..071e254a 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Module.hpp +Source file: extras/Hadrons/Module.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Module_hpp_ diff --git a/extras/Hadrons/ModuleFactory.hpp b/extras/Hadrons/ModuleFactory.hpp index b893cb8a..48ab305c 100644 --- a/extras/Hadrons/ModuleFactory.hpp +++ b/extras/Hadrons/ModuleFactory.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/ModuleFactory.hpp +Source file: extras/Hadrons/ModuleFactory.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_ModuleFactory_hpp_ diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp index 72807d8b..77ae08b7 100644 --- a/extras/Hadrons/Modules.hpp +++ b/extras/Hadrons/Modules.hpp @@ -1,3 +1,31 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/Modules.hpp + +Copyright (C) 2015 +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ #include #include #include diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/extras/Hadrons/Modules/MAction/DWF.hpp index 15654627..49861e3e 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/extras/Hadrons/Modules/MAction/DWF.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/DWF.hpp +Source file: extras/Hadrons/Modules/MAction/DWF.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_DWF_hpp_ diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/extras/Hadrons/Modules/MAction/Wilson.hpp index cff6d482..6ffa997d 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/extras/Hadrons/Modules/MAction/Wilson.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Wilson.hpp +Source file: extras/Hadrons/Modules/MAction/Wilson.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Wilson_hpp_ diff --git a/extras/Hadrons/Modules/MContraction/Baryon.hpp b/extras/Hadrons/Modules/MContraction/Baryon.hpp index 6ae9c1ab..6bccda2e 100644 --- a/extras/Hadrons/Modules/MContraction/Baryon.hpp +++ b/extras/Hadrons/Modules/MContraction/Baryon.hpp @@ -1,3 +1,32 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/Modules/MContraction/Baryon.hpp + +Copyright (C) 2015 +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ + #ifndef Hadrons_Baryon_hpp_ #define Hadrons_Baryon_hpp_ diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index 755cc7c8..dc4f60ee 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Meson.hpp +Source file: extras/Hadrons/Modules/MContraction/Meson.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ #ifndef Hadrons_Meson_hpp_ #define Hadrons_Meson_hpp_ diff --git a/extras/Hadrons/Modules/MGauge/Load.cc b/extras/Hadrons/Modules/MGauge/Load.cc index ba0d3a99..e5ee8abb 100644 --- a/extras/Hadrons/Modules/MGauge/Load.cc +++ b/extras/Hadrons/Modules/MGauge/Load.cc @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Load.cc +Source file: extras/Hadrons/Modules/MGauge/Load.cc +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Modules/MGauge/Load.hpp b/extras/Hadrons/Modules/MGauge/Load.hpp index 32274104..c41f9b8c 100644 --- a/extras/Hadrons/Modules/MGauge/Load.hpp +++ b/extras/Hadrons/Modules/MGauge/Load.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Load.hpp +Source file: extras/Hadrons/Modules/MGauge/Load.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Load_hpp_ diff --git a/extras/Hadrons/Modules/MGauge/Random.cc b/extras/Hadrons/Modules/MGauge/Random.cc index bff989a4..c10fdfc3 100644 --- a/extras/Hadrons/Modules/MGauge/Random.cc +++ b/extras/Hadrons/Modules/MGauge/Random.cc @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Random.cc +Source file: extras/Hadrons/Modules/MGauge/Random.cc +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Modules/MGauge/Random.hpp b/extras/Hadrons/Modules/MGauge/Random.hpp index dbc185a5..e3fbcf1a 100644 --- a/extras/Hadrons/Modules/MGauge/Random.hpp +++ b/extras/Hadrons/Modules/MGauge/Random.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Random.hpp +Source file: extras/Hadrons/Modules/MGauge/Random.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Random_hpp_ diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/extras/Hadrons/Modules/MGauge/Unit.cc index d6d6da76..18d75c59 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.cc +++ b/extras/Hadrons/Modules/MGauge/Unit.cc @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Unit.cc +Source file: extras/Hadrons/Modules/MGauge/Unit.cc +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #include diff --git a/extras/Hadrons/Modules/MGauge/Unit.hpp b/extras/Hadrons/Modules/MGauge/Unit.hpp index 86a4e128..2ff10bfd 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.hpp +++ b/extras/Hadrons/Modules/MGauge/Unit.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Unit.hpp +Source file: extras/Hadrons/Modules/MGauge/Unit.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Unit_hpp_ diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp index 874957c0..d7220271 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/RBPrecCG.hpp +Source file: extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_RBPrecCG_hpp_ diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp index be3ad982..a0ecbc2a 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/extras/Hadrons/Modules/MSource/Point.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Point.hpp +Source file: extras/Hadrons/Modules/MSource/Point.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Point_hpp_ diff --git a/extras/Hadrons/Modules/MSource/SeqGamma.hpp b/extras/Hadrons/Modules/MSource/SeqGamma.hpp index 70b603fe..181f9532 100644 --- a/extras/Hadrons/Modules/MSource/SeqGamma.hpp +++ b/extras/Hadrons/Modules/MSource/SeqGamma.hpp @@ -1,3 +1,32 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/Modules/MSource/SeqGamma.hpp + +Copyright (C) 2015 +Copyright (C) 2016 + +Author: Antonin Portelli + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ + #ifndef Hadrons_SeqGamma_hpp_ #define Hadrons_SeqGamma_hpp_ diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/extras/Hadrons/Modules/MSource/Z2.hpp index 1bcd276d..cd5727be 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/extras/Hadrons/Modules/MSource/Z2.hpp @@ -1,8 +1,10 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Z2.hpp +Source file: extras/Hadrons/Modules/MSource/Z2.hpp +Copyright (C) 2015 Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Z2_hpp_ diff --git a/extras/Hadrons/Modules/Quark.hpp b/extras/Hadrons/Modules/Quark.hpp index e2c11aaa..e441a096 100644 --- a/extras/Hadrons/Modules/Quark.hpp +++ b/extras/Hadrons/Modules/Quark.hpp @@ -1,9 +1,11 @@ -/******************************************************************************* +/************************************************************************************* + Grid physics library, www.github.com/paboyle/Grid -Source file: programs/Hadrons/Quark.hpp +Source file: extras/Hadrons/Modules/Quark.hpp Copyright (C) 2015 +Copyright (C) 2016 Author: Antonin Portelli @@ -21,9 +23,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -See the full license in the file "LICENSE" in the top level distribution -directory. -*******************************************************************************/ +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ /* END LEGAL */ #ifndef Hadrons_Quark_hpp_ From 2e3c5890b6035a4c9d661102c2117c53f93f00fd Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 15 Dec 2016 20:06:46 +0000 Subject: [PATCH 171/807] qed-fvol: build fix --- extras/Makefile.am | 2 +- extras/qed-fvol/Makefile.am | 2 +- lib/qcd/action/Actions.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extras/Makefile.am b/extras/Makefile.am index d8c2b675..416a9fc8 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -1 +1 @@ -SUBDIRS = Hadrons \ No newline at end of file +SUBDIRS = Hadrons qed-fvol \ No newline at end of file diff --git a/extras/qed-fvol/Makefile.am b/extras/qed-fvol/Makefile.am index cd762e94..0a9030c7 100644 --- a/extras/qed-fvol/Makefile.am +++ b/extras/qed-fvol/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS += -I$(top_srcdir)/programs -I../$(top_srcdir)/programs +AM_CXXFLAGS += -I$(top_srcdir)/extras bin_PROGRAMS = qed-fvol diff --git a/lib/qcd/action/Actions.h b/lib/qcd/action/Actions.h index 4a30f8c3..fea75f8a 100644 --- a/lib/qcd/action/Actions.h +++ b/lib/qcd/action/Actions.h @@ -57,6 +57,7 @@ Author: paboyle //////////////////////////////////////////// // Gauge Actions //////////////////////////////////////////// +#include #include #include From eabc5779407ea45e7900e94a5725d953a43ba3b6 Mon Sep 17 00:00:00 2001 From: azusayamaguchi Date: Fri, 16 Dec 2016 16:55:36 +0000 Subject: [PATCH 172/807] Assembler possibly working --- lib/Init.cc | 2 +- lib/qcd/action/Actions.h | 8 + lib/qcd/action/fermion/FermionOperatorImpl.h | 191 +++++++++- .../fermion/ImprovedStaggeredFermion5D.cc | 66 ++-- lib/qcd/action/fermion/StaggeredKernels.cc | 26 +- lib/qcd/action/fermion/StaggeredKernels.h | 3 + lib/qcd/action/fermion/StaggeredKernelsAsm.cc | 327 ++++++++++++++++++ .../action/fermion/StaggeredKernelsHand.cc | 1 + lib/qcd/action/fermion/WilsonFermion5D.cc | 76 ++-- tests/core/Test_staggered5D.cc | 21 +- tests/core/Test_staggered5Dvec.cc | 157 +++++++++ 11 files changed, 784 insertions(+), 94 deletions(-) create mode 100644 lib/qcd/action/fermion/StaggeredKernelsAsm.cc create mode 100644 tests/core/Test_staggered5Dvec.cc diff --git a/lib/Init.cc b/lib/Init.cc index c1bc4b4a..fffc6c31 100644 --- a/lib/Init.cc +++ b/lib/Init.cc @@ -416,7 +416,7 @@ void Grid_sa_signal_handler(int sig,siginfo_t *si,void * ptr) #endif #endif BACKTRACE(); - exit(0); + if ( si->si_signo != SIGTRAP ) exit(0); return; }; diff --git a/lib/qcd/action/Actions.h b/lib/qcd/action/Actions.h index f7471cf0..34656602 100644 --- a/lib/qcd/action/Actions.h +++ b/lib/qcd/action/Actions.h @@ -113,6 +113,10 @@ typedef SymanzikGaugeAction ConjugateSymanzikGaugeAction template class A; \ template class A; +#define FermOpStaggeredVec5dTemplateInstantiate(A) \ + template class A; \ + template class A; + #define FermOp4dVecTemplateInstantiate(A) \ template class A; \ template class A; \ @@ -284,6 +288,10 @@ typedef ImprovedStaggeredFermion5D ImprovedStaggeredFermion5DR; typedef ImprovedStaggeredFermion5D ImprovedStaggeredFermion5DF; typedef ImprovedStaggeredFermion5D ImprovedStaggeredFermion5DD; +typedef ImprovedStaggeredFermion5D ImprovedStaggeredFermionVec5dR; +typedef ImprovedStaggeredFermion5D ImprovedStaggeredFermionVec5dF; +typedef ImprovedStaggeredFermion5D ImprovedStaggeredFermionVec5dD; + }} /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/qcd/action/fermion/FermionOperatorImpl.h b/lib/qcd/action/fermion/FermionOperatorImpl.h index 36ab35ca..dc4d0879 100644 --- a/lib/qcd/action/fermion/FermionOperatorImpl.h +++ b/lib/qcd/action/fermion/FermionOperatorImpl.h @@ -224,12 +224,13 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres typedef iImplSpinor SiteSpinor; typedef iImplHalfSpinor SiteHalfSpinor; typedef Lattice FermionField; - + + ///////////////////////////////////////////////// // Make the doubled gauge field a *scalar* + ///////////////////////////////////////////////// typedef iImplDoubledGaugeField SiteDoubledGaugeField; // This is a scalar typedef iImplGaugeField SiteScalarGaugeField; // scalar typedef iImplGaugeLink SiteScalarGaugeLink; // scalar - typedef Lattice DoubledGaugeField; typedef WilsonCompressor Compressor; @@ -261,11 +262,11 @@ class DomainWallVec5dImpl : public PeriodicGaugeImpl< GaugeImplTypes< S,Nrepres inline void DoubleStore(GridBase *GaugeGrid, DoubledGaugeField &Uds,const GaugeField &Umu) { - SiteScalarGaugeField ScalarUmu; + SiteScalarGaugeField ScalarUmu; SiteDoubledGaugeField ScalarUds; GaugeLinkField U(Umu._grid); - GaugeField Uadj(Umu._grid); + GaugeField Uadj(Umu._grid); for (int mu = 0; mu < Nd; mu++) { U = PeekIndex(Umu, mu); U = adj(Cshift(U, mu, -1)); @@ -631,6 +632,184 @@ PARALLEL_FOR_LOOP + ///////////////////////////////////////////////////////////////////////////// + // Single flavour one component spinors with colour index. 5d vec + ///////////////////////////////////////////////////////////////////////////// + template + class StaggeredVec5dImpl : public PeriodicGaugeImpl > { + + public: + + typedef RealD _Coeff_t ; + static const int Dimension = Representation::Dimension; + typedef PeriodicGaugeImpl > Gimpl; + + //Necessary? + constexpr bool is_fundamental() const{return Dimension == Nc ? 1 : 0;} + + const bool LsVectorised=true; + + typedef _Coeff_t Coeff_t; + + INHERIT_GIMPL_TYPES(Gimpl); + + template using iImplScalar = iScalar > >; + template using iImplSpinor = iScalar > >; + template using iImplHalfSpinor = iScalar > >; + template using iImplDoubledGaugeField = iVector >, Nds>; + template using iImplGaugeField = iVector >, Nd>; + template using iImplGaugeLink = iScalar > >; + + // Make the doubled gauge field a *scalar* + typedef iImplDoubledGaugeField SiteDoubledGaugeField; // This is a scalar + typedef iImplGaugeField SiteScalarGaugeField; // scalar + typedef iImplGaugeLink SiteScalarGaugeLink; // scalar + typedef Lattice DoubledGaugeField; + + typedef iImplScalar SiteComplex; + typedef iImplSpinor SiteSpinor; + typedef iImplHalfSpinor SiteHalfSpinor; + + + typedef Lattice ComplexField; + typedef Lattice FermionField; + + typedef SimpleCompressor Compressor; + typedef StaggeredImplParams ImplParams; + typedef CartesianStencil StencilImpl; + + ImplParams Params; + + StaggeredVec5dImpl(const ImplParams &p = ImplParams()) : Params(p){}; + + template + inline void loadLinkElement(Simd ®, ref &memory) { + vsplat(reg, memory); + } + + inline void multLink(SiteHalfSpinor &phi, const SiteDoubledGaugeField &U, + const SiteHalfSpinor &chi, int mu) { + SiteGaugeLink UU; + for (int i = 0; i < Dimension; i++) { + for (int j = 0; j < Dimension; j++) { + vsplat(UU()()(i, j), U(mu)()(i, j)); + } + } + mult(&phi(), &UU(), &chi()); + } + inline void multLinkAdd(SiteHalfSpinor &phi, const SiteDoubledGaugeField &U, + const SiteHalfSpinor &chi, int mu) { + SiteGaugeLink UU; + for (int i = 0; i < Dimension; i++) { + for (int j = 0; j < Dimension; j++) { + vsplat(UU()()(i, j), U(mu)()(i, j)); + } + } + mac(&phi(), &UU(), &chi()); + } + + inline void DoubleStore(GridBase *GaugeGrid, + DoubledGaugeField &UUUds, // for Naik term + DoubledGaugeField &Uds, + const GaugeField &Uthin, + const GaugeField &Ufat) + { + + GridBase * InputGrid = Uthin._grid; + conformable(InputGrid,Ufat._grid); + + GaugeLinkField U(InputGrid); + GaugeLinkField UU(InputGrid); + GaugeLinkField UUU(InputGrid); + GaugeLinkField Udag(InputGrid); + GaugeLinkField UUUdag(InputGrid); + + for (int mu = 0; mu < Nd; mu++) { + + // Staggered Phase. + Lattice > coor(InputGrid); + Lattice > x(InputGrid); LatticeCoordinate(x,0); + Lattice > y(InputGrid); LatticeCoordinate(y,1); + Lattice > z(InputGrid); LatticeCoordinate(z,2); + Lattice > t(InputGrid); LatticeCoordinate(t,3); + + Lattice > lin_z(InputGrid); lin_z=x+y; + Lattice > lin_t(InputGrid); lin_t=x+y+z; + + ComplexField phases(InputGrid); phases=1.0; + + if ( mu == 1 ) phases = where( mod(x ,2)==(Integer)0, phases,-phases); + if ( mu == 2 ) phases = where( mod(lin_z,2)==(Integer)0, phases,-phases); + if ( mu == 3 ) phases = where( mod(lin_t,2)==(Integer)0, phases,-phases); + + // 1 hop based on fat links + U = PeekIndex(Ufat, mu); + Udag = adj( Cshift(U, mu, -1)); + + U = U *phases; + Udag = Udag *phases; + + + for (int lidx = 0; lidx < GaugeGrid->lSites(); lidx++) { + SiteScalarGaugeLink ScalarU; + SiteDoubledGaugeField ScalarUds; + + std::vector lcoor; + GaugeGrid->LocalIndexToLocalCoor(lidx, lcoor); + peekLocalSite(ScalarUds, Uds, lcoor); + + peekLocalSite(ScalarU, U, lcoor); + ScalarUds(mu) = ScalarU(); + + peekLocalSite(ScalarU, Udag, lcoor); + ScalarUds(mu + 4) = ScalarU(); + + pokeLocalSite(ScalarUds, Uds, lcoor); + } + + // 3 hop based on thin links. Crazy huh ? + U = PeekIndex(Uthin, mu); + UU = Gimpl::CovShiftForward(U,mu,U); + UUU= Gimpl::CovShiftForward(U,mu,UU); + + UUUdag = adj( Cshift(UUU, mu, -3)); + + UUU = UUU *phases; + UUUdag = UUUdag *phases; + + for (int lidx = 0; lidx < GaugeGrid->lSites(); lidx++) { + + SiteScalarGaugeLink ScalarU; + SiteDoubledGaugeField ScalarUds; + + std::vector lcoor; + GaugeGrid->LocalIndexToLocalCoor(lidx, lcoor); + + peekLocalSite(ScalarUds, UUUds, lcoor); + + peekLocalSite(ScalarU, UUU, lcoor); + ScalarUds(mu) = ScalarU(); + + peekLocalSite(ScalarU, UUUdag, lcoor); + ScalarUds(mu + 4) = ScalarU(); + + pokeLocalSite(ScalarUds, UUUds, lcoor); + } + + } + } + + inline void InsertForce4D(GaugeField &mat, FermionField &Btilde, FermionField &A,int mu){ + assert(0); + } + + inline void InsertForce5D(GaugeField &mat, FermionField &Btilde, FermionField Ã,int mu){ + assert (0); + } + }; + + + typedef WilsonImpl WilsonImplR; // Real.. whichever prec typedef WilsonImpl WilsonImplF; // Float typedef WilsonImpl WilsonImplD; // Double @@ -663,6 +842,10 @@ PARALLEL_FOR_LOOP typedef StaggeredImpl StaggeredImplF; // Float typedef StaggeredImpl StaggeredImplD; // Double + typedef StaggeredVec5dImpl StaggeredVec5dImplR; // Real.. whichever prec + typedef StaggeredVec5dImpl StaggeredVec5dImplF; // Float + typedef StaggeredVec5dImpl StaggeredVec5dImplD; // Double + }} #endif diff --git a/lib/qcd/action/fermion/ImprovedStaggeredFermion5D.cc b/lib/qcd/action/fermion/ImprovedStaggeredFermion5D.cc index 71a6bf06..0455df0d 100644 --- a/lib/qcd/action/fermion/ImprovedStaggeredFermion5D.cc +++ b/lib/qcd/action/fermion/ImprovedStaggeredFermion5D.cc @@ -69,37 +69,57 @@ ImprovedStaggeredFermion5D::ImprovedStaggeredFermion5D(GaugeField &_Uthin, Lebesgue(_FourDimGrid), LebesgueEvenOdd(_FourDimRedBlackGrid) { + // some assertions assert(FiveDimGrid._ndimension==5); assert(FourDimGrid._ndimension==4); - assert(FiveDimRedBlackGrid._ndimension==5); assert(FourDimRedBlackGrid._ndimension==4); - assert(FiveDimRedBlackGrid._checker_dim==1); - - // Dimension zero of the five-d is the Ls direction + assert(FiveDimRedBlackGrid._ndimension==5); + assert(FiveDimRedBlackGrid._checker_dim==1); // Don't checker the s direction + + // extent of fifth dim and not spread out Ls=FiveDimGrid._fdimensions[0]; assert(FiveDimRedBlackGrid._fdimensions[0]==Ls); - assert(FiveDimRedBlackGrid._processors[0] ==1); - assert(FiveDimRedBlackGrid._simd_layout[0]==1); assert(FiveDimGrid._processors[0] ==1); - assert(FiveDimGrid._simd_layout[0] ==1); - + assert(FiveDimRedBlackGrid._processors[0] ==1); + // Other dimensions must match the decomposition of the four-D fields for(int d=0;d<4;d++){ - assert(FourDimRedBlackGrid._fdimensions[d] ==FourDimGrid._fdimensions[d]); - assert(FiveDimRedBlackGrid._fdimensions[d+1]==FourDimGrid._fdimensions[d]); - - assert(FourDimRedBlackGrid._processors[d] ==FourDimGrid._processors[d]); - assert(FiveDimRedBlackGrid._processors[d+1] ==FourDimGrid._processors[d]); - - assert(FourDimRedBlackGrid._simd_layout[d] ==FourDimGrid._simd_layout[d]); - assert(FiveDimRedBlackGrid._simd_layout[d+1]==FourDimGrid._simd_layout[d]); - - assert(FiveDimGrid._fdimensions[d+1] ==FourDimGrid._fdimensions[d]); assert(FiveDimGrid._processors[d+1] ==FourDimGrid._processors[d]); + assert(FiveDimRedBlackGrid._processors[d+1] ==FourDimGrid._processors[d]); + assert(FourDimRedBlackGrid._processors[d] ==FourDimGrid._processors[d]); + + assert(FiveDimGrid._fdimensions[d+1] ==FourDimGrid._fdimensions[d]); + assert(FiveDimRedBlackGrid._fdimensions[d+1]==FourDimGrid._fdimensions[d]); + assert(FourDimRedBlackGrid._fdimensions[d] ==FourDimGrid._fdimensions[d]); + assert(FiveDimGrid._simd_layout[d+1] ==FourDimGrid._simd_layout[d]); + assert(FiveDimRedBlackGrid._simd_layout[d+1]==FourDimGrid._simd_layout[d]); + assert(FourDimRedBlackGrid._simd_layout[d] ==FourDimGrid._simd_layout[d]); } + + if (Impl::LsVectorised) { + + int nsimd = Simd::Nsimd(); + // Dimension zero of the five-d is the Ls direction + assert(FiveDimGrid._simd_layout[0] ==nsimd); + assert(FiveDimRedBlackGrid._simd_layout[0]==nsimd); + + for(int d=0;d<4;d++){ + assert(FourDimGrid._simd_layout[d]=1); + assert(FourDimRedBlackGrid._simd_layout[d]=1); + assert(FiveDimRedBlackGrid._simd_layout[d+1]==1); + } + + } else { + + // Dimension zero of the five-d is the Ls direction + assert(FiveDimRedBlackGrid._simd_layout[0]==1); + assert(FiveDimGrid._simd_layout[0] ==1); + + } + // Allocate the required comms buffer ImportGauge(_Uthin,_Ufat); } @@ -112,8 +132,6 @@ void ImprovedStaggeredFermion5D::ImportGauge(const GaugeField &_Uthin) template void ImprovedStaggeredFermion5D::ImportGauge(const GaugeField &_Uthin,const GaugeField &_Ufat) { - GaugeLinkField U(GaugeGrid()); - //////////////////////////////////////////////////////// // Double Store should take two fields for Naik and one hop separately. //////////////////////////////////////////////////////// @@ -126,7 +144,7 @@ void ImprovedStaggeredFermion5D::ImportGauge(const GaugeField &_Uthin,cons //////////////////////////////////////////////////////// for (int mu = 0; mu < Nd; mu++) { - U = PeekIndex(Umu, mu); + auto U = PeekIndex(Umu, mu); PokeIndex(Umu, U*( 0.5*c1/u0), mu ); U = PeekIndex(Umu, mu+4); @@ -221,7 +239,7 @@ void ImprovedStaggeredFermion5D::DhopInternal(StencilImpl & st, LebesgueOr for (int ss = 0; ss < U._grid->oSites(); ss++) { for(int s=0;s::DhopInternal(StencilImpl & st, LebesgueOr for (int ss = 0; ss < U._grid->oSites(); ss++) { for(int s=0;s::MooeeInvDag(const FermionField &in, } - FermOpStaggeredTemplateInstantiate(ImprovedStaggeredFermion5D); +FermOpStaggeredVec5dTemplateInstantiate(ImprovedStaggeredFermion5D); }} diff --git a/lib/qcd/action/fermion/StaggeredKernels.cc b/lib/qcd/action/fermion/StaggeredKernels.cc index 6608f8de..bb8dee8c 100644 --- a/lib/qcd/action/fermion/StaggeredKernels.cc +++ b/lib/qcd/action/fermion/StaggeredKernels.cc @@ -192,38 +192,51 @@ void StaggeredKernels::DhopSiteDag(StencilImpl &st, LebesgueOrder &lo, Dou int oneLink =0; int threeLink=1; switch(Opt) { + case OptInlineAsm: + DhopSiteAsm(st,lo,U,UUU,buf,sF,sU,in,out._odata[sF]); + break; case OptHandUnroll: DhopSiteDepthHand(st,lo,U,buf,sF,sU,in,naive,oneLink); DhopSiteDepthHand(st,lo,UUU,buf,sF,sU,in,naik,threeLink); + out._odata[sF] =-naive-naik; break; case OptGeneric: - default: DhopSiteDepth(st,lo,U,buf,sF,sU,in,naive,oneLink); DhopSiteDepth(st,lo,UUU,buf,sF,sU,in,naik,threeLink); + out._odata[sF] =-naive-naik; + break; + default: + assert(0); break; } - out._odata[sF] =-naive-naik; }; template void StaggeredKernels::DhopSite(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U, DoubledGaugeField &UUU, SiteSpinor *buf, int sF, int sU, const FermionField &in, FermionField &out) { - SiteSpinor naik; - SiteSpinor naive; int oneLink =0; int threeLink=1; + SiteSpinor naik; + SiteSpinor naive; + static int once; switch(Opt) { + case OptInlineAsm: + DhopSiteAsm(st,lo,U,UUU,buf,sF,sU,in,out._odata[sF]); + break; case OptHandUnroll: DhopSiteDepthHand(st,lo,U,buf,sF,sU,in,naive,oneLink); DhopSiteDepthHand(st,lo,UUU,buf,sF,sU,in,naik,threeLink); + out._odata[sF] =naive+naik; break; case OptGeneric: - default: DhopSiteDepth(st,lo,U,buf,sF,sU,in,naive,oneLink); DhopSiteDepth(st,lo,UUU,buf,sF,sU,in,naik,threeLink); + out._odata[sF] =naive+naik; + break; + default: + assert(0); break; } - out._odata[sF] =naive+naik; }; template @@ -238,6 +251,7 @@ void StaggeredKernels::DhopDir( StencilImpl &st, DoubledGaugeField &U, Do } FermOpStaggeredTemplateInstantiate(StaggeredKernels); +FermOpStaggeredVec5dTemplateInstantiate(StaggeredKernels); }} diff --git a/lib/qcd/action/fermion/StaggeredKernels.h b/lib/qcd/action/fermion/StaggeredKernels.h index 5a6cb45c..e4cc8cdd 100644 --- a/lib/qcd/action/fermion/StaggeredKernels.h +++ b/lib/qcd/action/fermion/StaggeredKernels.h @@ -58,6 +58,9 @@ public: void DhopSiteDepthHand(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U, SiteSpinor * buf, int sF, int sU, const FermionField &in, SiteSpinor &out,int threeLink); + + void DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U,DoubledGaugeField &UUU, SiteSpinor * buf, + int sF, int sU, const FermionField &in, SiteSpinor &out); void DhopSite(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U, DoubledGaugeField &UUU, SiteSpinor * buf, int sF, int sU, const FermionField &in, FermionField &out); diff --git a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc new file mode 100644 index 00000000..bb38a6c9 --- /dev/null +++ b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc @@ -0,0 +1,327 @@ + /************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/qcd/action/fermion/StaggerdKernelsHand.cc + + Copyright (C) 2015 + +Author: Peter Boyle +Author: paboyle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution directory + *************************************************************************************/ + /* END LEGAL */ +#include +#include +#include +#include + +// Interleave operations from two directions +// This looks just like a 2 spin multiply and reuse same sequence from the Wilson +// Kernel. But the spin index becomes a mu index instead. +#define Chi_00 %zmm0 +#define Chi_01 %zmm1 +#define Chi_02 %zmm2 +#define Chi_10 %zmm3 +#define Chi_11 %zmm4 +#define Chi_12 %zmm5 +#define Chi_20 %zmm6 +#define Chi_21 %zmm7 +#define Chi_22 %zmm8 +#define Chi_30 %zmm9 +#define Chi_31 %zmm10 +#define Chi_32 %zmm11 + +#define UChi_00 %zmm12 +#define UChi_01 %zmm13 +#define UChi_02 %zmm14 +#define UChi_10 %zmm15 +#define UChi_11 %zmm16 +#define UChi_12 %zmm17 +#define UChi_20 %zmm18 +#define UChi_21 %zmm19 +#define UChi_22 %zmm20 +#define UChi_30 %zmm21 +#define UChi_31 %zmm22 +#define UChi_32 %zmm23 + +#define pChi_00 %%zmm0 +#define pChi_01 %%zmm1 +#define pChi_02 %%zmm2 +#define pChi_10 %%zmm3 +#define pChi_11 %%zmm4 +#define pChi_12 %%zmm5 +#define pChi_20 %%zmm6 +#define pChi_21 %%zmm7 +#define pChi_22 %%zmm8 +#define pChi_30 %%zmm9 +#define pChi_31 %%zmm10 +#define pChi_32 %%zmm11 + +#define pUChi_00 %%zmm12 +#define pUChi_01 %%zmm13 +#define pUChi_02 %%zmm14 +#define pUChi_10 %%zmm15 +#define pUChi_11 %%zmm16 +#define pUChi_12 %%zmm17 +#define pUChi_20 %%zmm18 +#define pUChi_21 %%zmm19 +#define pUChi_22 %%zmm20 +#define pUChi_30 %%zmm21 +#define pUChi_31 %%zmm22 +#define pUChi_32 %%zmm23 + +#define T0 %zmm24 +#define T1 %zmm25 +#define T2 %zmm26 +#define T3 %zmm27 + +#define MULT_ADD_LS(g0,g1,g2,g3) \ + asm ( "movq %0, %%r8 \n\t" \ + "movq %1, %%r9 \n\t" \ + "movq %2, %%r10 \n\t" \ + "movq %3, %%r11 \n\t" : : "r"(g0), "r"(g1), "r"(g2), "r"(g3) : "%r8","%r9","%r10","%r11" );\ + asm ( \ + VSHUF(Chi_00,T0) VSHUF(Chi_10,T1) \ + VSHUF(Chi_20,T2) VSHUF(Chi_30,T3) \ + VMADDSUBIDUP(0,%r8,T0,UChi_00) VMADDSUBIDUP(0,%r9,T1,UChi_10) \ + VMADDSUBIDUP(3,%r8,T0,UChi_01) VMADDSUBIDUP(3,%r9,T1,UChi_11) \ + VMADDSUBIDUP(6,%r8,T0,UChi_02) VMADDSUBIDUP(6,%r9,T1,UChi_12) \ + VMADDSUBIDUP(0,%r10,T2,UChi_20) VMADDSUBIDUP(0,%r11,T3,UChi_30) \ + VMADDSUBIDUP(3,%r10,T2,UChi_21) VMADDSUBIDUP(3,%r11,T3,UChi_31) \ + VMADDSUBIDUP(6,%r10,T2,UChi_22) VMADDSUBIDUP(6,%r11,T3,UChi_32) \ + VMADDSUBRDUP(0,%r8,Chi_00,UChi_00) VMADDSUBRDUP(0,%r9,Chi_10,UChi_10) \ + VMADDSUBRDUP(3,%r8,Chi_00,UChi_01) VMADDSUBRDUP(3,%r9,Chi_10,UChi_11) \ + VMADDSUBRDUP(6,%r8,Chi_00,UChi_02) VMADDSUBRDUP(6,%r9,Chi_10,UChi_12) \ + VMADDSUBRDUP(0,%r10,Chi_20,UChi_20) VMADDSUBRDUP(0,%r11,Chi_30,UChi_30) \ + VMADDSUBRDUP(3,%r10,Chi_20,UChi_21) VMADDSUBRDUP(3,%r11,Chi_30,UChi_31) \ + VMADDSUBRDUP(6,%r10,Chi_20,UChi_22) VMADDSUBRDUP(6,%r11,Chi_30,UChi_32) \ + VSHUF(Chi_01,T0) VSHUF(Chi_11,T1) \ + VSHUF(Chi_21,T2) VSHUF(Chi_31,T3) \ + VMADDSUBIDUP(1,%r8,T0,UChi_00) VMADDSUBIDUP(1,%r9,T1,UChi_10) \ + VMADDSUBIDUP(4,%r8,T0,UChi_01) VMADDSUBIDUP(4,%r9,T1,UChi_11) \ + VMADDSUBIDUP(7,%r8,T0,UChi_02) VMADDSUBIDUP(7,%r9,T1,UChi_12) \ + VMADDSUBIDUP(1,%r10,T2,UChi_20) VMADDSUBIDUP(1,%r11,T3,UChi_30) \ + VMADDSUBIDUP(4,%r10,T2,UChi_21) VMADDSUBIDUP(4,%r11,T3,UChi_31) \ + VMADDSUBIDUP(7,%r10,T2,UChi_22) VMADDSUBIDUP(7,%r11,T3,UChi_32) \ + VMADDSUBRDUP(1,%r8,Chi_01,UChi_00) VMADDSUBRDUP(1,%r9,Chi_11,UChi_10) \ + VMADDSUBRDUP(4,%r8,Chi_01,UChi_01) VMADDSUBRDUP(4,%r9,Chi_11,UChi_11) \ + VMADDSUBRDUP(7,%r8,Chi_01,UChi_02) VMADDSUBRDUP(7,%r9,Chi_11,UChi_12) \ + VMADDSUBRDUP(1,%r10,Chi_21,UChi_20) VMADDSUBRDUP(1,%r11,Chi_31,UChi_30) \ + VMADDSUBRDUP(4,%r10,Chi_21,UChi_21) VMADDSUBRDUP(4,%r11,Chi_31,UChi_31) \ + VMADDSUBRDUP(7,%r10,Chi_21,UChi_22) VMADDSUBRDUP(7,%r11,Chi_31,UChi_32) \ + VSHUF(Chi_02,T0) VSHUF(Chi_12,T1) \ + VSHUF(Chi_22,T2) VSHUF(Chi_32,T3) \ + VMADDSUBIDUP(2,%r8,T0,UChi_00) VMADDSUBIDUP(2,%r9,T1,UChi_10) \ + VMADDSUBIDUP(5,%r8,T0,UChi_01) VMADDSUBIDUP(5,%r9,T1,UChi_11) \ + VMADDSUBIDUP(8,%r8,T0,UChi_02) VMADDSUBIDUP(8,%r9,T1,UChi_12) \ + VMADDSUBIDUP(2,%r10,T2,UChi_20) VMADDSUBIDUP(2,%r11,T3,UChi_30) \ + VMADDSUBIDUP(5,%r10,T2,UChi_21) VMADDSUBIDUP(5,%r11,T3,UChi_31) \ + VMADDSUBIDUP(8,%r10,T2,UChi_22) VMADDSUBIDUP(8,%r11,T3,UChi_32) \ + VMADDSUBRDUP(2,%r8,Chi_02,UChi_00) VMADDSUBRDUP(2,%r9,Chi_12,UChi_10) \ + VMADDSUBRDUP(5,%r8,Chi_02,UChi_01) VMADDSUBRDUP(5,%r9,Chi_12,UChi_11) \ + VMADDSUBRDUP(8,%r8,Chi_02,UChi_02) VMADDSUBRDUP(8,%r9,Chi_12,UChi_12) \ + VMADDSUBRDUP(2,%r10,Chi_22,UChi_20) VMADDSUBRDUP(2,%r11,Chi_32,UChi_30) \ + VMADDSUBRDUP(5,%r10,Chi_22,UChi_21) VMADDSUBRDUP(5,%r11,Chi_32,UChi_31) \ + VMADDSUBRDUP(8,%r10,Chi_22,UChi_22) VMADDSUBRDUP(8,%r11,Chi_32,UChi_32) ); + +#define MULT_LS(g0,g1,g2,g3) \ + asm ( "movq %0, %%r8 \n\t" \ + "movq %1, %%r9 \n\t" \ + "movq %2, %%r10 \n\t" \ + "movq %3, %%r11 \n\t" : : "r"(g0), "r"(g1), "r"(g2), "r"(g3) : "%r8","%r9","%r10","%r11" );\ + asm ( \ + VSHUF(Chi_00,T0) VSHUF(Chi_10,T1) \ + VSHUF(Chi_20,T2) VSHUF(Chi_30,T3) \ + VMULIDUP(0,%r8,T0,UChi_00) VMULIDUP(0,%r9,T1,UChi_10) \ + VMULIDUP(3,%r8,T0,UChi_01) VMULIDUP(3,%r9,T1,UChi_11) \ + VMULIDUP(6,%r8,T0,UChi_02) VMULIDUP(6,%r9,T1,UChi_12) \ + VMULIDUP(0,%r10,T2,UChi_20) VMULIDUP(0,%r11,T3,UChi_30) \ + VMULIDUP(3,%r10,T2,UChi_21) VMULIDUP(3,%r11,T3,UChi_31) \ + VMULIDUP(6,%r10,T2,UChi_22) VMULIDUP(6,%r11,T3,UChi_32) \ + VMADDSUBRDUP(0,%r8,Chi_00,UChi_00) VMADDSUBRDUP(0,%r9,Chi_10,UChi_10) \ + VMADDSUBRDUP(3,%r8,Chi_00,UChi_01) VMADDSUBRDUP(3,%r9,Chi_10,UChi_11) \ + VMADDSUBRDUP(6,%r8,Chi_00,UChi_02) VMADDSUBRDUP(6,%r9,Chi_10,UChi_12) \ + VMADDSUBRDUP(0,%r10,Chi_20,UChi_20) VMADDSUBRDUP(0,%r11,Chi_30,UChi_30) \ + VMADDSUBRDUP(3,%r10,Chi_20,UChi_21) VMADDSUBRDUP(3,%r11,Chi_30,UChi_31) \ + VMADDSUBRDUP(6,%r10,Chi_20,UChi_22) VMADDSUBRDUP(6,%r11,Chi_30,UChi_32) \ + VSHUF(Chi_01,T0) VSHUF(Chi_11,T1) \ + VSHUF(Chi_21,T2) VSHUF(Chi_31,T3) \ + VMADDSUBIDUP(1,%r8,T0,UChi_00) VMADDSUBIDUP(1,%r9,T1,UChi_10) \ + VMADDSUBIDUP(4,%r8,T0,UChi_01) VMADDSUBIDUP(4,%r9,T1,UChi_11) \ + VMADDSUBIDUP(7,%r8,T0,UChi_02) VMADDSUBIDUP(7,%r9,T1,UChi_12) \ + VMADDSUBIDUP(1,%r10,T2,UChi_20) VMADDSUBIDUP(1,%r11,T3,UChi_30) \ + VMADDSUBIDUP(4,%r10,T2,UChi_21) VMADDSUBIDUP(4,%r11,T3,UChi_31) \ + VMADDSUBIDUP(7,%r10,T2,UChi_22) VMADDSUBIDUP(7,%r11,T3,UChi_32) \ + VMADDSUBRDUP(1,%r8,Chi_01,UChi_00) VMADDSUBRDUP(1,%r9,Chi_11,UChi_10) \ + VMADDSUBRDUP(4,%r8,Chi_01,UChi_01) VMADDSUBRDUP(4,%r9,Chi_11,UChi_11) \ + VMADDSUBRDUP(7,%r8,Chi_01,UChi_02) VMADDSUBRDUP(7,%r9,Chi_11,UChi_12) \ + VMADDSUBRDUP(1,%r10,Chi_21,UChi_20) VMADDSUBRDUP(1,%r11,Chi_31,UChi_30) \ + VMADDSUBRDUP(4,%r10,Chi_21,UChi_21) VMADDSUBRDUP(4,%r11,Chi_31,UChi_31) \ + VMADDSUBRDUP(7,%r10,Chi_21,UChi_22) VMADDSUBRDUP(7,%r11,Chi_31,UChi_32) \ + VSHUF(Chi_02,T0) VSHUF(Chi_12,T1) \ + VSHUF(Chi_22,T2) VSHUF(Chi_32,T3) \ + VMADDSUBIDUP(2,%r8,T0,UChi_00) VMADDSUBIDUP(2,%r9,T1,UChi_10) \ + VMADDSUBIDUP(5,%r8,T0,UChi_01) VMADDSUBIDUP(5,%r9,T1,UChi_11) \ + VMADDSUBIDUP(8,%r8,T0,UChi_02) VMADDSUBIDUP(8,%r9,T1,UChi_12) \ + VMADDSUBIDUP(2,%r10,T2,UChi_20) VMADDSUBIDUP(2,%r11,T3,UChi_30) \ + VMADDSUBIDUP(5,%r10,T2,UChi_21) VMADDSUBIDUP(5,%r11,T3,UChi_31) \ + VMADDSUBIDUP(8,%r10,T2,UChi_22) VMADDSUBIDUP(8,%r11,T3,UChi_32) \ + VMADDSUBRDUP(2,%r8,Chi_02,UChi_00) VMADDSUBRDUP(2,%r9,Chi_12,UChi_10) \ + VMADDSUBRDUP(5,%r8,Chi_02,UChi_01) VMADDSUBRDUP(5,%r9,Chi_12,UChi_11) \ + VMADDSUBRDUP(8,%r8,Chi_02,UChi_02) VMADDSUBRDUP(8,%r9,Chi_12,UChi_12) \ + VMADDSUBRDUP(2,%r10,Chi_22,UChi_20) VMADDSUBRDUP(2,%r11,Chi_32,UChi_30) \ + VMADDSUBRDUP(5,%r10,Chi_22,UChi_21) VMADDSUBRDUP(5,%r11,Chi_32,UChi_31) \ + VMADDSUBRDUP(8,%r10,Chi_22,UChi_22) VMADDSUBRDUP(8,%r11,Chi_32,UChi_32) ); + +#define LOAD_CHI(a0,a1,a2,a3) \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VLOAD(0,%%r8,pChi_00) \ + VLOAD(1,%%r8,pChi_01) \ + VLOAD(2,%%r8,pChi_02) \ + : : "r" (a0) : "%r8" ); \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VLOAD(0,%%r8,pChi_10) \ + VLOAD(1,%%r8,pChi_11) \ + VLOAD(2,%%r8,pChi_12) \ + : : "r" (a1) : "%r8" ); \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VLOAD(0,%%r8,pChi_20) \ + VLOAD(1,%%r8,pChi_21) \ + VLOAD(2,%%r8,pChi_22) \ + : : "r" (a2) : "%r8" ); \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VLOAD(0,%%r8,pChi_30) \ + VLOAD(1,%%r8,pChi_31) \ + VLOAD(2,%%r8,pChi_32) \ + : : "r" (a3) : "%r8" ); + +#define PF_CHI(a0) \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VPREFETCH1(0,%%r8) \ + VPREFETCH1(1,%%r8) \ + VPREFETCH1(2,%%r8) \ + : : "r" (a0) : "%r8" ); \ + + +#define REDUCE(out) \ + asm ( \ + VADD(UChi_00,UChi_10,UChi_00) \ + VADD(UChi_01,UChi_11,UChi_01) \ + VADD(UChi_02,UChi_12,UChi_02) \ + VADD(UChi_30,UChi_20,UChi_30) \ + VADD(UChi_31,UChi_21,UChi_31) \ + VADD(UChi_32,UChi_22,UChi_32) \ + VADD(UChi_00,UChi_30,UChi_00) \ + VADD(UChi_01,UChi_31,UChi_01) \ + VADD(UChi_02,UChi_32,UChi_02) ); \ + asm ( \ + VSTORE(0,%0,pUChi_00) \ + VSTORE(1,%0,pUChi_01) \ + VSTORE(2,%0,pUChi_02) \ + : : "r" (out) : "memory" ); + +#define PERMUTE_DIR(dir) \ + permute##dir(Chi_0,Chi_0);\ + permute##dir(Chi_1,Chi_1);\ + permute##dir(Chi_2,Chi_2); + +namespace Grid { +namespace QCD { + + // This is the single precision 5th direction vectorised kernel +template +void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, + DoubledGaugeField &U, + DoubledGaugeField &UUU, + SiteSpinor *buf, int sF, + int sU, const FermionField &in, SiteSpinor &out) +{ + uint64_t gauge0,gauge1,gauge2,gauge3; + uint64_t addr0,addr1,addr2,addr3; + + int o0,o1,o2,o3; // offsets + int l0,l1,l2,l3; // local + int p0,p1,p2,p3; // perm + int ptype; + StencilEntry *SE0; + StencilEntry *SE1; + StencilEntry *SE2; + StencilEntry *SE3; + + // Xp, Yp, Zp, Tp +#define PREPARE(X,Y,Z,T,skew,UU) \ + SE0=st.GetEntry(ptype,X+skew,sF); \ + o0 = SE0->_offset; \ + l0 = SE0->_is_local; \ + addr0 = l0 ? (uint64_t) &in._odata[o0] : (uint64_t) &buf[o0]; \ + PF_CHI(addr0); \ + \ + SE1=st.GetEntry(ptype,Y+skew,sF); \ + o1 = SE1->_offset; \ + l1 = SE1->_is_local; \ + addr1 = l1 ? (uint64_t) &in._odata[o1] : (uint64_t) &buf[o1]; \ + PF_CHI(addr1); \ + \ + SE2=st.GetEntry(ptype,Z+skew,sF); \ + o2 = SE2->_offset; \ + l2 = SE2->_is_local; \ + addr2 = l2 ? (uint64_t) &in._odata[o2] : (uint64_t) &buf[o2]; \ + PF_CHI(addr2); \ + \ + SE3=st.GetEntry(ptype,T+skew,sF); \ + o3 = SE3->_offset; \ + l3 = SE3->_is_local; \ + addr3 = l3 ? (uint64_t) &in._odata[o3] : (uint64_t) &buf[o3]; \ + PF_CHI(addr3); \ + \ + gauge0 =(uint64_t)&UU._odata[sU]( X ); \ + gauge1 =(uint64_t)&UU._odata[sU]( Y ); \ + gauge2 =(uint64_t)&UU._odata[sU]( Z ); \ + gauge3 =(uint64_t)&UU._odata[sU]( T ); + + PREPARE(Xp,Yp,Zp,Tp,0,U); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_LS(gauge0,gauge1,gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,0,U); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_ADD_LS(gauge0,gauge1,gauge2,gauge3); + + PREPARE(Xp,Yp,Zp,Tp,8,UUU); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_ADD_LS(gauge0,gauge1,gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,8,UUU); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_ADD_LS(gauge0,gauge1,gauge2,gauge3); + + addr0 = (uint64_t) &out; + REDUCE(addr0); +} + +FermOpStaggeredTemplateInstantiate(StaggeredKernels); +FermOpStaggeredVec5dTemplateInstantiate(StaggeredKernels); + +}} + diff --git a/lib/qcd/action/fermion/StaggeredKernelsHand.cc b/lib/qcd/action/fermion/StaggeredKernelsHand.cc index 5f9e11e5..06e9d219 100644 --- a/lib/qcd/action/fermion/StaggeredKernelsHand.cc +++ b/lib/qcd/action/fermion/StaggeredKernelsHand.cc @@ -279,5 +279,6 @@ void StaggeredKernels::DhopSiteDepthHand(StencilImpl &st, LebesgueOrder &l } FermOpStaggeredTemplateInstantiate(StaggeredKernels); +FermOpStaggeredVec5dTemplateInstantiate(StaggeredKernels); }} diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/lib/qcd/action/fermion/WilsonFermion5D.cc index d2ac96e3..d3a7f941 100644 --- a/lib/qcd/action/fermion/WilsonFermion5D.cc +++ b/lib/qcd/action/fermion/WilsonFermion5D.cc @@ -62,71 +62,55 @@ WilsonFermion5D::WilsonFermion5D(GaugeField &_Umu, Lebesgue(_FourDimGrid), LebesgueEvenOdd(_FourDimRedBlackGrid) { + // some assertions + assert(FiveDimGrid._ndimension==5); + assert(FourDimGrid._ndimension==4); + assert(FourDimRedBlackGrid._ndimension==4); + assert(FiveDimRedBlackGrid._ndimension==5); + assert(FiveDimRedBlackGrid._checker_dim==1); // Don't checker the s direction + + // extent of fifth dim and not spread out + Ls=FiveDimGrid._fdimensions[0]; + assert(FiveDimRedBlackGrid._fdimensions[0]==Ls); + assert(FiveDimGrid._processors[0] ==1); + assert(FiveDimRedBlackGrid._processors[0] ==1); + + // Other dimensions must match the decomposition of the four-D fields + for(int d=0;d<4;d++){ + + assert(FiveDimGrid._processors[d+1] ==FourDimGrid._processors[d]); + assert(FiveDimRedBlackGrid._processors[d+1] ==FourDimGrid._processors[d]); + assert(FourDimRedBlackGrid._processors[d] ==FourDimGrid._processors[d]); + + assert(FiveDimGrid._fdimensions[d+1] ==FourDimGrid._fdimensions[d]); + assert(FiveDimRedBlackGrid._fdimensions[d+1]==FourDimGrid._fdimensions[d]); + assert(FourDimRedBlackGrid._fdimensions[d] ==FourDimGrid._fdimensions[d]); + + assert(FiveDimGrid._simd_layout[d+1] ==FourDimGrid._simd_layout[d]); + assert(FiveDimRedBlackGrid._simd_layout[d+1]==FourDimGrid._simd_layout[d]); + assert(FourDimRedBlackGrid._simd_layout[d] ==FourDimGrid._simd_layout[d]); + } + if (Impl::LsVectorised) { int nsimd = Simd::Nsimd(); - // some assertions - assert(FiveDimGrid._ndimension==5); - assert(FiveDimRedBlackGrid._ndimension==5); - assert(FiveDimRedBlackGrid._checker_dim==1); // Don't checker the s direction - assert(FourDimGrid._ndimension==4); - // Dimension zero of the five-d is the Ls direction - Ls=FiveDimGrid._fdimensions[0]; - assert(FiveDimGrid._processors[0] ==1); assert(FiveDimGrid._simd_layout[0] ==nsimd); - - assert(FiveDimRedBlackGrid._fdimensions[0]==Ls); - assert(FiveDimRedBlackGrid._processors[0] ==1); assert(FiveDimRedBlackGrid._simd_layout[0]==nsimd); - // Other dimensions must match the decomposition of the four-D fields for(int d=0;d<4;d++){ - assert(FiveDimRedBlackGrid._fdimensions[d+1]==FourDimGrid._fdimensions[d]); - assert(FiveDimRedBlackGrid._processors[d+1] ==FourDimGrid._processors[d]); - assert(FourDimGrid._simd_layout[d]=1); assert(FourDimRedBlackGrid._simd_layout[d]=1); assert(FiveDimRedBlackGrid._simd_layout[d+1]==1); - - assert(FiveDimGrid._fdimensions[d+1] ==FourDimGrid._fdimensions[d]); - assert(FiveDimGrid._processors[d+1] ==FourDimGrid._processors[d]); - assert(FiveDimGrid._simd_layout[d+1] ==FourDimGrid._simd_layout[d]); } } else { - - // some assertions - assert(FiveDimGrid._ndimension==5); - assert(FourDimGrid._ndimension==4); - assert(FiveDimRedBlackGrid._ndimension==5); - assert(FourDimRedBlackGrid._ndimension==4); - assert(FiveDimRedBlackGrid._checker_dim==1); // Dimension zero of the five-d is the Ls direction - Ls=FiveDimGrid._fdimensions[0]; - assert(FiveDimRedBlackGrid._fdimensions[0]==Ls); - assert(FiveDimRedBlackGrid._processors[0] ==1); assert(FiveDimRedBlackGrid._simd_layout[0]==1); - assert(FiveDimGrid._processors[0] ==1); assert(FiveDimGrid._simd_layout[0] ==1); - - // Other dimensions must match the decomposition of the four-D fields - for(int d=0;d<4;d++){ - assert(FourDimRedBlackGrid._fdimensions[d] ==FourDimGrid._fdimensions[d]); - assert(FiveDimRedBlackGrid._fdimensions[d+1]==FourDimGrid._fdimensions[d]); - - assert(FourDimRedBlackGrid._processors[d] ==FourDimGrid._processors[d]); - assert(FiveDimRedBlackGrid._processors[d+1] ==FourDimGrid._processors[d]); - - assert(FourDimRedBlackGrid._simd_layout[d] ==FourDimGrid._simd_layout[d]); - assert(FiveDimRedBlackGrid._simd_layout[d+1]==FourDimGrid._simd_layout[d]); - - assert(FiveDimGrid._fdimensions[d+1] ==FourDimGrid._fdimensions[d]); - assert(FiveDimGrid._processors[d+1] ==FourDimGrid._processors[d]); - assert(FiveDimGrid._simd_layout[d+1] ==FourDimGrid._simd_layout[d]); - } + } // Allocate the required comms buffer diff --git a/tests/core/Test_staggered5D.cc b/tests/core/Test_staggered5D.cc index b467e9b0..be31c438 100644 --- a/tests/core/Test_staggered5D.cc +++ b/tests/core/Test_staggered5D.cc @@ -51,7 +51,6 @@ int main (int argc, char ** argv) int threads = GridThread::GetThreads(); std::cout< U(4,FGrid); + for(int mu=0;mu(Umu5d,mu); - if ( mu!=0 ) U[mu]=zero; - PokeIndex(Umu5d,U[mu],mu); - } - - std::vector Ua(4,UGrid); - for(int mu=0;mu(Umu,mu); - if ( mu!=0 ) { - Ua[mu]=zero; - } - PokeIndex(Umu,Ua[mu],mu); } RealD mass=0.1; @@ -171,6 +164,8 @@ int main (int argc, char ** argv) double flops=(16*(3*(6+8+8)) + 15*3*2)*volume*ncall; // == 66*16 + == 1146 std::cout< + +using namespace std; +using namespace Grid; +using namespace Grid::QCD; + +int main (int argc, char ** argv) +{ + Grid_init(&argc,&argv); + + std::vector latt_size = GridDefaultLatt(); + std::vector simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd()); + std::vector mpi_layout = GridDefaultMpi(); + + const int Ls=16; + GridCartesian * UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi()); + GridRedBlackCartesian * UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid); + GridCartesian * FGrid = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid); + GridRedBlackCartesian * FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid); + + std::cout << GridLogMessage << "Making s innermost grids"< seeds({1,2,3,4}); + GridParallelRNG pRNG4(UGrid); + GridParallelRNG pRNG5(FGrid); + pRNG4.SeedFixedIntegers(seeds); + pRNG5.SeedFixedIntegers(seeds); + + typedef typename ImprovedStaggeredFermion5DR::FermionField FermionField; + typedef typename ImprovedStaggeredFermion5DR::ComplexField ComplexField; + typename ImprovedStaggeredFermion5DR::ImplParams params; + + FermionField src (FGrid); + + //random(pRNG5,src); + std::vector site({0,0,0,0,0}); + ColourVector cv = zero; + cv()()(0)=1.0; + src = zero; + pokeSite(cv,src,site); + + FermionField result(FGrid); result=zero; + FermionField tmp(FGrid); tmp=zero; + FermionField err(FGrid); tmp=zero; + FermionField phi (FGrid); random(pRNG5,phi); + FermionField chi (FGrid); random(pRNG5,chi); + + LatticeGaugeField Umu(UGrid); SU3::ColdConfiguration(pRNG4,Umu); + + double volume=Ls; + for(int mu=0;mu Date: Fri, 16 Dec 2016 22:03:29 +0000 Subject: [PATCH 173/807] AVX512 only for ASM compilation --- lib/qcd/action/fermion/StaggeredKernels.cc | 4 ++++ lib/qcd/action/fermion/StaggeredKernelsAsm.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/qcd/action/fermion/StaggeredKernels.cc b/lib/qcd/action/fermion/StaggeredKernels.cc index bb8dee8c..06720c64 100644 --- a/lib/qcd/action/fermion/StaggeredKernels.cc +++ b/lib/qcd/action/fermion/StaggeredKernels.cc @@ -192,9 +192,11 @@ void StaggeredKernels::DhopSiteDag(StencilImpl &st, LebesgueOrder &lo, Dou int oneLink =0; int threeLink=1; switch(Opt) { +#ifdef AVX512 case OptInlineAsm: DhopSiteAsm(st,lo,U,UUU,buf,sF,sU,in,out._odata[sF]); break; +#endif case OptHandUnroll: DhopSiteDepthHand(st,lo,U,buf,sF,sU,in,naive,oneLink); DhopSiteDepthHand(st,lo,UUU,buf,sF,sU,in,naik,threeLink); @@ -220,9 +222,11 @@ void StaggeredKernels::DhopSite(StencilImpl &st, LebesgueOrder &lo, Double SiteSpinor naive; static int once; switch(Opt) { +#ifdef AVX512 case OptInlineAsm: DhopSiteAsm(st,lo,U,UUU,buf,sF,sU,in,out._odata[sF]); break; +#endif case OptHandUnroll: DhopSiteDepthHand(st,lo,U,buf,sF,sU,in,naive,oneLink); DhopSiteDepthHand(st,lo,UUU,buf,sF,sU,in,naik,threeLink); diff --git a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc index bb38a6c9..ad4bd17d 100644 --- a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc +++ b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc @@ -257,6 +257,7 @@ void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, SiteSpinor *buf, int sF, int sU, const FermionField &in, SiteSpinor &out) { +#ifdef AVX512 uint64_t gauge0,gauge1,gauge2,gauge3; uint64_t addr0,addr1,addr2,addr3; @@ -318,6 +319,9 @@ void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, addr0 = (uint64_t) &out; REDUCE(addr0); +#else + assert(0); +#endif } FermOpStaggeredTemplateInstantiate(StaggeredKernels); From d4071daf2ac4427d839da67f4a5877ea8a11216a Mon Sep 17 00:00:00 2001 From: azusayamaguchi Date: Fri, 16 Dec 2016 22:28:29 +0000 Subject: [PATCH 174/807] Template specialise --- lib/qcd/action/fermion/StaggeredKernelsAsm.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc index ad4bd17d..25bde931 100644 --- a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc +++ b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc @@ -249,13 +249,22 @@ Author: paboyle namespace Grid { namespace QCD { - // This is the single precision 5th direction vectorised kernel template void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, DoubledGaugeField &U, DoubledGaugeField &UUU, SiteSpinor *buf, int sF, int sU, const FermionField &in, SiteSpinor &out) +{ + assert(0); + +} + // This is the single precision 5th direction vectorised kernel +template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, + DoubledGaugeField &U, + DoubledGaugeField &UUU, + SiteSpinor *buf, int sF, + int sU, const FermionField &in, SiteSpinor &out) { #ifdef AVX512 uint64_t gauge0,gauge1,gauge2,gauge3; From b3e7f600da93e55dd01797583ae1becb788a967c Mon Sep 17 00:00:00 2001 From: azusayamaguchi Date: Fri, 16 Dec 2016 23:50:30 +0000 Subject: [PATCH 175/807] Partial implementation of 4d vectorisation assembler --- lib/qcd/action/fermion/StaggeredKernelsAsm.cc | 298 +++++++++++++++--- 1 file changed, 261 insertions(+), 37 deletions(-) diff --git a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc index 25bde931..6c213b51 100644 --- a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc +++ b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc @@ -29,7 +29,6 @@ Author: paboyle #include #include #include -#include // Interleave operations from two directions // This looks just like a 2 spin multiply and reuse same sequence from the Wilson @@ -91,6 +90,16 @@ Author: paboyle #define T2 %zmm26 #define T3 %zmm27 +#define Z00 %zmm28 +#define Z10 %zmm29 +#define Z1 %zmm30 +#define Z2 %zmm31 + +#define Z3 Chi_22 +#define Z4 Chi_30 +#define Z5 Chi_31 +#define Z6 Chi_32 + #define MULT_ADD_LS(g0,g1,g2,g3) \ asm ( "movq %0, %%r8 \n\t" \ "movq %1, %%r9 \n\t" \ @@ -189,37 +198,136 @@ Author: paboyle VMADDSUBRDUP(5,%r10,Chi_22,UChi_21) VMADDSUBRDUP(5,%r11,Chi_32,UChi_31) \ VMADDSUBRDUP(8,%r10,Chi_22,UChi_22) VMADDSUBRDUP(8,%r11,Chi_32,UChi_32) ); -#define LOAD_CHI(a0,a1,a2,a3) \ + +#define MULT_ADD_XYZT(g0,g1) \ + asm ( "movq %0, %%r8 \n\t" \ + "movq %1, %%r9 \n\t" : : "r"(g0), "r"(g1) : "%r8","%r9");\ + __asm__ ( \ + VSHUFMEM(0,%r8,Z00) VSHUFMEM(0,%r9,Z10) \ + VRDUP(Chi_00,T1) VIDUP(Chi_00,Chi_00) \ + VRDUP(Chi_10,T2) VIDUP(Chi_10,Chi_10) \ + VMUL(Z00,Chi_00,Z1) VMUL(Z10,Chi_10,Z2) \ + VSHUFMEM(3,%r8,Z00) VSHUFMEM(3,%r9,Z10) \ + VMUL(Z00,Chi_00,Z3) VMUL(Z10,Chi_10,Z4) \ + VSHUFMEM(6,%r8,Z00) VSHUFMEM(6,%r9,Z10) \ + VMUL(Z00,Chi_00,Z5) VMUL(Z10,Chi_10,Z6) \ + VMADDMEM(0,%r8,T1,UChi_00) VMADDMEM(0,%r8,T2,UChi_10) \ + VMADDMEM(3,%r8,T1,UChi_01) VMADDMEM(3,%r8,T2,UChi_11) \ + VMADDMEM(6,%r8,T1,UChi_02) VMADDMEM(6,%r8,T2,UChi_12) \ + VSHUFMEM(1,%r8,Z00) VSHUFMEM(1,%r9,Z10) \ + VRDUP(Chi_01,T1) VIDUP(Chi_01,Chi_01) \ + VRDUP(Chi_11,T2) VIDUP(Chi_11,Chi_11) \ + VMADD(Z00,Chi_01,Z1) VMADD(Z10,Chi_11,Z2) \ + VSHUFMEM(4,%r8,Z00) VSHUFMEM(4,%r9,Z10) \ + VMADD(Z00,Chi_01,Z3) VMADD(Z10,Chi_11,Z4) \ + VSHUFMEM(7,%r8,Z00) VSHUFMEM(7,%r9,Z10) \ + VMADD(Z00,Chi_01,Z5) VMADD(Z10,Chi_11,Z6) \ + VMADDMEM(1,%r8,T1,UChi_00) VMADDMEM(1,%r8,T2,UChi_10) \ + VMADDMEM(4,%r8,T1,UChi_01) VMADDMEM(4,%r8,T2,UChi_11) \ + VMADDMEM(7,%r8,T1,UChi_02) VMADDMEM(7,%r8,T2,UChi_12) \ + VSHUFMEM(2,%r8,Z00) VSHUFMEM(2,%r9,Z10) \ + VRDUP(Chi_02,T1) VIDUP(Chi_02,Chi_02) \ + VRDUP(Chi_12,T2) VIDUP(Chi_12,Chi_12) \ + VMADD(Z00,Chi_02,Z1) VMADD(Z10,Chi_12,Z2) \ + VSHUFMEM(5,%r8,Z00) VSHUFMEM(5,%r9,Z10) \ + VMADD(Z00,Chi_02,Z3) VMADD(Z10,Chi_12,Z4) \ + VSHUFMEM(8,%r8,Z00) VSHUFMEM(8,%r9,Z10) \ + VMADD(Z00,Chi_02,Z5) VMADD(Z10,Chi_12,Z6) \ + VMADDSUBMEM(2,%r8,T1,Z1) VMADDSUBMEM(2,%r8,T2,Z2) \ + VMADDSUBMEM(5,%r8,T1,Z3) VMADDSUBMEM(5,%r8,T2,Z4) \ + VMADDSUBMEM(8,%r8,T1,Z5) VMADDSUBMEM(8,%r8,T2,Z6) \ + VADD(Z1,UChi_00,UChi_00) VADD(Z2,UChi_10,UChi_10) \ + VADD(Z3,UChi_01,UChi_01) VADD(Z4,UChi_11,UChi_11) \ + VADD(Z5,UChi_02,UChi_02) VADD(Z6,UChi_12,UChi_12) ); + + +#define MULT_XYZT(g0,g1) \ + asm ( "movq %0, %%r8 \n\t" \ + "movq %1, %%r9 \n\t" : : "r"(g0), "r"(g1) : "%r8","%r9" ); \ + __asm__ ( \ + VSHUFMEM(0,%r8,Z00) VSHUFMEM(0,%r9,Z10) \ + VRDUP(Chi_00,T1) VIDUP(Chi_00,Chi_00) \ + VRDUP(Chi_10,T2) VIDUP(Chi_10,Chi_10) \ + VMUL(Z00,Chi_00,Z1) VMUL(Z10,Chi_10,Z2) \ + VSHUFMEM(3,%r8,Z00) VSHUFMEM(3,%r9,Z10) \ + VMUL(Z00,Chi_00,Z3) VMUL(Z10,Chi_10,Z4) \ + VSHUFMEM(6,%r8,Z00) VSHUFMEM(6,%r9,Z10) \ + VMUL(Z00,Chi_00,Z5) VMUL(Z10,Chi_10,Z6) \ + VMULMEM(0,%r8,T1,UChi_00) VMULMEM(0,%r8,T2,UChi_10) \ + VMULMEM(3,%r8,T1,UChi_01) VMULMEM(3,%r8,T2,UChi_11) \ + VMULMEM(6,%r8,T1,UChi_02) VMULMEM(6,%r8,T2,UChi_12) \ + VSHUFMEM(1,%r8,Z00) VSHUFMEM(1,%r9,Z10) \ + VRDUP(Chi_01,T1) VIDUP(Chi_01,Chi_01) \ + VRDUP(Chi_11,T2) VIDUP(Chi_11,Chi_11) \ + VMADD(Z00,Chi_01,Z1) VMADD(Z10,Chi_11,Z2) \ + VSHUFMEM(4,%r8,Z00) VSHUFMEM(4,%r9,Z10) \ + VMADD(Z00,Chi_01,Z3) VMADD(Z10,Chi_11,Z4) \ + VSHUFMEM(7,%r8,Z00) VSHUFMEM(7,%r9,Z10) \ + VMADD(Z00,Chi_01,Z5) VMADD(Z10,Chi_11,Z6) \ + VMADDMEM(1,%r8,T1,UChi_00) VMADDMEM(1,%r8,T2,UChi_10) \ + VMADDMEM(4,%r8,T1,UChi_01) VMADDMEM(4,%r8,T2,UChi_11) \ + VMADDMEM(7,%r8,T1,UChi_02) VMADDMEM(7,%r8,T2,UChi_12) \ + VSHUFMEM(2,%r8,Z00) VSHUFMEM(2,%r9,Z10) \ + VRDUP(Chi_02,T1) VIDUP(Chi_02,Chi_02) \ + VRDUP(Chi_12,T2) VIDUP(Chi_12,Chi_12) \ + VMADD(Z00,Chi_02,Z1) VMADD(Z10,Chi_12,Z2) \ + VSHUFMEM(5,%r8,Z00) VSHUFMEM(5,%r9,Z10) \ + VMADD(Z00,Chi_02,Z3) VMADD(Z10,Chi_12,Z4) \ + VSHUFMEM(8,%r8,Z00) VSHUFMEM(8,%r9,Z10) \ + VMADD(Z00,Chi_02,Z5) VMADD(Z10,Chi_12,Z6) \ + VMADDSUBMEM(2,%r8,T1,Z1) VMADDSUBMEM(2,%r8,T2,Z2) \ + VMADDSUBMEM(5,%r8,T1,Z3) VMADDSUBMEM(5,%r8,T2,Z4) \ + VMADDSUBMEM(8,%r8,T1,Z5) VMADDSUBMEM(8,%r8,T2,Z6) \ + VADD(Z1,UChi_00,UChi_00) VADD(Z2,UChi_10,UChi_10) \ + VADD(Z3,UChi_01,UChi_01) VADD(Z4,UChi_11,UChi_11) \ + VADD(Z5,UChi_02,UChi_02) VADD(Z6,UChi_12,UChi_12) ); + + +#define LOAD_CHI(a0,a1,a2,a3) \ asm ( \ "movq %0, %%r8 \n\t" \ - VLOAD(0,%%r8,pChi_00) \ - VLOAD(1,%%r8,pChi_01) \ - VLOAD(2,%%r8,pChi_02) \ + VLOAD(0,%%r8,pChi_00) \ + VLOAD(1,%%r8,pChi_01) \ + VLOAD(2,%%r8,pChi_02) \ : : "r" (a0) : "%r8" ); \ asm ( \ "movq %0, %%r8 \n\t" \ - VLOAD(0,%%r8,pChi_10) \ - VLOAD(1,%%r8,pChi_11) \ - VLOAD(2,%%r8,pChi_12) \ + VLOAD(0,%%r8,pChi_10) \ + VLOAD(1,%%r8,pChi_11) \ + VLOAD(2,%%r8,pChi_12) \ : : "r" (a1) : "%r8" ); \ asm ( \ "movq %0, %%r8 \n\t" \ - VLOAD(0,%%r8,pChi_20) \ - VLOAD(1,%%r8,pChi_21) \ - VLOAD(2,%%r8,pChi_22) \ + VLOAD(0,%%r8,pChi_20) \ + VLOAD(1,%%r8,pChi_21) \ + VLOAD(2,%%r8,pChi_22) \ : : "r" (a2) : "%r8" ); \ asm ( \ "movq %0, %%r8 \n\t" \ - VLOAD(0,%%r8,pChi_30) \ - VLOAD(1,%%r8,pChi_31) \ - VLOAD(2,%%r8,pChi_32) \ + VLOAD(0,%%r8,pChi_30) \ + VLOAD(1,%%r8,pChi_31) \ + VLOAD(2,%%r8,pChi_32) \ : : "r" (a3) : "%r8" ); -#define PF_CHI(a0) \ +#define LOAD_CHIa(a0,a1) \ asm ( \ "movq %0, %%r8 \n\t" \ - VPREFETCH1(0,%%r8) \ - VPREFETCH1(1,%%r8) \ + VLOAD(0,%%r8,pChi_00) \ + VLOAD(1,%%r8,pChi_01) \ + VLOAD(2,%%r8,pChi_02) \ + : : "r" (a0) : "%r8" ); \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VLOAD(0,%%r8,pChi_10) \ + VLOAD(1,%%r8,pChi_11) \ + VLOAD(2,%%r8,pChi_12) \ + : : "r" (a1) : "%r8" ); + +#define PF_CHI(a0) \ + asm ( \ + "movq %0, %%r8 \n\t" \ + VPREFETCH1(0,%%r8) \ + VPREFETCH1(1,%%r8) \ VPREFETCH1(2,%%r8) \ : : "r" (a0) : "%r8" ); \ @@ -235,6 +343,17 @@ Author: paboyle VADD(UChi_00,UChi_30,UChi_00) \ VADD(UChi_01,UChi_31,UChi_01) \ VADD(UChi_02,UChi_32,UChi_02) ); \ + asm ( \ + VSTORE(0,%0,pUChi_00) \ + VSTORE(1,%0,pUChi_01) \ + VSTORE(2,%0,pUChi_02) \ + : : "r" (out) : "memory" ); + +#define REDUCEa(out) \ + asm ( \ + VADD(UChi_00,UChi_10,UChi_00) \ + VADD(UChi_01,UChi_11,UChi_01) \ + VADD(UChi_02,UChi_12,UChi_02) ); \ asm ( \ VSTORE(0,%0,pUChi_00) \ VSTORE(1,%0,pUChi_01) \ @@ -259,27 +378,7 @@ void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, assert(0); } - // This is the single precision 5th direction vectorised kernel -template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, - DoubledGaugeField &U, - DoubledGaugeField &UUU, - SiteSpinor *buf, int sF, - int sU, const FermionField &in, SiteSpinor &out) -{ -#ifdef AVX512 - uint64_t gauge0,gauge1,gauge2,gauge3; - uint64_t addr0,addr1,addr2,addr3; - int o0,o1,o2,o3; // offsets - int l0,l1,l2,l3; // local - int p0,p1,p2,p3; // perm - int ptype; - StencilEntry *SE0; - StencilEntry *SE1; - StencilEntry *SE2; - StencilEntry *SE3; - - // Xp, Yp, Zp, Tp #define PREPARE(X,Y,Z,T,skew,UU) \ SE0=st.GetEntry(ptype,X+skew,sF); \ o0 = SE0->_offset; \ @@ -310,6 +409,29 @@ template <> void StaggeredKernels::DhopSiteAsm(StencilImpl gauge2 =(uint64_t)&UU._odata[sU]( Z ); \ gauge3 =(uint64_t)&UU._odata[sU]( T ); + // This is the single precision 5th direction vectorised kernel +#include +template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, + DoubledGaugeField &U, + DoubledGaugeField &UUU, + SiteSpinor *buf, int sF, + int sU, const FermionField &in, SiteSpinor &out) +{ +#ifdef AVX512 + uint64_t gauge0,gauge1,gauge2,gauge3; + uint64_t addr0,addr1,addr2,addr3; + + int o0,o1,o2,o3; // offsets + int l0,l1,l2,l3; // local + int p0,p1,p2,p3; // perm + int ptype; + StencilEntry *SE0; + StencilEntry *SE1; + StencilEntry *SE2; + StencilEntry *SE3; + + // Xp, Yp, Zp, Tp + PREPARE(Xp,Yp,Zp,Tp,0,U); LOAD_CHI(addr0,addr1,addr2,addr3); MULT_LS(gauge0,gauge1,gauge2,gauge3); @@ -333,6 +455,108 @@ template <> void StaggeredKernels::DhopSiteAsm(StencilImpl #endif } + // This is the single precision 5th direction vectorised kernel +#include +template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, + DoubledGaugeField &U, + DoubledGaugeField &UUU, + SiteSpinor *buf, int sF, + int sU, const FermionField &in, SiteSpinor &out) +{ +#ifdef AVX512 + uint64_t gauge0,gauge1,gauge2,gauge3; + uint64_t addr0,addr1,addr2,addr3; + + int o0,o1,o2,o3; // offsets + int l0,l1,l2,l3; // local + int p0,p1,p2,p3; // perm + int ptype; + StencilEntry *SE0; + StencilEntry *SE1; + StencilEntry *SE2; + StencilEntry *SE3; + + // Xp, Yp, Zp, Tp + + PREPARE(Xp,Yp,Zp,Tp,0,U); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_LS(gauge0,gauge1,gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,0,U); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_ADD_LS(gauge0,gauge1,gauge2,gauge3); + + PREPARE(Xp,Yp,Zp,Tp,8,UUU); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_ADD_LS(gauge0,gauge1,gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,8,UUU); + LOAD_CHI(addr0,addr1,addr2,addr3); + MULT_ADD_LS(gauge0,gauge1,gauge2,gauge3); + + addr0 = (uint64_t) &out; + REDUCE(addr0); +#else + assert(0); +#endif +} + + // This is the single precision 5th direction vectorised kernel +#include +template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, + DoubledGaugeField &U, + DoubledGaugeField &UUU, + SiteSpinor *buf, int sF, + int sU, const FermionField &in, SiteSpinor &out) +{ +#ifdef AVX512 + uint64_t gauge0,gauge1,gauge2,gauge3; + uint64_t addr0,addr1,addr2,addr3; + + int o0,o1,o2,o3; // offsets + int l0,l1,l2,l3; // local + int p0,p1,p2,p3; // perm + int ptype; + StencilEntry *SE0; + StencilEntry *SE1; + StencilEntry *SE2; + StencilEntry *SE3; + + // Xp, Yp, Zp, Tp + + PREPARE(Xp,Yp,Zp,Tp,0,U); + LOAD_CHIa(addr0,addr1); + MULT_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + MULT_XYZT(gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,0,U); + LOAD_CHIa(addr0,addr1); + MULT_ADD_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + MULT_ADD_XYZT(gauge2,gauge3); + + PREPARE(Xp,Yp,Zp,Tp,8,UUU); + LOAD_CHIa(addr0,addr1); + MULT_ADD_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + MULT_ADD_XYZT(gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,8,UUU); + LOAD_CHIa(addr0,addr1); + MULT_ADD_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + MULT_ADD_XYZT(gauge2,gauge3); + + addr0 = (uint64_t) &out; + REDUCEa(addr0); +#else + assert(0); +#endif +} + + + FermOpStaggeredTemplateInstantiate(StaggeredKernels); FermOpStaggeredVec5dTemplateInstantiate(StaggeredKernels); From df9108154daa740119c22f7a23c3f5230b3a0780 Mon Sep 17 00:00:00 2001 From: azusayamaguchi Date: Sat, 17 Dec 2016 23:47:51 +0000 Subject: [PATCH 176/807] Debugged 2 versions of assembler; ls vectorised, xyzt vectorised --- lib/qcd/action/fermion/StaggeredKernelsAsm.cc | 377 ++++++++++++++++-- tests/core/Test_staggered5Dvec.cc | 27 +- 2 files changed, 361 insertions(+), 43 deletions(-) diff --git a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc index 6c213b51..890cf4e5 100644 --- a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc +++ b/lib/qcd/action/fermion/StaggeredKernelsAsm.cc @@ -90,13 +90,14 @@ Author: paboyle #define T2 %zmm26 #define T3 %zmm27 -#define Z00 %zmm28 -#define Z10 %zmm29 -#define Z1 %zmm30 -#define Z2 %zmm31 +#define Z00 %zmm26 +#define Z10 %zmm27 +#define Z0 Z00 +#define Z1 %zmm28 +#define Z2 %zmm29 -#define Z3 Chi_22 -#define Z4 Chi_30 +#define Z3 %zmm30 +#define Z4 %zmm31 #define Z5 Chi_31 #define Z6 Chi_32 @@ -198,86 +199,269 @@ Author: paboyle VMADDSUBRDUP(5,%r10,Chi_22,UChi_21) VMADDSUBRDUP(5,%r11,Chi_32,UChi_31) \ VMADDSUBRDUP(8,%r10,Chi_22,UChi_22) VMADDSUBRDUP(8,%r11,Chi_32,UChi_32) ); +#define MULT_ADD_XYZTa(g0,g1) \ + asm ( "movq %0, %%r8 \n\t" \ + "movq %1, %%r9 \n\t" : : "r"(g0), "r"(g1) : "%r8","%r9");\ + __asm__ ( \ + VSHUF(Chi_00,T0) \ + VSHUF(Chi_10,T1) \ + VMOVIDUP(0,%r8,Z0 ) \ + VMOVIDUP(3,%r8,Z1 ) \ + VMOVIDUP(6,%r8,Z2 ) \ + VMADDSUB(Z0,T0,UChi_00) \ + VMADDSUB(Z1,T0,UChi_01) \ + VMADDSUB(Z2,T0,UChi_02) \ + \ + VMOVIDUP(0,%r9,Z0 ) \ + VMOVIDUP(3,%r9,Z1 ) \ + VMOVIDUP(6,%r9,Z2 ) \ + VMADDSUB(Z0,T1,UChi_10) \ + VMADDSUB(Z1,T1,UChi_11) \ + VMADDSUB(Z2,T1,UChi_12) \ + \ + \ + VMOVRDUP(0,%r8,Z3 ) \ + VMOVRDUP(3,%r8,Z4 ) \ + VMOVRDUP(6,%r8,Z5 ) \ + VMADDSUB(Z3,Chi_00,UChi_00)/*rr * ir = ri rr*/ \ + VMADDSUB(Z4,Chi_00,UChi_01) \ + VMADDSUB(Z5,Chi_00,UChi_02) \ + \ + VMOVRDUP(0,%r9,Z3 ) \ + VMOVRDUP(3,%r9,Z4 ) \ + VMOVRDUP(6,%r9,Z5 ) \ + VMADDSUB(Z3,Chi_10,UChi_10) \ + VMADDSUB(Z4,Chi_10,UChi_11)\ + VMADDSUB(Z5,Chi_10,UChi_12) \ + \ + \ + VMOVIDUP(1,%r8,Z0 ) \ + VMOVIDUP(4,%r8,Z1 ) \ + VMOVIDUP(7,%r8,Z2 ) \ + VSHUF(Chi_01,T0) \ + VMADDSUB(Z0,T0,UChi_00) \ + VMADDSUB(Z1,T0,UChi_01) \ + VMADDSUB(Z2,T0,UChi_02) \ + \ + VMOVIDUP(1,%r9,Z0 ) \ + VMOVIDUP(4,%r9,Z1 ) \ + VMOVIDUP(7,%r9,Z2 ) \ + VSHUF(Chi_11,T1) \ + VMADDSUB(Z0,T1,UChi_10) \ + VMADDSUB(Z1,T1,UChi_11) \ + VMADDSUB(Z2,T1,UChi_12) \ + \ + VMOVRDUP(1,%r8,Z3 ) \ + VMOVRDUP(4,%r8,Z4 ) \ + VMOVRDUP(7,%r8,Z5 ) \ + VMADDSUB(Z3,Chi_01,UChi_00) \ + VMADDSUB(Z4,Chi_01,UChi_01) \ + VMADDSUB(Z5,Chi_01,UChi_02) \ + \ + VMOVRDUP(1,%r9,Z3 ) \ + VMOVRDUP(4,%r9,Z4 ) \ + VMOVRDUP(7,%r9,Z5 ) \ + VMADDSUB(Z3,Chi_11,UChi_10) \ + VMADDSUB(Z4,Chi_11,UChi_11) \ + VMADDSUB(Z5,Chi_11,UChi_12) \ + \ + VSHUF(Chi_02,T0) \ + VSHUF(Chi_12,T1) \ + VMOVIDUP(2,%r8,Z0 ) \ + VMOVIDUP(5,%r8,Z1 ) \ + VMOVIDUP(8,%r8,Z2 ) \ + VMADDSUB(Z0,T0,UChi_00) \ + VMADDSUB(Z1,T0,UChi_01) \ + VMADDSUB(Z2,T0,UChi_02) \ + VMOVIDUP(2,%r9,Z0 ) \ + VMOVIDUP(5,%r9,Z1 ) \ + VMOVIDUP(8,%r9,Z2 ) \ + VMADDSUB(Z0,T1,UChi_10) \ + VMADDSUB(Z1,T1,UChi_11) \ + VMADDSUB(Z2,T1,UChi_12) \ + /*55*/ \ + VMOVRDUP(2,%r8,Z3 ) \ + VMOVRDUP(5,%r8,Z4 ) \ + VMOVRDUP(8,%r8,Z5 ) \ + VMADDSUB(Z3,Chi_02,UChi_00) \ + VMADDSUB(Z4,Chi_02,UChi_01) \ + VMADDSUB(Z5,Chi_02,UChi_02) \ + VMOVRDUP(2,%r9,Z3 ) \ + VMOVRDUP(5,%r9,Z4 ) \ + VMOVRDUP(8,%r9,Z5 ) \ + VMADDSUB(Z3,Chi_12,UChi_10) \ + VMADDSUB(Z4,Chi_12,UChi_11) \ + VMADDSUB(Z5,Chi_12,UChi_12) \ + /*61 insns*/ ); #define MULT_ADD_XYZT(g0,g1) \ asm ( "movq %0, %%r8 \n\t" \ "movq %1, %%r9 \n\t" : : "r"(g0), "r"(g1) : "%r8","%r9");\ __asm__ ( \ - VSHUFMEM(0,%r8,Z00) VSHUFMEM(0,%r9,Z10) \ - VRDUP(Chi_00,T1) VIDUP(Chi_00,Chi_00) \ - VRDUP(Chi_10,T2) VIDUP(Chi_10,Chi_10) \ + VSHUFMEM(0,%r8,Z00) VSHUFMEM(0,%r9,Z10) \ + VRDUP(Chi_00,T0) VIDUP(Chi_00,Chi_00) \ + VRDUP(Chi_10,T1) VIDUP(Chi_10,Chi_10) \ VMUL(Z00,Chi_00,Z1) VMUL(Z10,Chi_10,Z2) \ - VSHUFMEM(3,%r8,Z00) VSHUFMEM(3,%r9,Z10) \ + VSHUFMEM(3,%r8,Z00) VSHUFMEM(3,%r9,Z10) \ VMUL(Z00,Chi_00,Z3) VMUL(Z10,Chi_10,Z4) \ VSHUFMEM(6,%r8,Z00) VSHUFMEM(6,%r9,Z10) \ VMUL(Z00,Chi_00,Z5) VMUL(Z10,Chi_10,Z6) \ - VMADDMEM(0,%r8,T1,UChi_00) VMADDMEM(0,%r8,T2,UChi_10) \ - VMADDMEM(3,%r8,T1,UChi_01) VMADDMEM(3,%r8,T2,UChi_11) \ - VMADDMEM(6,%r8,T1,UChi_02) VMADDMEM(6,%r8,T2,UChi_12) \ + VMADDMEM(0,%r8,T0,UChi_00) VMADDMEM(0,%r9,T1,UChi_10) \ + VMADDMEM(3,%r8,T0,UChi_01) VMADDMEM(3,%r9,T1,UChi_11) \ + VMADDMEM(6,%r8,T0,UChi_02) VMADDMEM(6,%r9,T1,UChi_12) \ VSHUFMEM(1,%r8,Z00) VSHUFMEM(1,%r9,Z10) \ - VRDUP(Chi_01,T1) VIDUP(Chi_01,Chi_01) \ - VRDUP(Chi_11,T2) VIDUP(Chi_11,Chi_11) \ + VRDUP(Chi_01,T0) VIDUP(Chi_01,Chi_01) \ + VRDUP(Chi_11,T1) VIDUP(Chi_11,Chi_11) \ VMADD(Z00,Chi_01,Z1) VMADD(Z10,Chi_11,Z2) \ VSHUFMEM(4,%r8,Z00) VSHUFMEM(4,%r9,Z10) \ VMADD(Z00,Chi_01,Z3) VMADD(Z10,Chi_11,Z4) \ VSHUFMEM(7,%r8,Z00) VSHUFMEM(7,%r9,Z10) \ VMADD(Z00,Chi_01,Z5) VMADD(Z10,Chi_11,Z6) \ - VMADDMEM(1,%r8,T1,UChi_00) VMADDMEM(1,%r8,T2,UChi_10) \ - VMADDMEM(4,%r8,T1,UChi_01) VMADDMEM(4,%r8,T2,UChi_11) \ - VMADDMEM(7,%r8,T1,UChi_02) VMADDMEM(7,%r8,T2,UChi_12) \ + VMADDMEM(1,%r8,T0,UChi_00) VMADDMEM(1,%r9,T1,UChi_10) \ + VMADDMEM(4,%r8,T0,UChi_01) VMADDMEM(4,%r9,T1,UChi_11) \ + VMADDMEM(7,%r8,T0,UChi_02) VMADDMEM(7,%r9,T1,UChi_12) \ VSHUFMEM(2,%r8,Z00) VSHUFMEM(2,%r9,Z10) \ - VRDUP(Chi_02,T1) VIDUP(Chi_02,Chi_02) \ - VRDUP(Chi_12,T2) VIDUP(Chi_12,Chi_12) \ + VRDUP(Chi_02,T0) VIDUP(Chi_02,Chi_02) \ + VRDUP(Chi_12,T1) VIDUP(Chi_12,Chi_12) \ VMADD(Z00,Chi_02,Z1) VMADD(Z10,Chi_12,Z2) \ VSHUFMEM(5,%r8,Z00) VSHUFMEM(5,%r9,Z10) \ VMADD(Z00,Chi_02,Z3) VMADD(Z10,Chi_12,Z4) \ VSHUFMEM(8,%r8,Z00) VSHUFMEM(8,%r9,Z10) \ VMADD(Z00,Chi_02,Z5) VMADD(Z10,Chi_12,Z6) \ - VMADDSUBMEM(2,%r8,T1,Z1) VMADDSUBMEM(2,%r8,T2,Z2) \ - VMADDSUBMEM(5,%r8,T1,Z3) VMADDSUBMEM(5,%r8,T2,Z4) \ - VMADDSUBMEM(8,%r8,T1,Z5) VMADDSUBMEM(8,%r8,T2,Z6) \ + VMADDSUBMEM(2,%r8,T0,Z1) VMADDSUBMEM(2,%r9,T1,Z2) \ + VMADDSUBMEM(5,%r8,T0,Z3) VMADDSUBMEM(5,%r9,T1,Z4) \ + VMADDSUBMEM(8,%r8,T0,Z5) VMADDSUBMEM(8,%r9,T1,Z6) \ VADD(Z1,UChi_00,UChi_00) VADD(Z2,UChi_10,UChi_10) \ VADD(Z3,UChi_01,UChi_01) VADD(Z4,UChi_11,UChi_11) \ VADD(Z5,UChi_02,UChi_02) VADD(Z6,UChi_12,UChi_12) ); - #define MULT_XYZT(g0,g1) \ + asm ( "movq %0, %%r8 \n\t" \ + "movq %1, %%r9 \n\t" : : "r"(g0), "r"(g1) : "%r8","%r9" ); \ + __asm__ ( \ + VSHUF(Chi_00,T0) \ + VSHUF(Chi_10,T1) \ + VMOVIDUP(0,%r8,Z0 ) \ + VMOVIDUP(3,%r8,Z1 ) \ + VMOVIDUP(6,%r8,Z2 ) \ + /*6*/ \ + VMUL(Z0,T0,UChi_00) \ + VMUL(Z1,T0,UChi_01) \ + VMUL(Z2,T0,UChi_02) \ + VMOVIDUP(0,%r9,Z0 ) \ + VMOVIDUP(3,%r9,Z1 ) \ + VMOVIDUP(6,%r9,Z2 ) \ + VMUL(Z0,T1,UChi_10) \ + VMUL(Z1,T1,UChi_11) \ + VMUL(Z2,T1,UChi_12) \ + VMOVRDUP(0,%r8,Z3 ) \ + VMOVRDUP(3,%r8,Z4 ) \ + VMOVRDUP(6,%r8,Z5 ) \ + /*18*/ \ + VMADDSUB(Z3,Chi_00,UChi_00) \ + VMADDSUB(Z4,Chi_00,UChi_01)\ + VMADDSUB(Z5,Chi_00,UChi_02) \ + VMOVRDUP(0,%r9,Z3 ) \ + VMOVRDUP(3,%r9,Z4 ) \ + VMOVRDUP(6,%r9,Z5 ) \ + VMADDSUB(Z3,Chi_10,UChi_10) \ + VMADDSUB(Z4,Chi_10,UChi_11)\ + VMADDSUB(Z5,Chi_10,UChi_12) \ + VMOVIDUP(1,%r8,Z0 ) \ + VMOVIDUP(4,%r8,Z1 ) \ + VMOVIDUP(7,%r8,Z2 ) \ + /*28*/ \ + VSHUF(Chi_01,T0) \ + VMADDSUB(Z0,T0,UChi_00) \ + VMADDSUB(Z1,T0,UChi_01) \ + VMADDSUB(Z2,T0,UChi_02) \ + VMOVIDUP(1,%r9,Z0 ) \ + VMOVIDUP(4,%r9,Z1 ) \ + VMOVIDUP(7,%r9,Z2 ) \ + VSHUF(Chi_11,T1) \ + VMADDSUB(Z0,T1,UChi_10) \ + VMADDSUB(Z1,T1,UChi_11) \ + VMADDSUB(Z2,T1,UChi_12) \ + VMOVRDUP(1,%r8,Z3 ) \ + VMOVRDUP(4,%r8,Z4 ) \ + VMOVRDUP(7,%r8,Z5 ) \ + /*38*/ \ + VMADDSUB(Z3,Chi_01,UChi_00) \ + VMADDSUB(Z4,Chi_01,UChi_01) \ + VMADDSUB(Z5,Chi_01,UChi_02) \ + VMOVRDUP(1,%r9,Z3 ) \ + VMOVRDUP(4,%r9,Z4 ) \ + VMOVRDUP(7,%r9,Z5 ) \ + VMADDSUB(Z3,Chi_11,UChi_10) \ + VMADDSUB(Z4,Chi_11,UChi_11) \ + VMADDSUB(Z5,Chi_11,UChi_12) \ + /*48*/ \ + VSHUF(Chi_02,T0) \ + VSHUF(Chi_12,T1) \ + VMOVIDUP(2,%r8,Z0 ) \ + VMOVIDUP(5,%r8,Z1 ) \ + VMOVIDUP(8,%r8,Z2 ) \ + VMADDSUB(Z0,T0,UChi_00) \ + VMADDSUB(Z1,T0,UChi_01) \ + VMADDSUB(Z2,T0,UChi_02) \ + VMOVIDUP(2,%r9,Z0 ) \ + VMOVIDUP(5,%r9,Z1 ) \ + VMOVIDUP(8,%r9,Z2 ) \ + VMADDSUB(Z0,T1,UChi_10) \ + VMADDSUB(Z1,T1,UChi_11) \ + VMADDSUB(Z2,T1,UChi_12) \ + /*55*/ \ + VMOVRDUP(2,%r8,Z3 ) \ + VMOVRDUP(5,%r8,Z4 ) \ + VMOVRDUP(8,%r8,Z5 ) \ + VMADDSUB(Z3,Chi_02,UChi_00) \ + VMADDSUB(Z4,Chi_02,UChi_01) \ + VMADDSUB(Z5,Chi_02,UChi_02) \ + VMOVRDUP(2,%r9,Z3 ) \ + VMOVRDUP(5,%r9,Z4 ) \ + VMOVRDUP(8,%r9,Z5 ) \ + VMADDSUB(Z3,Chi_12,UChi_10) \ + VMADDSUB(Z4,Chi_12,UChi_11) \ + VMADDSUB(Z5,Chi_12,UChi_12) \ + /*61 insns*/ ); + +#define MULT_XYZTa(g0,g1) \ asm ( "movq %0, %%r8 \n\t" \ "movq %1, %%r9 \n\t" : : "r"(g0), "r"(g1) : "%r8","%r9" ); \ __asm__ ( \ VSHUFMEM(0,%r8,Z00) VSHUFMEM(0,%r9,Z10) \ - VRDUP(Chi_00,T1) VIDUP(Chi_00,Chi_00) \ - VRDUP(Chi_10,T2) VIDUP(Chi_10,Chi_10) \ + VRDUP(Chi_00,T0) VIDUP(Chi_00,Chi_00) \ + VRDUP(Chi_10,T1) VIDUP(Chi_10,Chi_10) \ VMUL(Z00,Chi_00,Z1) VMUL(Z10,Chi_10,Z2) \ VSHUFMEM(3,%r8,Z00) VSHUFMEM(3,%r9,Z10) \ VMUL(Z00,Chi_00,Z3) VMUL(Z10,Chi_10,Z4) \ VSHUFMEM(6,%r8,Z00) VSHUFMEM(6,%r9,Z10) \ VMUL(Z00,Chi_00,Z5) VMUL(Z10,Chi_10,Z6) \ - VMULMEM(0,%r8,T1,UChi_00) VMULMEM(0,%r8,T2,UChi_10) \ - VMULMEM(3,%r8,T1,UChi_01) VMULMEM(3,%r8,T2,UChi_11) \ - VMULMEM(6,%r8,T1,UChi_02) VMULMEM(6,%r8,T2,UChi_12) \ + VMULMEM(0,%r8,T0,UChi_00) VMULMEM(0,%r9,T1,UChi_10) \ + VMULMEM(3,%r8,T0,UChi_01) VMULMEM(3,%r9,T1,UChi_11) \ + VMULMEM(6,%r8,T0,UChi_02) VMULMEM(6,%r9,T1,UChi_12) \ VSHUFMEM(1,%r8,Z00) VSHUFMEM(1,%r9,Z10) \ - VRDUP(Chi_01,T1) VIDUP(Chi_01,Chi_01) \ - VRDUP(Chi_11,T2) VIDUP(Chi_11,Chi_11) \ + VRDUP(Chi_01,T0) VIDUP(Chi_01,Chi_01) \ + VRDUP(Chi_11,T1) VIDUP(Chi_11,Chi_11) \ VMADD(Z00,Chi_01,Z1) VMADD(Z10,Chi_11,Z2) \ VSHUFMEM(4,%r8,Z00) VSHUFMEM(4,%r9,Z10) \ VMADD(Z00,Chi_01,Z3) VMADD(Z10,Chi_11,Z4) \ VSHUFMEM(7,%r8,Z00) VSHUFMEM(7,%r9,Z10) \ VMADD(Z00,Chi_01,Z5) VMADD(Z10,Chi_11,Z6) \ - VMADDMEM(1,%r8,T1,UChi_00) VMADDMEM(1,%r8,T2,UChi_10) \ - VMADDMEM(4,%r8,T1,UChi_01) VMADDMEM(4,%r8,T2,UChi_11) \ - VMADDMEM(7,%r8,T1,UChi_02) VMADDMEM(7,%r8,T2,UChi_12) \ + VMADDMEM(1,%r8,T0,UChi_00) VMADDMEM(1,%r9,T1,UChi_10) \ + VMADDMEM(4,%r8,T0,UChi_01) VMADDMEM(4,%r9,T1,UChi_11) \ + VMADDMEM(7,%r8,T0,UChi_02) VMADDMEM(7,%r9,T1,UChi_12) \ VSHUFMEM(2,%r8,Z00) VSHUFMEM(2,%r9,Z10) \ - VRDUP(Chi_02,T1) VIDUP(Chi_02,Chi_02) \ - VRDUP(Chi_12,T2) VIDUP(Chi_12,Chi_12) \ + VRDUP(Chi_02,T0) VIDUP(Chi_02,Chi_02) \ + VRDUP(Chi_12,T1) VIDUP(Chi_12,Chi_12) \ VMADD(Z00,Chi_02,Z1) VMADD(Z10,Chi_12,Z2) \ VSHUFMEM(5,%r8,Z00) VSHUFMEM(5,%r9,Z10) \ VMADD(Z00,Chi_02,Z3) VMADD(Z10,Chi_12,Z4) \ VSHUFMEM(8,%r8,Z00) VSHUFMEM(8,%r9,Z10) \ VMADD(Z00,Chi_02,Z5) VMADD(Z10,Chi_12,Z6) \ - VMADDSUBMEM(2,%r8,T1,Z1) VMADDSUBMEM(2,%r8,T2,Z2) \ - VMADDSUBMEM(5,%r8,T1,Z3) VMADDSUBMEM(5,%r8,T2,Z4) \ - VMADDSUBMEM(8,%r8,T1,Z5) VMADDSUBMEM(8,%r8,T2,Z6) \ + VMADDSUBMEM(2,%r8,T0,Z1) VMADDSUBMEM(2,%r9,T1,Z2) \ + VMADDSUBMEM(5,%r8,T0,Z3) VMADDSUBMEM(5,%r9,T1,Z4) \ + VMADDSUBMEM(8,%r8,T0,Z5) VMADDSUBMEM(8,%r9,T1,Z6) \ VADD(Z1,UChi_00,UChi_00) VADD(Z2,UChi_10,UChi_10) \ VADD(Z3,UChi_01,UChi_01) VADD(Z4,UChi_11,UChi_11) \ VADD(Z5,UChi_02,UChi_02) VADD(Z6,UChi_12,UChi_12) ); @@ -383,24 +567,28 @@ void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, SE0=st.GetEntry(ptype,X+skew,sF); \ o0 = SE0->_offset; \ l0 = SE0->_is_local; \ + p0 = SE0->_permute; \ addr0 = l0 ? (uint64_t) &in._odata[o0] : (uint64_t) &buf[o0]; \ PF_CHI(addr0); \ \ SE1=st.GetEntry(ptype,Y+skew,sF); \ o1 = SE1->_offset; \ l1 = SE1->_is_local; \ + p1 = SE1->_permute; \ addr1 = l1 ? (uint64_t) &in._odata[o1] : (uint64_t) &buf[o1]; \ PF_CHI(addr1); \ \ SE2=st.GetEntry(ptype,Z+skew,sF); \ o2 = SE2->_offset; \ l2 = SE2->_is_local; \ + p2 = SE2->_permute; \ addr2 = l2 ? (uint64_t) &in._odata[o2] : (uint64_t) &buf[o2]; \ PF_CHI(addr2); \ \ SE3=st.GetEntry(ptype,T+skew,sF); \ o3 = SE3->_offset; \ l3 = SE3->_is_local; \ + p3 = SE3->_permute; \ addr3 = l3 ? (uint64_t) &in._odata[o3] : (uint64_t) &buf[o3]; \ PF_CHI(addr3); \ \ @@ -501,6 +689,27 @@ template <> void StaggeredKernels::DhopSiteAsm(StencilImpl #endif } + +#define PERMUTE_DIR3 __asm__ ( \ + VPERM3(Chi_00,Chi_00) \ + VPERM3(Chi_01,Chi_01) \ + VPERM3(Chi_02,Chi_02) ); + +#define PERMUTE_DIR2 __asm__ ( \ + VPERM2(Chi_10,Chi_10) \ + VPERM2(Chi_11,Chi_11) \ + VPERM2(Chi_12,Chi_12) ); + +#define PERMUTE_DIR1 __asm__ ( \ + VPERM1(Chi_00,Chi_00) \ + VPERM1(Chi_01,Chi_01) \ + VPERM1(Chi_02,Chi_02) ); + +#define PERMUTE_DIR0 __asm__ ( \ + VPERM0(Chi_10,Chi_10) \ + VPERM0(Chi_11,Chi_11) \ + VPERM0(Chi_12,Chi_12) ); + // This is the single precision 5th direction vectorised kernel #include template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, @@ -523,29 +732,115 @@ template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, StencilEntry *SE3; // Xp, Yp, Zp, Tp - PREPARE(Xp,Yp,Zp,Tp,0,U); LOAD_CHIa(addr0,addr1); + if (l0&&p0) { PERMUTE_DIR3; } + if (l1&&p1) { PERMUTE_DIR2; } MULT_XYZT(gauge0,gauge1); LOAD_CHIa(addr2,addr3); - MULT_XYZT(gauge2,gauge3); + if (l2&&p2) { PERMUTE_DIR1; } + if (l3&&p3) { PERMUTE_DIR0; } + MULT_ADD_XYZT(gauge2,gauge3); PREPARE(Xm,Ym,Zm,Tm,0,U); LOAD_CHIa(addr0,addr1); + if (l0&&p0) { PERMUTE_DIR3; } + if (l1&&p1) { PERMUTE_DIR2; } MULT_ADD_XYZT(gauge0,gauge1); LOAD_CHIa(addr2,addr3); + if (l2&&p2) { PERMUTE_DIR1; } + if (l3&&p3) { PERMUTE_DIR0; } MULT_ADD_XYZT(gauge2,gauge3); PREPARE(Xp,Yp,Zp,Tp,8,UUU); LOAD_CHIa(addr0,addr1); + if (l0&&p0) { PERMUTE_DIR3; } + if (l1&&p1) { PERMUTE_DIR2; } MULT_ADD_XYZT(gauge0,gauge1); LOAD_CHIa(addr2,addr3); + if (l2&&p2) { PERMUTE_DIR1; } + if (l3&&p3) { PERMUTE_DIR0; } MULT_ADD_XYZT(gauge2,gauge3); PREPARE(Xm,Ym,Zm,Tm,8,UUU); LOAD_CHIa(addr0,addr1); + if (l0&&p0) { PERMUTE_DIR3; } + if (l1&&p1) { PERMUTE_DIR2; } MULT_ADD_XYZT(gauge0,gauge1); LOAD_CHIa(addr2,addr3); + if (l2&&p2) { PERMUTE_DIR1; } + if (l3&&p3) { PERMUTE_DIR0; } + MULT_ADD_XYZT(gauge2,gauge3); + + addr0 = (uint64_t) &out; + REDUCEa(addr0); +#else + assert(0); +#endif +} + + + // This is the single precision 5th direction vectorised kernel +#include +template <> void StaggeredKernels::DhopSiteAsm(StencilImpl &st, LebesgueOrder &lo, + DoubledGaugeField &U, + DoubledGaugeField &UUU, + SiteSpinor *buf, int sF, + int sU, const FermionField &in, SiteSpinor &out) +{ +#ifdef AVX512 + uint64_t gauge0,gauge1,gauge2,gauge3; + uint64_t addr0,addr1,addr2,addr3; + + int o0,o1,o2,o3; // offsets + int l0,l1,l2,l3; // local + int p0,p1,p2,p3; // perm + int ptype; + StencilEntry *SE0; + StencilEntry *SE1; + StencilEntry *SE2; + StencilEntry *SE3; + + // Xp, Yp, Zp, Tp + + PREPARE(Xp,Yp,Zp,Tp,0,U); + LOAD_CHIa(addr0,addr1); + if (p0) { PERMUTE_DIR3; } + if (p1) { PERMUTE_DIR2; } + MULT_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + if (p2) { PERMUTE_DIR1; } + if (p3) { PERMUTE_DIR0; } + MULT_ADD_XYZT(gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,0,U); + LOAD_CHIa(addr0,addr1); + if (p0) { PERMUTE_DIR3; } + if (p1) { PERMUTE_DIR2; } + MULT_ADD_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + if (p2) { PERMUTE_DIR1; } + if (p3) { PERMUTE_DIR0; } + MULT_ADD_XYZT(gauge2,gauge3); + + PREPARE(Xp,Yp,Zp,Tp,8,UUU); + LOAD_CHIa(addr0,addr1); + if (p0) { PERMUTE_DIR3; } + if (p1) { PERMUTE_DIR2; } + MULT_ADD_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + if (p2) { PERMUTE_DIR1; } + if (p3) { PERMUTE_DIR0; } + MULT_ADD_XYZT(gauge2,gauge3); + + PREPARE(Xm,Ym,Zm,Tm,8,UUU); + LOAD_CHIa(addr0,addr1); + if (p0) { PERMUTE_DIR3; } + if (p1) { PERMUTE_DIR2; } + MULT_ADD_XYZT(gauge0,gauge1); + LOAD_CHIa(addr2,addr3); + if (p2) { PERMUTE_DIR1; } + if (p3) { PERMUTE_DIR0; } MULT_ADD_XYZT(gauge2,gauge3); addr0 = (uint64_t) &out; diff --git a/tests/core/Test_staggered5Dvec.cc b/tests/core/Test_staggered5Dvec.cc index be08c8b4..f3da3a1c 100644 --- a/tests/core/Test_staggered5Dvec.cc +++ b/tests/core/Test_staggered5Dvec.cc @@ -68,12 +68,14 @@ int main (int argc, char ** argv) FermionField src (FGrid); - //random(pRNG5,src); + random(pRNG5,src); + /* std::vector site({0,0,0,0,0}); ColourVector cv = zero; cv()()(0)=1.0; src = zero; pokeSite(cv,src,site); + */ FermionField result(FGrid); result=zero; FermionField tmp(FGrid); tmp=zero; @@ -81,8 +83,15 @@ int main (int argc, char ** argv) FermionField phi (FGrid); random(pRNG5,phi); FermionField chi (FGrid); random(pRNG5,chi); - LatticeGaugeField Umu(UGrid); SU3::ColdConfiguration(pRNG4,Umu); + LatticeGaugeField Umu(UGrid); SU3::HotConfiguration(pRNG4,Umu); + /* + for(int mu=1;mu<4;mu++){ + auto tmp = PeekIndex(Umu,mu); + tmp = zero; + PokeIndex(Umu,tmp,mu); + } + */ double volume=Ls; for(int mu=0;muBarrier(); \ + t0=usecond(); \ + for(int i=0;iBarrier(); \ + zDw.CayleyReport(); \ + std::cout< gamma(Ls,std::complex(1.0,0.0)); + ZMobiusFermionVec5dR zDw(Umu,*sFGrid,*sFrbGrid,*sUGrid,*sUrbGrid,mass,M5,gamma,b,c); + std::cout<Barrier(); @@ -193,6 +213,9 @@ int main (int argc, char ** argv) BENCH_DW(Mooee ,src_o,r_o); BENCH_DW(MooeeInv,src_o,r_o); + BENCH_ZDW(Mooee ,src_o,r_o); + BENCH_ZDW(MooeeInv,src_o,r_o); + } Grid_finalize(); From fa6acccf556480f1eff84784750c350cc8c3f672 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sun, 18 Dec 2016 00:56:19 +0000 Subject: [PATCH 178/807] Zmobius asm --- lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 193 ++++++++++++------- 1 file changed, 119 insertions(+), 74 deletions(-) diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index 91ab386a..38bceafe 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -514,7 +514,8 @@ template void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionField &chi, int LLs, int site, Vector > &Matp, Vector > &Matm) { -#if 1 +#ifndef AVX512 + //#if 0 { SiteHalfSpinor BcastP; SiteHalfSpinor BcastM; @@ -542,12 +543,13 @@ void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionFi for(int co=0;co::MooeeInternalZAsm(const FermionField &psi, FermionFi #else { // pointers - // MASK_REGS; + // MASK_REGS; #define Chi_00 %zmm0 #define Chi_01 %zmm1 #define Chi_02 %zmm2 @@ -577,20 +579,37 @@ void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionFi #define Chi_30 %zmm9 #define Chi_31 %zmm10 #define Chi_32 %zmm11 +#define pChi_00 %%zmm0 +#define pChi_01 %%zmm1 +#define pChi_02 %%zmm2 +#define pChi_10 %%zmm3 +#define pChi_11 %%zmm4 +#define pChi_12 %%zmm5 +#define pChi_20 %%zmm6 +#define pChi_21 %%zmm7 +#define pChi_22 %%zmm8 +#define pChi_30 %%zmm9 +#define pChi_31 %%zmm10 +#define pChi_32 %%zmm11 -#define BCAST0 %zmm12 -#define BCAST1 %zmm13 -#define BCAST2 %zmm14 -#define BCAST3 %zmm15 -#define BCAST4 %zmm16 -#define BCAST5 %zmm17 -#define BCAST6 %zmm18 -#define BCAST7 %zmm19 -#define BCAST8 %zmm20 -#define BCAST9 %zmm21 -#define BCAST10 %zmm22 -#define BCAST11 %zmm23 +#define BCAST_00 %zmm12 +#define SHUF_00 %zmm13 +#define BCAST_01 %zmm14 +#define SHUF_01 %zmm15 +#define BCAST_02 %zmm16 +#define SHUF_02 %zmm17 +#define BCAST_10 %zmm18 +#define SHUF_10 %zmm19 +#define BCAST_11 %zmm20 +#define SHUF_11 %zmm21 +#define BCAST_12 %zmm22 +#define SHUF_12 %zmm23 +#define Mp %zmm24 +#define Mps %zmm25 +#define Mm %zmm26 +#define Mms %zmm27 +#define N 8 int incr=LLs*LLs*sizeof(iSinglet); for(int s1=0;s1::MooeeInternalZAsm(const FermionField &psi, FermionFi LOAD64(%r9,a1); LOAD64(%r10,a2); asm ( - VPREFETCH1(0,%r10) VPREFETCH1(0,%r9) - VPREFETCH1(12,%r10) VPREFETCH1(13,%r10) - VPREFETCH1(14,%r10) VPREFETCH1(15,%r10) - VBCASTCDUP(0,%r10,BCAST0) VBCASTCDUP(1,%r10,BCAST1) - VBCASTCDUP(2,%r10,BCAST2) VBCASTCDUP(3,%r10,BCAST3) - VBCASTCDUP(4,%r10,BCAST4) VBCASTCDUP(5,%r10,BCAST5) - VBCASTCDUP(6,%r10,BCAST6) VBCASTCDUP(7,%r10,BCAST7) - VBCASTCDUP(8,%r10,BCAST8) VBCASTCDUP(9,%r10,BCAST9) - VBCASTCDUP(10,%r10,BCAST10) VBCASTCDUP(11,%r10,BCAST11) - VMULIDUP (0,%r8,BCAST0,Chi_00) VMULIDUP(0,%r8,BCAST1,Chi_01) // II RI from Mat / Psi - VMULIDUP (0,%r8,BCAST2,Chi_02) VMULIDUP(0,%r8,BCAST3,Chi_10) - VMULIDUP (0,%r8,BCAST4,Chi_11) VMULIDUP(0,%r8,BCAST5,Chi_12) - VMULIDUP (0,%r9,BCAST6,Chi_20) VMULIDUP(0,%r9,BCAST7,Chi_21) - VMULIDUP (0,%r9,BCAST8,Chi_22) VMULIDUP(0,%r9,BCAST9,Chi_30) - VMULIDUP (0,%r9,BCAST10,Chi_31) VMULIDUP(0,%r9,BCAST11,Chi_32) - VSHUF(BCAST0,BCAST0) VSHUF(BCAST1,BCAST1) - VSHUF(BCAST2,BCAST2) VSHUF(BCAST3,BCAST3) - VSHUF(BCAST4,BCAST4) VSHUF(BCAST5,BCAST5) - VSHUF(BCAST6,BCAST6) VSHUF(BCAST7,BCAST7) - VSHUF(BCAST8,BCAST8) VSHUF(BCAST9,BCAST9) - VSHUF(BCAST10,BCAST10) VSHUF(BCAST11,BCAST11) - VMADDSUBRDUP(0,%r8,BCAST0,Chi_00) VMADDSUBRDUP(0,%r8,BCAST1,Chi_01) - VMADDSUBRDUP(0,%r8,BCAST2,Chi_02) VMADDSUBRDUP(0,%r8,BCAST3,Chi_10) - VMADDSUBRDUP(0,%r8,BCAST4,Chi_11) VMADDSUBRDUP(0,%r8,BCAST5,Chi_12) - VMADDSUBRDUP(0,%r9,BCAST6,Chi_20) VMADDSUBRDUP(0,%r9,BCAST7,Chi_21) - VMADDSUBRDUP(0,%r9,BCAST8,Chi_22) VMADDSUBRDUP(0,%r9,BCAST9,Chi_30) - VMADDSUBRDUP(0,%r9,BCAST10,Chi_31) VMADDSUBRDUP(0,%r9,BCAST11,Chi_32) ); + VLOAD(0,%r8,Mp)// i r + VLOAD(0,%r9,Mm) + VSHUF(Mp,Mps) // r i + VSHUF(Mm,Mms) + VPREFETCH1(12,%r10) VPREFETCH1(13,%r10) + VPREFETCH1(14,%r10) VPREFETCH1(15,%r10) + VMULIDUP(0*N,%r10,Mps,Chi_00) + VMULIDUP(1*N,%r10,Mps,Chi_01) + VMULIDUP(2*N,%r10,Mps,Chi_02) + VMULIDUP(3*N,%r10,Mps,Chi_10) + VMULIDUP(4*N,%r10,Mps,Chi_11) + VMULIDUP(5*N,%r10,Mps,Chi_12) + + VMULIDUP(6*N ,%r10,Mms,Chi_20) + VMULIDUP(7*N ,%r10,Mms,Chi_21) + VMULIDUP(8*N ,%r10,Mms,Chi_22) + VMULIDUP(9*N ,%r10,Mms,Chi_30) + VMULIDUP(10*N,%r10,Mms,Chi_31) + VMULIDUP(11*N,%r10,Mms,Chi_32) + + VMADDSUBRDUP(0*N,%r10,Mp,Chi_00) + VMADDSUBRDUP(1*N,%r10,Mp,Chi_01) + VMADDSUBRDUP(2*N,%r10,Mp,Chi_02) + VMADDSUBRDUP(3*N,%r10,Mp,Chi_10) + VMADDSUBRDUP(4*N,%r10,Mp,Chi_11) + VMADDSUBRDUP(5*N,%r10,Mp,Chi_12) + + VMADDSUBRDUP(6*N ,%r10,Mm,Chi_20) + VMADDSUBRDUP(7*N ,%r10,Mm,Chi_21) + VMADDSUBRDUP(8*N ,%r10,Mm,Chi_22) + VMADDSUBRDUP(9*N ,%r10,Mm,Chi_30) + VMADDSUBRDUP(10*N,%r10,Mm,Chi_31) + VMADDSUBRDUP(11*N,%r10,Mm,Chi_32) + ); } else { LOAD64(%r8,a0); LOAD64(%r9,a1); LOAD64(%r10,a2); asm ( - VPREFETCH1(0,%r10) VPREFETCH1(0,%r9) - VPREFETCH1(12,%r10) VPREFETCH1(13,%r10) - VPREFETCH1(14,%r10) VPREFETCH1(15,%r10) - VBCASTCDUP(0,%r10,BCAST0) VBCASTCDUP(1,%r10,BCAST1) - VBCASTCDUP(2,%r10,BCAST2) VBCASTCDUP(3,%r10,BCAST3) - VBCASTCDUP(4,%r10,BCAST4) VBCASTCDUP(5,%r10,BCAST5) - VBCASTCDUP(6,%r10,BCAST6) VBCASTCDUP(7,%r10,BCAST7) - VBCASTCDUP(8,%r10,BCAST8) VBCASTCDUP(9,%r10,BCAST9) - VBCASTCDUP(10,%r10,BCAST10) VBCASTCDUP(11,%r10,BCAST11) - VMADDSUBIDUP (0,%r8,BCAST0,Chi_00) VMADDSUBIDUP(0,%r8,BCAST1,Chi_01) // II RI from Mat / Psi - VMADDSUBIDUP (0,%r8,BCAST2,Chi_02) VMADDSUBIDUP(0,%r8,BCAST3,Chi_10) - VMADDSUBIDUP (0,%r8,BCAST4,Chi_11) VMADDSUBIDUP(0,%r8,BCAST5,Chi_12) - VMADDSUBIDUP (0,%r9,BCAST6,Chi_20) VMADDSUBIDUP(0,%r9,BCAST7,Chi_21) - VMADDSUBIDUP (0,%r9,BCAST8,Chi_22) VMADDSUBIDUP(0,%r9,BCAST9,Chi_30) - VMADDSUBIDUP (0,%r9,BCAST10,Chi_31) VMADDSUBIDUP(0,%r9,BCAST11,Chi_32) - VSHUF(BCAST0,BCAST0) VSHUF(BCAST1,BCAST1) - VSHUF(BCAST2,BCAST2) VSHUF(BCAST3,BCAST3) - VSHUF(BCAST4,BCAST4) VSHUF(BCAST5,BCAST5) - VSHUF(BCAST6,BCAST6) VSHUF(BCAST7,BCAST7) - VSHUF(BCAST8,BCAST8) VSHUF(BCAST9,BCAST9) - VSHUF(BCAST10,BCAST10) VSHUF(BCAST11,BCAST11) - VMADDSUBRDUP(0,%r8,BCAST0,Chi_00) VMADDSUBRDUP(0,%r8,BCAST1,Chi_01) - VMADDSUBRDUP(0,%r8,BCAST2,Chi_02) VMADDSUBRDUP(0,%r8,BCAST3,Chi_10) - VMADDSUBRDUP(0,%r8,BCAST4,Chi_11) VMADDSUBRDUP(0,%r8,BCAST5,Chi_12) - VMADDSUBRDUP(0,%r9,BCAST6,Chi_20) VMADDSUBRDUP(0,%r9,BCAST7,Chi_21) - VMADDSUBRDUP(0,%r9,BCAST8,Chi_22) VMADDSUBRDUP(0,%r9,BCAST9,Chi_30) - VMADDSUBRDUP(0,%r9,BCAST10,Chi_31) VMADDSUBRDUP(0,%r9,BCAST11,Chi_32) - ); + VLOAD(0,%r8,Mp) + VSHUF(Mp,Mps) + + VLOAD(0,%r9,Mm) + VSHUF(Mm,Mms) + + VMADDSUBIDUP(0*N,%r10,Mps,Chi_00) // Mri * Pii +- Cir + VMADDSUBIDUP(1*N,%r10,Mps,Chi_01) + VMADDSUBIDUP(2*N,%r10,Mps,Chi_02) + VMADDSUBIDUP(3*N,%r10,Mps,Chi_10) + VMADDSUBIDUP(4*N,%r10,Mps,Chi_11) + VMADDSUBIDUP(5*N,%r10,Mps,Chi_12) + + VMADDSUBIDUP(6 *N,%r10,Mms,Chi_20) + VMADDSUBIDUP(7 *N,%r10,Mms,Chi_21) + VMADDSUBIDUP(8 *N,%r10,Mms,Chi_22) + VMADDSUBIDUP(9 *N,%r10,Mms,Chi_30) + VMADDSUBIDUP(10*N,%r10,Mms,Chi_31) + VMADDSUBIDUP(11*N,%r10,Mms,Chi_32) + + VMADDSUBRDUP(0*N,%r10,Mp,Chi_00) // Cir = Mir * Prr +- ( Mri * Pii +- Cir) + VMADDSUBRDUP(1*N,%r10,Mp,Chi_01) // Ci = MiPr + Ci + MrPi ; Cr = MrPr - ( MiPi - Cr) + VMADDSUBRDUP(2*N,%r10,Mp,Chi_02) + VMADDSUBRDUP(3*N,%r10,Mp,Chi_10) + VMADDSUBRDUP(4*N,%r10,Mp,Chi_11) + VMADDSUBRDUP(5*N,%r10,Mp,Chi_12) + + VMADDSUBRDUP(6 *N,%r10,Mm,Chi_20) + VMADDSUBRDUP(7 *N,%r10,Mm,Chi_21) + VMADDSUBRDUP(8 *N,%r10,Mm,Chi_22) + VMADDSUBRDUP(9 *N,%r10,Mm,Chi_30) + VMADDSUBRDUP(10*N,%r10,Mm,Chi_31) + VMADDSUBRDUP(11*N,%r10,Mm,Chi_32) + ); } a0 = a0+incr; a1 = a1+incr; @@ -672,13 +704,26 @@ void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionFi }} { int lexa = s1+LLs*site; + /* + SiteSpinor tmp; asm ( - VSTORE(0,%0,Chi_00) VSTORE(1 ,%0,Chi_01) VSTORE(2 ,%0,Chi_02) - VSTORE(3,%0,Chi_10) VSTORE(4 ,%0,Chi_11) VSTORE(5 ,%0,Chi_12) - VSTORE(6,%0,Chi_20) VSTORE(7 ,%0,Chi_21) VSTORE(8 ,%0,Chi_22) - VSTORE(9,%0,Chi_30) VSTORE(10,%0,Chi_31) VSTORE(11,%0,Chi_32) + VSTORE(0,%0,pChi_00) VSTORE(1 ,%0,pChi_01) VSTORE(2 ,%0,pChi_02) + VSTORE(3,%0,pChi_10) VSTORE(4 ,%0,pChi_11) VSTORE(5 ,%0,pChi_12) + VSTORE(6,%0,pChi_20) VSTORE(7 ,%0,pChi_21) VSTORE(8 ,%0,pChi_22) + VSTORE(9,%0,pChi_30) VSTORE(10,%0,pChi_31) VSTORE(11,%0,pChi_32) + : : "r" ((uint64_t)&tmp) : "memory" ); + */ + + asm ( + VSTORE(0,%0,pChi_00) VSTORE(1 ,%0,pChi_01) VSTORE(2 ,%0,pChi_02) + VSTORE(3,%0,pChi_10) VSTORE(4 ,%0,pChi_11) VSTORE(5 ,%0,pChi_12) + VSTORE(6,%0,pChi_20) VSTORE(7 ,%0,pChi_21) VSTORE(8 ,%0,pChi_22) + VSTORE(9,%0,pChi_30) VSTORE(10,%0,pChi_31) VSTORE(11,%0,pChi_32) : : "r" ((uint64_t)&chi[lexa]) : "memory" ); + // if ( 1 || (site==0) ) { + // std::cout< Date: Sun, 18 Dec 2016 01:27:34 +0000 Subject: [PATCH 179/807] Bad commit fixed --- lib/simd/Grid_avx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/simd/Grid_avx.h b/lib/simd/Grid_avx.h index e2729187..724f52bb 100644 --- a/lib/simd/Grid_avx.h +++ b/lib/simd/Grid_avx.h @@ -228,7 +228,7 @@ namespace Optimization { struct MaddRealPart{ inline __m256 operator()(__m256 a, __m256 b, __m256 c){ __m256 ymm0 = _mm256_moveldup_ps(a); // ymm0 <- ar ar, - _mm256_add_ps(_mm256_mul_ps( ymm0, b),c); + return _mm256_add_ps(_mm256_mul_ps( ymm0, b),c); } inline __m256d operator()(__m256d a, __m256d b, __m256d c){ __m256d ymm0 = _mm256_shuffle_pd( a, a, 0x0 ); From 87be03006abe7d6da0ca966bed84e63bbba95a41 Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 18 Dec 2016 01:45:09 +0000 Subject: [PATCH 180/807] AVX 512 code broke other compiles; fixing --- lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index 38bceafe..f8c64b91 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -332,9 +332,11 @@ PARALLEL_FOR_LOOP } +#ifdef AVX512 #include #include #include +#endif template void CayleyFermion5D::MooeeInternalAsm(const FermionField &psi, FermionField &chi, @@ -515,7 +517,6 @@ void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionFi int LLs, int site, Vector > &Matp, Vector > &Matm) { #ifndef AVX512 - //#if 0 { SiteHalfSpinor BcastP; SiteHalfSpinor BcastM; From 3e6945cd656e3703eb5042564aec71d8bb9f1b78 Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 18 Dec 2016 02:05:11 +0000 Subject: [PATCH 181/807] Fixing AVX Z-mobius --- lib/qcd/action/fermion/CayleyFermion5D.h | 26 ++++++++-- lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 52 ++++++++++---------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/lib/qcd/action/fermion/CayleyFermion5D.h b/lib/qcd/action/fermion/CayleyFermion5D.h index 2392fcf0..86255be6 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.h +++ b/lib/qcd/action/fermion/CayleyFermion5D.h @@ -33,9 +33,29 @@ namespace Grid { namespace QCD { - template struct switcheroo { static int iscomplex() { return 0; } }; - template<> struct switcheroo { static int iscomplex() { return 1; } }; - template<> struct switcheroo { static int iscomplex() { return 1; } }; + template struct switcheroo { + static inline int iscomplex() { return 0; } + + template + static inline vec mult(vec a, vec b) { + return real_mult(a,b); + } + }; + template<> struct switcheroo { + static inline int iscomplex() { return 1; } + + template + static inline vec mult(vec a, vec b) { + return a*b; + } + }; + template<> struct switcheroo { + static inline int iscomplex() { return 1; } + template + static inline vec mult(vec a, vec b) { + return a*b; + } + }; template diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index f8c64b91..ed742ea3 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -161,18 +161,18 @@ PARALLEL_FOR_LOOP } // Can force these to real arithmetic and save 2x. - Simd p_00 = real_mult(d[v]()()(), phi[ss+v]()(0)(0)) + real_mult(l[v]()()(),hm_00); - Simd p_01 = real_mult(d[v]()()(), phi[ss+v]()(0)(1)) + real_mult(l[v]()()(),hm_01); - Simd p_02 = real_mult(d[v]()()(), phi[ss+v]()(0)(2)) + real_mult(l[v]()()(),hm_02); - Simd p_10 = real_mult(d[v]()()(), phi[ss+v]()(1)(0)) + real_mult(l[v]()()(),hm_10); - Simd p_11 = real_mult(d[v]()()(), phi[ss+v]()(1)(1)) + real_mult(l[v]()()(),hm_11); - Simd p_12 = real_mult(d[v]()()(), phi[ss+v]()(1)(2)) + real_mult(l[v]()()(),hm_12); - Simd p_20 = real_mult(d[v]()()(), phi[ss+v]()(2)(0)) + real_mult(u[v]()()(),hp_00); - Simd p_21 = real_mult(d[v]()()(), phi[ss+v]()(2)(1)) + real_mult(u[v]()()(),hp_01); - Simd p_22 = real_mult(d[v]()()(), phi[ss+v]()(2)(2)) + real_mult(u[v]()()(),hp_02); - Simd p_30 = real_mult(d[v]()()(), phi[ss+v]()(3)(0)) + real_mult(u[v]()()(),hp_10); - Simd p_31 = real_mult(d[v]()()(), phi[ss+v]()(3)(1)) + real_mult(u[v]()()(),hp_11); - Simd p_32 = real_mult(d[v]()()(), phi[ss+v]()(3)(2)) + real_mult(u[v]()()(),hp_12); + Simd p_00 = switcheroo::mult(d[v]()()(), phi[ss+v]()(0)(0)) + switcheroo::mult(l[v]()()(),hm_00); + Simd p_01 = switcheroo::mult(d[v]()()(), phi[ss+v]()(0)(1)) + switcheroo::mult(l[v]()()(),hm_01); + Simd p_02 = switcheroo::mult(d[v]()()(), phi[ss+v]()(0)(2)) + switcheroo::mult(l[v]()()(),hm_02); + Simd p_10 = switcheroo::mult(d[v]()()(), phi[ss+v]()(1)(0)) + switcheroo::mult(l[v]()()(),hm_10); + Simd p_11 = switcheroo::mult(d[v]()()(), phi[ss+v]()(1)(1)) + switcheroo::mult(l[v]()()(),hm_11); + Simd p_12 = switcheroo::mult(d[v]()()(), phi[ss+v]()(1)(2)) + switcheroo::mult(l[v]()()(),hm_12); + Simd p_20 = switcheroo::mult(d[v]()()(), phi[ss+v]()(2)(0)) + switcheroo::mult(u[v]()()(),hp_00); + Simd p_21 = switcheroo::mult(d[v]()()(), phi[ss+v]()(2)(1)) + switcheroo::mult(u[v]()()(),hp_01); + Simd p_22 = switcheroo::mult(d[v]()()(), phi[ss+v]()(2)(2)) + switcheroo::mult(u[v]()()(),hp_02); + Simd p_30 = switcheroo::mult(d[v]()()(), phi[ss+v]()(3)(0)) + switcheroo::mult(u[v]()()(),hp_10); + Simd p_31 = switcheroo::mult(d[v]()()(), phi[ss+v]()(3)(1)) + switcheroo::mult(u[v]()()(),hp_11); + Simd p_32 = switcheroo::mult(d[v]()()(), phi[ss+v]()(3)(2)) + switcheroo::mult(u[v]()()(),hp_12); vstream(chi[ss+v]()(0)(0),p_00); vstream(chi[ss+v]()(0)(1),p_01); @@ -299,19 +299,19 @@ PARALLEL_FOR_LOOP hm_12.v = Optimization::Rotate::tRotate<2*Simd::Nsimd()-2>(hm_12.v); } - Simd p_00 = real_mult(d[v]()()(), phi[ss+v]()(0)(0)) + real_mult(u[v]()()(),hp_00); - Simd p_01 = real_mult(d[v]()()(), phi[ss+v]()(0)(1)) + real_mult(u[v]()()(),hp_01); - Simd p_02 = real_mult(d[v]()()(), phi[ss+v]()(0)(2)) + real_mult(u[v]()()(),hp_02); - Simd p_10 = real_mult(d[v]()()(), phi[ss+v]()(1)(0)) + real_mult(u[v]()()(),hp_10); - Simd p_11 = real_mult(d[v]()()(), phi[ss+v]()(1)(1)) + real_mult(u[v]()()(),hp_11); - Simd p_12 = real_mult(d[v]()()(), phi[ss+v]()(1)(2)) + real_mult(u[v]()()(),hp_12); + Simd p_00 = switcheroo::mult(d[v]()()(), phi[ss+v]()(0)(0)) + switcheroo::mult(u[v]()()(),hp_00); + Simd p_01 = switcheroo::mult(d[v]()()(), phi[ss+v]()(0)(1)) + switcheroo::mult(u[v]()()(),hp_01); + Simd p_02 = switcheroo::mult(d[v]()()(), phi[ss+v]()(0)(2)) + switcheroo::mult(u[v]()()(),hp_02); + Simd p_10 = switcheroo::mult(d[v]()()(), phi[ss+v]()(1)(0)) + switcheroo::mult(u[v]()()(),hp_10); + Simd p_11 = switcheroo::mult(d[v]()()(), phi[ss+v]()(1)(1)) + switcheroo::mult(u[v]()()(),hp_11); + Simd p_12 = switcheroo::mult(d[v]()()(), phi[ss+v]()(1)(2)) + switcheroo::mult(u[v]()()(),hp_12); - Simd p_20 = real_mult(d[v]()()(), phi[ss+v]()(2)(0)) + real_mult(l[v]()()(),hm_00); - Simd p_21 = real_mult(d[v]()()(), phi[ss+v]()(2)(1)) + real_mult(l[v]()()(),hm_01); - Simd p_22 = real_mult(d[v]()()(), phi[ss+v]()(2)(2)) + real_mult(l[v]()()(),hm_02); - Simd p_30 = real_mult(d[v]()()(), phi[ss+v]()(3)(0)) + real_mult(l[v]()()(),hm_10); - Simd p_31 = real_mult(d[v]()()(), phi[ss+v]()(3)(1)) + real_mult(l[v]()()(),hm_11); - Simd p_32 = real_mult(d[v]()()(), phi[ss+v]()(3)(2)) + real_mult(l[v]()()(),hm_12); + Simd p_20 = switcheroo::mult(d[v]()()(), phi[ss+v]()(2)(0)) + switcheroo::mult(l[v]()()(),hm_00); + Simd p_21 = switcheroo::mult(d[v]()()(), phi[ss+v]()(2)(1)) + switcheroo::mult(l[v]()()(),hm_01); + Simd p_22 = switcheroo::mult(d[v]()()(), phi[ss+v]()(2)(2)) + switcheroo::mult(l[v]()()(),hm_02); + Simd p_30 = switcheroo::mult(d[v]()()(), phi[ss+v]()(3)(0)) + switcheroo::mult(l[v]()()(),hm_10); + Simd p_31 = switcheroo::mult(d[v]()()(), phi[ss+v]()(3)(1)) + switcheroo::mult(l[v]()()(),hm_11); + Simd p_32 = switcheroo::mult(d[v]()()(), phi[ss+v]()(3)(2)) + switcheroo::mult(l[v]()()(),hm_12); vstream(chi[ss+v]()(0)(0),p_00); vstream(chi[ss+v]()(0)(1),p_01); @@ -544,13 +544,13 @@ void CayleyFermion5D::MooeeInternalZAsm(const FermionField &psi, FermionFi for(int co=0;co Date: Sun, 18 Dec 2016 02:07:45 +0000 Subject: [PATCH 182/807] Precision error --- lib/simd/Grid_sse4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/simd/Grid_sse4.h b/lib/simd/Grid_sse4.h index abd688ab..398a8691 100644 --- a/lib/simd/Grid_sse4.h +++ b/lib/simd/Grid_sse4.h @@ -194,7 +194,7 @@ namespace Optimization { __m128 ymm0 = _mm_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(2,2,0,0)); // ymm0 <- ar ar, _mm_add_ps(_mm_mul_ps( ymm0, b),c); } - inline __m128d operator()(__m128d a, __m128d b, __m128 c){ + inline __m128d operator()(__m128d a, __m128d b, __m128d c){ __m128d ymm0 = _mm_shuffle_pd( a, a, 0x0 ); return _mm_add_pd(_mm_mul_pd( ymm0, b),c); } From 629f43e36c14fe60eba53a651cafac7d3862a7fc Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 18 Dec 2016 02:09:37 +0000 Subject: [PATCH 183/807] Return statement needed --- lib/simd/Grid_sse4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/simd/Grid_sse4.h b/lib/simd/Grid_sse4.h index 398a8691..090f0cc9 100644 --- a/lib/simd/Grid_sse4.h +++ b/lib/simd/Grid_sse4.h @@ -192,7 +192,7 @@ namespace Optimization { struct MaddRealPart{ inline __m128 operator()(__m128 a, __m128 b, __m128 c){ __m128 ymm0 = _mm_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(2,2,0,0)); // ymm0 <- ar ar, - _mm_add_ps(_mm_mul_ps( ymm0, b),c); + return _mm_add_ps(_mm_mul_ps( ymm0, b),c); } inline __m128d operator()(__m128d a, __m128d b, __m128d c){ __m128d ymm0 = _mm_shuffle_pd( a, a, 0x0 ); From 4b220972ac1d7551c27f0ca8c1d535487530400f Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 18 Dec 2016 02:14:17 +0000 Subject: [PATCH 184/807] Warning fix --- lib/simd/Grid_sse4.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/simd/Grid_sse4.h b/lib/simd/Grid_sse4.h index 090f0cc9..943756b2 100644 --- a/lib/simd/Grid_sse4.h +++ b/lib/simd/Grid_sse4.h @@ -348,9 +348,11 @@ namespace Optimization { } } +#ifndef _mm_alignr_epi64 #define _mm_alignr_epi32(a,b,n) _mm_alignr_epi8(a,b,(n*4)%16) #define _mm_alignr_epi64(a,b,n) _mm_alignr_epi8(a,b,(n*8)%16) - +#endif + template static inline __m128 tRotate(__m128 in){ return (__m128)_mm_alignr_epi32((__m128i)in,(__m128i)in,n); }; template static inline __m128d tRotate(__m128d in){ return (__m128d)_mm_alignr_epi64((__m128i)in,(__m128i)in,n); }; From a59f5374d724b40cc08908577acffc3ea6d50a44 Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 18 Dec 2016 02:23:55 +0000 Subject: [PATCH 185/807] Evade warning --- lib/PerfCount.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/PerfCount.h b/lib/PerfCount.h index 5ab07c02..749441c5 100644 --- a/lib/PerfCount.h +++ b/lib/PerfCount.h @@ -205,12 +205,13 @@ public: void Stop(void) { count=0; cycles=0; + size_t ign; #ifdef __linux__ if ( fd!= -1) { ::ioctl(fd, PERF_EVENT_IOC_DISABLE, 0); ::ioctl(cyclefd, PERF_EVENT_IOC_DISABLE, 0); - ::read(fd, &count, sizeof(long long)); - ::read(cyclefd, &cycles, sizeof(long long)); + ign=::read(fd, &count, sizeof(long long)); + ign=::read(cyclefd, &cycles, sizeof(long long)); } elapsed = cyclecount() - begin; #else From 8a337f307074a81e429c24ce00403bbe434d302e Mon Sep 17 00:00:00 2001 From: paboyle Date: Sun, 18 Dec 2016 02:35:31 +0000 Subject: [PATCH 186/807] Move cayley into mainstream tests --- tests/{debug => }/Test_cayley_even_odd_vec.cc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{debug => }/Test_cayley_even_odd_vec.cc (100%) diff --git a/tests/debug/Test_cayley_even_odd_vec.cc b/tests/Test_cayley_even_odd_vec.cc similarity index 100% rename from tests/debug/Test_cayley_even_odd_vec.cc rename to tests/Test_cayley_even_odd_vec.cc From 3f2d53a9948edd558edb5bf49883d1fd91b13fba Mon Sep 17 00:00:00 2001 From: paboyle Date: Tue, 20 Dec 2016 10:21:26 +0000 Subject: [PATCH 187/807] BGQ assembler beginning --- lib/simd/BGQQPX.h | 796 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 796 insertions(+) create mode 100644 lib/simd/BGQQPX.h diff --git a/lib/simd/BGQQPX.h b/lib/simd/BGQQPX.h new file mode 100644 index 00000000..34888ab7 --- /dev/null +++ b/lib/simd/BGQQPX.h @@ -0,0 +1,796 @@ + /************************************************************************************* + + Grid physics library, www.github.com/paboyle/Grid + + Source file: ./lib/simd/BGQQPX.h + + Copyright (C) 2015 + +Author: paboyle + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + See the full license in the file "LICENSE" in the top level distribution directory + *************************************************************************************/ + /* END LEGAL */ +#ifndef GRID_ASM_BGQ_QPX_H +#define GRID_ASM_BGQ_QPX_H + +#include + +/********************************************************* + * Architectural macros + *********************************************************/ +#define VLOADf(OFF,PTR,DEST) "qvlfsux " #DEST "," #OFF "," #PTR ") ;\n" +#define VLOADd(OFF,PTR,DEST) "qvlfdux " #DEST "," #OFF "," #PTR ") ;\n" +#define VSTOREf(OFF,PTR,SRC) "qvstfsux " #SRC "," #OFF "," #PTR ") ;\n" +#define VSTOREd(OFF,PTR,SRC) "qvstfdux " #SRC "," #OFF "," #PTR ") ;\n" +#define VSPLATf(A,B,DEST) "qvlfcdxa " #A "," #B "," #DEST ";\n" +#define VSPLATd(A,B,DEST) "qvlfcsxa " #A "," #B "," #DEST ";\n" + +#define LOAD64(A,ptr) +#define VZERO(DEST) "qvfclr " #DEST "; \n" +#define VONE (DEST) "qvfset " #DEST "; \n" +#define VNEG (SRC,DEST) "qvfneg " #DEST "," #SRC "; \n" +#define VMOV(A,DEST) "qvfmr " #DEST, "," #A ";\n" + +#define VADD(A,B,DEST) "qvfadd " #DEST "," #A "," #B ";\n" +#define VSUB(A,B,DEST) "qvfsub " #DEST "," #A "," #B ";\n" +#define VMUL(A,B,DEST) "qvfmul " #DEST "," #A "," #B ";\n" +#define VMUL_RR_RI(A,B,DEST) "qvfxmul " #DEST "," #A "," #B ";\n" +#define VMADD(A,B,C,DEST) "qvfmadd " #DEST "," #A "," #B ","#C ";\n" +#define VMADD_RR_RI(A,B,C,DEST) "qvfxmadd " #DEST "," #A "," #B ","#C ";\n" +#define VMADD_MII_IR(A,B,C,DEST) "qvfxxnpmadd " #DEST "," #A "," #B ","#C ";\n" +#define VMADD_II_MIR(A,B,C,DEST) "qvfmadd " #DEST "," #A "," #B ","#C ";\n" + +#define CACHE_LOCK (PTR) asm (" dcbtls %%r0, %0 \n" : : "r" (PTR) ); +#define CACHE_UNLOCK(PTR) asm (" dcblc %%r0, %0 \n" : : "r" (PTR) ); +#define CACHE_FLUSH (PTR) asm (" dcbf %%r0, %0 \n" : : "r" (PTR) ); +#define CACHE_TOUCH (PTR) asm (" dcbt %%r0, %0 \n" : : "r" (PTR) ); + +// Gauge field locking 2 x 9 complex == 18*8 / 16 bytes per link +// This is 144/288 bytes == 4.5; 9 lines +#define MASK_REGS /*NOOP ON BGQ*/ +#define PF_GAUGE(A) /*NOOP ON BGQ*/ +#define PREFETCH1_CHIMU(base) /*NOOP ON BGQ*/ +#define PREFETCH_CHIMU(base) /*NOOP ON BGQ*/ + +/********************************************************* + * Register definitions + *********************************************************/ +#define psi_00 0 +#define psi_01 1 +#define psi_02 2 + +#define psi_10 3 +#define psi_11 4 +#define psi_12 5 + +#define psi_20 6 +#define psi_21 7 +#define psi_22 8 + +#define psi_30 9 +#define psi_31 10 +#define psi_32 11 + +#define Chi_00 12 +#define Chi_01 13 +#define Chi_02 14 + +#define Chi_10 15 +#define Chi_11 16 +#define Chi_12 17 + +#define UChi_00 18 +#define UChi_01 19 +#define UChi_02 20 + +#define UChi_10 21 +#define UChi_11 22 +#define UChi_12 23 + +#define U0 24 +#define U1 25 +#define U2 26 +#define one 27 + +#define REP %%r16 +#define IMM %%r17 + +/*Alias regs*/ +#define Chimu_00 Chi_00 +#define Chimu_01 Chi_01 +#define Chimu_02 Chi_02 +#define Chimu_10 Chi_10 +#define Chimu_11 Chi_11 +#define Chimu_12 Chi_02 +#define Chimu_20 UChi_00 +#define Chimu_21 UChi_01 +#define Chimu_22 UChi_02 +#define Chimu_30 UChi_10 +#define Chimu_31 UChi_11 +#define Chimu_32 UChi_02 + +/********************************************************* + * Macro sequences encoding QCD + *********************************************************/ +#define LOCK_GAUGE(dir) \ + { \ + uint8_t *byte_addr = (uint8_t *)&U._odata[sU](dir); \ + for(int i=0;i< 18*2*BYTES_PER_WORD*8;i+=32){ \ + CACHE_LOCK(&byte_addr[i]); \ + } \ + } + +#define UNLOCK_GAUGE(dir) \ + { \ + uint8_t *byte_addr = (uint8_t *)&U._odata[sU](dir); \ + for(int i=0;i< 18*2*BYTES_PER_WORD*8;i+=32){ \ + CACHE_UNLOCK(&byte_addr[i]); \ + } \ + } + +#define MAYBEPERM(A,B) + +#define PERMUTE_DIR3 +#define PERMUTE_DIR2 +#define PERMUTE_DIR1 +#define PERMUTE_DIR0 + +#define MULT_2SPIN_DIR_PFXP(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFYP(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFZP(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFTP(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFXM(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFYM(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFZM(A,p) MULT_2SPIN(&U._odata[sU](A),p) +#define MULT_2SPIN_DIR_PFTM(A,p) MULT_2SPIN(&U._odata[sU](A),p) + +#define MULT_SPIN(ptr,p) { \ + uint64_t ub = ((uint64_t)base); \ + asm ( \ + VLOAD(%0,%3,U0) \ + VLOAD(%1,%3,U1) \ + VLOAD(%2,%3,U2) \ + VMUL_RR_RI(U0,Chi_00,UChi_00) \ + VMUL_RR_RI(U1,Chi_00,UChi_01) \ + VMUL_RR_RI(U2,Chi_00,UChi_02) \ + VMUL_RR_RI(U0,Chi_10,UChi_10) \ + VMUL_RR_RI(U1,Chi_10,UChi_11) \ + VMUL_RR_RI(U2,Chi_10,UChi_12) \ + VMADD_MII_IR(U0,Chi_00,UChi_00,UChi_00) \ + VMADD_MII_IR(U1,Chi_00,UChi_01,UChi_01) \ + VMADD_MII_IR(U2,Chi_00,UChi_02,UChi_02) \ + VMADD_MII_IR(U0,Chi_10,UChi_10,UChi_10) \ + VMADD_MII_IR(U1,Chi_10,UChi_11,UChi_11) \ + VMADD_MII_IR(U2,Chi_10,UChi_12,UChi_12) \ + : : "r" (0), "r" (32*3), "r" (32*6), "r" (ub )); \ + asm ( \ + VLOAD(%0,%3,U0) \ + VLOAD(%1,%3,U1) \ + VLOAD(%2,%3,U2) \ + VMADD_RR_RI(U0,Chi_01,UChi_00,UChi_00) \ + VMADD_RR_RI(U1,Chi_01,UChi_01,UChi_01) \ + VMADD_RR_RI(U2,Chi_01,UChi_02,UChi_02) \ + VMADD_RR_RI(U0,Chi_11,UChi_10,UChi_10) \ + VMADD_RR_RI(U1,Chi_11,UChi_11,UChi_11) \ + VMADD_RR_RI(U2,Chi_11,UChi_12,UChi_12) \ + VMADD_MII_IR(U0,Chi_01,UChi_00,UChi_00) \ + VMADD_MII_IR(U1,Chi_01,UChi_01,UChi_01) \ + VMADD_MII_IR(U2,Chi_01,UChi_02,UChi_02) \ + VMADD_MII_IR(U0,Chi_11,UChi_10,UChi_10) \ + VMADD_MII_IR(U1,Chi_11,UChi_11,UChi_11) \ + VMADD_MII_IR(U2,Chi_11,UChi_12,UChi_12) \ + : : "r" (32), "r" (32*4), "r" (32*7), "r" (ub )); \ + asm ( \ + VLOAD(%0,%3,U0) \ + VLOAD(%1,%3,U1) \ + VLOAD(%2,%3,U2) \ + VMADD_RR_RI(U0,Chi_02,UChi_00,UChi_00) \ + VMADD_RR_RI(U1,Chi_02,UChi_01,UChi_01) \ + VMADD_RR_RI(U2,Chi_02,UChi_02,UChi_02) \ + VMADD_RR_RI(U0,Chi_12,UChi_10,UChi_10) \ + VMADD_RR_RI(U1,Chi_12,UChi_11,UChi_11) \ + VMADD_RR_RI(U2,Chi_12,UChi_12,UChi_12) \ + VMADD_MII_IR(U0,Chi_02,UChi_00,UChi_00) \ + VMADD_MII_IR(U1,Chi_02,UChi_01,UChi_01) \ + VMADD_MII_IR(U2,Chi_02,UChi_02,UChi_02) \ + VMADD_MII_IR(U0,Chi_12,UChi_10,UChi_10) \ + VMADD_MII_IR(U1,Chi_12,UChi_11,UChi_11) \ + VMADD_MII_IR(U2,Chi_12,UChi_12,UChi_12) \ + : : "r" (32*2), "r" (32*5), "r" (32*8), "r" (ub )); \ + } + +#define SAVE_RESULT(base,basep) {\ + uint64_t ub = ((uint64_t)base) - 32; \ + asm("mr %0,"REP";\n\t" \ + "li " IMM ",32;\n\t" \ + VSTORE(IMM,REP,psi_00) \ + VSTORE(IMM,REP,psi_01) \ + VSTORE(IMM,REP,psi_02) \ + VSTORE(IMM,REP,psi_10) \ + VSTORE(IMM,REP,psi_11) \ + VSTORE(IMM,REP,psi_12) \ + VSTORE(IMM,REP,psi_20) \ + VSTORE(IMM,REP,psi_21) \ + VSTORE(IMM,REP,psi_22) \ + VSTORE(IMM,REP,psi_30) \ + VSTORE(IMM,REP,psi_31) \ + VSTORE(IMM,REP,psi_32) \ + ); \ +} + +/* + *Annoying BG/Q loads with no immediat indexing and big performance hit + *when second miss to a L1 line occurs + */ +#define LOAD_CHI(base) { \ + uint64_t ub = ((uint64_t)base) - 64; \ + asm("mr %0,"REP";\n\t" \ + "li " IMM ",64;\n\t" \ + VLOAD(IMM,REP,Chi_00) \ + VLOAD(IMM,REP,Chi_02) \ + VLOAD(IMM,REP,Chi_11) : : "r" (ub) ); \ + ub = ((uint64_t)base) - 32; \ + asm("mr %0,"REP";\n\t" \ + "li IMM,64;\n\t" \ + VLOAD(IMM,REP,Chimu_01) \ + VLOAD(IMM,REP,Chimu_10) \ + VLOAD(IMM,REP,Chimu_12) : : "r" (ub) ); \ + } + +#define LOAD_CHIMU(base) { \ + uint64_t ub = ((uint64_t)base) - 64; \ + asm("mr %0,"REP";\n\t" \ + "li IMM,64;\n\t" \ + VLOAD(IMM,REP,Chimu_00) \ + VLOAD(IMM,REP,Chimu_02) \ + VLOAD(IMM,REP,Chimu_11) \ + VLOAD(IMM,REP,Chimu_20) \ + VLOAD(IMM,REP,Chimu_22) \ + VLOAD(IMM,REP,Chimu_31) : : "r" (ub) ); \ + ub = ((uint64_t)base) - 32; \ + asm("mr %0,"REP";\n\t" \ + "li IMM,64;\n\t" \ + VLOAD(IMM,REP,Chimu_01) \ + VLOAD(IMM,REP,Chimu_10) \ + VLOAD(IMM,REP,Chimu_12) \ + VLOAD(IMM,REP,Chimu_21) \ + VLOAD(IMM,REP,Chimu_30) \ + VLOAD(IMM,REP,Chimu_32) : : "r" (ub) ); \ + } + +// hspin(0)=fspin(0)+timesI(fspin(3)); +// hspin(1)=fspin(1)+timesI(fspin(2)); +#define XP_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VONE(one) \ + VMADD_MII_IR(one,Chimu_30,Chimu_00,Chi_00) \ + VMADD_MII_IR(one,Chimu_31,Chimu_01,Chi_01) \ + VMADD_MII_IR(one,Chimu_32,Chimu_02,Chi_02) \ + VMADD_MII_IR(one,Chimu_20,Chimu_10,Chi_10) \ + VMADD_MII_IR(one,Chimu_21,Chimu_11,Chi_11) \ + VMADD_MII_IR(one,Chimu_22,Chimu_12,Chi_12) \ + ); \ + } + +#define XM_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VONE(one) \ + VMADD_II_MIR(one,Chimu_30,Chimu_00,Chi_00) \ + VMADD_II_MIR(one,Chimu_31,Chimu_01,Chi_01) \ + VMADD_II_MIR(one,Chimu_32,Chimu_02,Chi_02) \ + VMADD_II_MIR(one,Chimu_20,Chimu_10,Chi_10) \ + VMADD_II_MIR(one,Chimu_21,Chimu_11,Chi_11) \ + VMADD_II_MIR(one,Chimu_22,Chimu_12,Chi_12) \ + ); \ + } + +// hspin(0)=fspin(0)-fspin(3); +// hspin(1)=fspin(1)+fspin(2); +#define YP_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VSUB(Chimu_00,Chimu_00,Chi_30) \ + VSUB(Chimu_01,Chimu_01,Chi_31) \ + VSUB(Chimu_02,Chimu_02,Chi_32) \ + VADD(Chimu_10,Chimu_10,Chi_20) \ + VADD(Chimu_11,Chimu_11,Chi_21) \ + VADD(Chimu_12,Chimu_12,Chi_22) \ + ); \ + } + +#define YM_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VADD(Chimu_00,Chimu_00,Chi_30) \ + VADD(Chimu_01,Chimu_01,Chi_31) \ + VADD(Chimu_02,Chimu_02,Chi_32) \ + VSUB(Chimu_10,Chimu_10,Chi_20) \ + VSUB(Chimu_11,Chimu_11,Chi_21) \ + VSUB(Chimu_12,Chimu_12,Chi_22) \ + ); \ + } + + /*Gz + * 0 0 i 0 [0]+-i[2] + * 0 0 0 -i [1]-+i[3] + * -i 0 0 0 + * 0 i 0 0 + */ +#define ZP_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VONE(one) \ + VMADD_MII_IR(one,Chimu_20,Chimu_00,Chi_00) \ + VMADD_MII_IR(one,Chimu_21,Chimu_01,Chi_01) \ + VMADD_MII_IR(one,Chimu_22,Chimu_02,Chi_02) \ + VMADD_II_MIR(one,Chimu_30,Chimu_10,Chi_10) \ + VMADD_II_MIR(one,Chimu_31,Chimu_11,Chi_11) \ + VMADD_II_MIR(one,Chimu_32,Chimu_12,Chi_12) \ + ); \ + } + +#define ZM_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VONE(one) \ + VMADD_II_MIR(one,Chimu_20,Chimu_00,Chi_00) \ + VMADD_II_MIR(one,Chimu_21,Chimu_01,Chi_01) \ + VMADD_II_MIR(one,Chimu_22,Chimu_02,Chi_02) \ + VMADD_MII_IR(one,Chimu_30,Chimu_10,Chi_10) \ + VMADD_MII_IR(one,Chimu_31,Chimu_11,Chi_11) \ + VMADD_MII_IR(one,Chimu_32,Chimu_12,Chi_12) \ + ); \ + } + /*Gt + * 0 0 1 0 [0]+-[2] + * 0 0 0 1 [1]+-[3] + * 1 0 0 0 + * 0 1 0 0 + */ +#define TP_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VADD(Chimu_00,Chimu_00,Chi_20) \ + VADD(Chimu_01,Chimu_01,Chi_21) \ + VADD(Chimu_02,Chimu_02,Chi_22) \ + VADD(Chimu_10,Chimu_10,Chi_30) \ + VADD(Chimu_11,Chimu_11,Chi_31) \ + VADD(Chimu_12,Chimu_12,Chi_32) \ + ); \ + } + +#define TM_PROJMEM(base) { \ + LOAD_CHIMU(base); \ + asm ( \ + VSUB(Chimu_00,Chimu_00,Chi_20) \ + VSUB(Chimu_01,Chimu_01,Chi_21) \ + VSUB(Chimu_02,Chimu_02,Chi_22) \ + VSUB(Chimu_10,Chimu_10,Chi_30) \ + VSUB(Chimu_11,Chimu_11,Chi_31) \ + VSUB(Chimu_12,Chimu_12,Chi_32) \ + ); \ + } + +/* + fspin(0)=hspin(0); + fspin(1)=hspin(1); + fspin(2)=timesMinusI(hspin(1)); + fspin(3)=timesMinusI(hspin(0)); + + fspin(0)+=hspin(0); + fspin(1)+=hspin(1); + fspin(2)-=timesI(hspin(1)); + fspin(3)-=timesI(hspin(0)); + */ +#define XP_RECON { \ + asm(\ + VONE(one)\ + VMOV(psi_00,UChi_00) VMOV(psi_01,UChi_01) VMOV(psi_02,UChi_02)\ + VMOV(psi_10,UChi_10) VMOV(psi_11,UChi_11) VMOV(psi_12,UChi_12)\ + VZERO(psi_20) VZERO(psi_21) VZERO(psi_22) \ + VZERO(psi_30) VZERO(psi_31) VZERO(psi_32) \ + VMADD_II_MIR(one,UChi_10,psi_20,psi_20) \ + VMADD_II_MIR(one,UChi_11,psi_21,psi_21) \ + VMADD_II_MIR(one,UChi_12,psi_22,psi_22) \ + VMADD_II_MIR(one,UChi_00,psi_30,psi_30) \ + VMADD_II_MIR(one,UChi_01,psi_31,psi_31) \ + VMADD_II_MIR(one,UChi_02,psi_32,psi_32) \ + ); \ + } + +#define XM_RECON { \ + asm(\ + VONE(one)\ + VMOV(psi_00,UChi_00) VMOV(psi_01,UChi_01) VMOV(psi_02,UChi_02)\ + VMOV(psi_10,UChi_10) VMOV(psi_11,UChi_11) VMOV(psi_12,UChi_12)\ + VZERO(psi_20) VZERO(psi_21) VZERO(psi_22) \ + VZERO(psi_30) VZERO(psi_31) VZERO(psi_32) \ + VMADD_MII_IR(one,UChi_10,psi_20,psi_20) \ + VMADD_MII_IR(one,UChi_11,psi_21,psi_21) \ + VMADD_MII_IR(one,UChi_12,psi_22,psi_22) \ + VMADD_MII_IR(one,UChi_00,psi_30,psi_30) \ + VMADD_MII_IR(one,UChi_01,psi_31,psi_31) \ + VMADD_MII_IR(one,UChi_02,psi_32,psi_32) \ + ); \ + } + +#define XP_RECON_ACCUM { \ + asm(\ + VONE(one)\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VMADD_II_MIR(one,UChi_10,psi_20,psi_20) \ + VMADD_II_MIR(one,UChi_11,psi_21,psi_21) \ + VMADD_II_MIR(one,UChi_12,psi_22,psi_22) \ + VMADD_II_MIR(one,UChi_00,psi_30,psi_30) \ + VMADD_II_MIR(one,UChi_01,psi_31,psi_31) \ + VMADD_II_MIR(one,UChi_02,psi_32,psi_32) \ + ); \ + } + +#define XM_RECON_ACCUM { \ + asm(\ + VONE(one)\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VMADD_MII_IR(one,UChi_10,psi_20,psi_20) \ + VMADD_MII_IR(one,UChi_11,psi_21,psi_21) \ + VMADD_MII_IR(one,UChi_12,psi_22,psi_22) \ + VMADD_MII_IR(one,UChi_00,psi_30,psi_30) \ + VMADD_MII_IR(one,UChi_01,psi_31,psi_31) \ + VMADD_MII_IR(one,UChi_02,psi_32,psi_32) \ + ); \ + } + +// fspin(2)+=hspin(1); +// fspin(3)-=hspin(0); +#define YP_RECON_ACCUM {\ + asm(\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VADD(psi_20,UChi_10,psi_20) VADD(psi_21,UChi_11,psi_21) VADD(psi_22,UChi_12,psi_22) \ + VSUB(psi_30,UChi_00,psi_30) VSUB(psi_31,UChi_01,psi_31) VSUB(psi_32,UChi_02,psi_32) \ + );\ + } +#define YM_RECON_ACCUM {\ + asm(\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VSUB(psi_20,UChi_10,psi_20) VSUB(psi_21,UChi_11,psi_21) VSUB(psi_22,UChi_12,psi_22) \ + VADD(psi_30,UChi_00,psi_30) VADD(psi_31,UChi_01,psi_31) VADD(psi_32,UChi_02,psi_32) \ + );\ + } + +// fspin(2)-=timesI(hspin(0)); +// fspin(3)+=timesI(hspin(1)); +#define ZP_RECON_ACCUM {\ + asm(\ + VONE(one)\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VMADD_II_MIR(one,UChi_00,psi_20,psi_20) \ + VMADD_II_MIR(one,UChi_01,psi_21,psi_21) \ + VMADD_II_MIR(one,UChi_02,psi_22,psi_22) \ + VMADD_MII_IR(one,UChi_10,psi_30,psi_30) \ + VMADD_MII_IR(one,UChi_11,psi_31,psi_31) \ + VMADD_MII_IR(one,UChi_12,psi_32,psi_32) \ + );\ + } + +#define ZM_RECON_ACCUM {\ + asm(\ + VONE(one)\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VMADD_MII_IR(one,UChi_00,psi_20,psi_20) \ + VMADD_MII_IR(one,UChi_01,psi_21,psi_21) \ + VMADD_MII_IR(one,UChi_02,psi_22,psi_22) \ + VMADD_II_MIR(one,UChi_10,psi_30,psi_30) \ + VMADD_II_MIR(one,UChi_11,psi_31,psi_31) \ + VMADD_II_MIR(one,UChi_12,psi_32,psi_32) \ + );\ + } + +// fspin(2)+=hspin(0); +// fspin(3)+=hspin(1); +#define TP_RECON_ACCUM {\ + asm(\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VADD(psi_20,UChi_00,psi_20) VADD(psi_21,UChi_01,psi_21) VADD(psi_22,UChi_02,psi_22) \ + VADD(psi_30,UChi_10,psi_30) VADD(psi_31,UChi_11,psi_31) VADD(psi_32,UChi_12,psi_32) \ + );\ + } + +#define TM_RECON_ACCUM {\ + asm(\ + VONE(one)\ + VADD(psi_00,UChi_00,psi_00) VADD(psi_01,UChi_01,psi_01) VADD(psi_02,UChi_02,psi_02) \ + VADD(psi_10,UChi_10,psi_10) VADD(psi_11,UChi_11,psi_11) VADD(psi_12,UChi_12,psi_12) \ + VSUB(psi_20,UChi_00,psi_20) VSUB(psi_21,UChi_01,psi_21) VSUB(psi_22,UChi_02,psi_22) \ + VSUB(psi_30,UChi_10,psi_30) VSUB(psi_31,UChi_11,psi_31) VSUB(psi_32,UChi_12,psi_32) \ + );\ + } + +uint64_t GetPFInfo(int nent,int plocal); +uint64_t GetInfo(int ptype,int local,int perm,int Xp,int ent,int plocal); + +#define COMPLEX_TYPE int; +int signs[4]; + +void testme(int osites,int ssU) +{ + int local,perm, ptype; + uint64_t base; + uint64_t basep; + const uint64_t plocal =(uint64_t) & in._odata[0]; + + // vComplexF isigns[2] = { signs[0], signs[1] }; + //COMPLEX_TYPE is vComplexF of vComplexD depending + //on the chosen precision + COMPLEX_TYPE *isigns = &signs[0]; + + MASK_REGS; + int nmax=osites; + for(int site=0;site=nmax) ssn=0; + int sUn=ssn; + for(int s=0;s shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + YP_PROJMEM(base); +#else + YM_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR2,perm); + } else { + LOAD_CHI(base); + } + base = GetInfo(ptype,local,perm,Zp,ent,plocal); ent++; + PREFETCH_CHIMU(base); + { + MULT_2SPIN_DIR_PFYP(Yp,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + YP_RECON_ACCUM; +#else + YM_RECON_ACCUM; +#endif + + //////////////////////////////// + // Zp + //////////////////////////////// + basep = GetPFInfo(nent,plocal); nent++; + if ( local ) { + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + ZP_PROJMEM(base); +#else + ZM_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR1,perm); + } else { + LOAD_CHI(base); + } + base = GetInfo(ptype,local,perm,Tp,ent,plocal); ent++; + PREFETCH_CHIMU(base); + { + MULT_2SPIN_DIR_PFZP(Zp,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + ZP_RECON_ACCUM; +#else + ZM_RECON_ACCUM; +#endif + + //////////////////////////////// + // Tp + //////////////////////////////// + basep = GetPFInfo(nent,plocal); nent++; + if ( local ) { + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + TP_PROJMEM(base); +#else + TM_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR0,perm); + } else { + LOAD_CHI(base); + } + base = GetInfo(ptype,local,perm,Xm,ent,plocal); ent++; + PREFETCH_CHIMU(base); + { + MULT_2SPIN_DIR_PFTP(Tp,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + TP_RECON_ACCUM; +#else + TM_RECON_ACCUM; +#endif + + //////////////////////////////// + // Xm + //////////////////////////////// +#ifndef STREAM_STORE + basep= (uint64_t) &out._odata[ss]; +#endif + // basep= GetPFInfo(nent,plocal); nent++; + if ( local ) { + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + XM_PROJMEM(base); +#else + XP_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR3,perm); + } else { + LOAD_CHI(base); + } + base = GetInfo(ptype,local,perm,Ym,ent,plocal); ent++; + PREFETCH_CHIMU(base); + { + MULT_2SPIN_DIR_PFXM(Xm,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + XM_RECON_ACCUM; +#else + XP_RECON_ACCUM; +#endif + + //////////////////////////////// + // Ym + //////////////////////////////// + basep= GetPFInfo(nent,plocal); nent++; + if ( local ) { + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + YM_PROJMEM(base); +#else + YP_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR2,perm); + } else { + LOAD_CHI(base); + } + base = GetInfo(ptype,local,perm,Zm,ent,plocal); ent++; + PREFETCH_CHIMU(base); + { + MULT_2SPIN_DIR_PFYM(Ym,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + YM_RECON_ACCUM; +#else + YP_RECON_ACCUM; +#endif + + //////////////////////////////// + // Zm + //////////////////////////////// + basep= GetPFInfo(nent,plocal); nent++; + if ( local ) { + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + ZM_PROJMEM(base); +#else + ZP_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR1,perm); + } else { + LOAD_CHI(base); + } + base = GetInfo(ptype,local,perm,Tm,ent,plocal); ent++; + PREFETCH_CHIMU(base); + { + MULT_2SPIN_DIR_PFZM(Zm,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + ZM_RECON_ACCUM; +#else + ZP_RECON_ACCUM; +#endif + + //////////////////////////////// + // Tm + //////////////////////////////// + basep= GetPFInfo(nent,plocal); nent++; + if ( local ) { + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + TM_PROJMEM(base); +#else + TP_PROJMEM(base); +#endif + MAYBEPERM(PERMUTE_DIR0,perm); + } else { + LOAD_CHI(base); + } + base= (uint64_t) &out._odata[ss]; +#ifndef STREAM_STORE + PREFETCH_CHIMU(base); +#endif + { + MULT_2SPIN_DIR_PFTM(Tm,basep); + } + LOAD64(%r10,isigns); // times i => shuffle and xor the real part sign bit +#ifdef KERNEL_DAG + TM_RECON_ACCUM; +#else + TP_RECON_ACCUM; +#endif + + basep= GetPFInfo(nent,plocal); nent++; + SAVE_RESULT(base,basep); + + } + ssU++; + } +} + + +#endif From f8d11ff67315f3030733a74b55cb0ab9a5cf538c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 20 Dec 2016 12:31:49 +0100 Subject: [PATCH 188/807] better serialisable enums (can be encapsulated into classes) --- lib/serialisation/BaseIO.h | 39 +--------- lib/serialisation/MacroMagic.h | 130 +++++++++++++++++---------------- 2 files changed, 72 insertions(+), 97 deletions(-) diff --git a/lib/serialisation/BaseIO.h b/lib/serialisation/BaseIO.h index 7761a8e6..1095baf1 100644 --- a/lib/serialisation/BaseIO.h +++ b/lib/serialisation/BaseIO.h @@ -83,12 +83,7 @@ namespace Grid { typename std::enable_if::value, void>::type write(const std::string& s, const U &output); template - typename std::enable_if::value, void>::type - write(const std::string& s, const U &output); - template - typename std::enable_if< - !(std::is_base_of::value or std::is_enum::value), - void>::type + typename std::enable_if::value, void>::type write(const std::string& s, const U &output); private: T *upcast; @@ -107,12 +102,7 @@ namespace Grid { typename std::enable_if::value, void>::type read(const std::string& s, U &output); template - typename std::enable_if::value, void>::type - read(const std::string& s, U &output); - template - typename std::enable_if< - !(std::is_base_of::value or std::is_enum::value), - void>::type + typename std::enable_if::value, void>::type read(const std::string& s, U &output); protected: template @@ -221,17 +211,7 @@ namespace Grid { template template - typename std::enable_if::value, void>::type - Writer::write(const std::string &s, const U &output) - { - EnumIO::write(*this, s, output); - } - - template - template - typename std::enable_if< - !(std::is_base_of::value or std::is_enum::value), - void>::type + typename std::enable_if::value, void>::type Writer::write(const std::string &s, const U &output) { upcast->writeDefault(s, output); @@ -266,17 +246,7 @@ namespace Grid { template template - typename std::enable_if::value, void>::type - Reader::read(const std::string &s, U &output) - { - EnumIO::read(*this, s, output); - } - - template - template - typename std::enable_if< - !(std::is_base_of::value or std::is_enum::value), - void>::type + typename std::enable_if::value, void>::type Reader::read(const std::string &s, U &output) { upcast->readDefault(s, output); @@ -300,7 +270,6 @@ namespace Grid { abort(); } } - } #endif diff --git a/lib/serialisation/MacroMagic.h b/lib/serialisation/MacroMagic.h index c78bba0c..c9137dfe 100644 --- a/lib/serialisation/MacroMagic.h +++ b/lib/serialisation/MacroMagic.h @@ -114,35 +114,33 @@ THE SOFTWARE. #define GRID_MACRO_WRITE_MEMBER(A,B) Grid::write(WR,#B,obj. B); #define GRID_SERIALIZABLE_CLASS_MEMBERS(cname,...) \ - \ - \ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_MEMBER,__VA_ARGS__)) \ - \ - \ - template \ - static inline void write(Writer &WR,const std::string &s, const cname &obj){ \ - push(WR,s);\ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_WRITE_MEMBER,__VA_ARGS__)) \ - pop(WR);\ - } \ - \ - \ - template \ - static inline void read(Reader &RD,const std::string &s, cname &obj){ \ - push(RD,s);\ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_READ_MEMBER,__VA_ARGS__)) \ - pop(RD);\ - } \ - \ - \ - friend inline std::ostream & operator << (std::ostream &os, const cname &obj ) { \ - os<<"class "<<#cname<<" {"<\ +static inline void write(Writer &WR,const std::string &s, const cname &obj){ \ + push(WR,s);\ + GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_WRITE_MEMBER,__VA_ARGS__)) \ + pop(WR);\ +} \ +\ +\ +template \ +static inline void read(Reader &RD,const std::string &s, cname &obj){ \ + push(RD,s);\ + GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_READ_MEMBER,__VA_ARGS__)) \ + pop(RD);\ +} \ +\ +\ +friend inline std::ostream & operator << (std::ostream &os, const cname &obj ) { \ + os<<"class "<<#cname<<" {"<::type #define GRID_MACRO_ENUMVAL(A,B) A = B, @@ -150,44 +148,52 @@ THE SOFTWARE. #define GRID_MACRO_ENUMTEST(A,B) else if (buf == #A) {obj = GRID_ENUM_TYPE(obj)::A;} #define GRID_MACRO_ENUMCASEIO(A,B) case GRID_ENUM_TYPE(obj)::A: os << #A; break; -namespace Grid { - template - class EnumIO {}; -} - #define GRID_SERIALIZABLE_ENUM(name,undefname,...)\ - enum class name {\ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMVAL,__VA_ARGS__))\ - undefname = -1\ +class name: public Serializable\ +{\ +public:\ + enum EnumType\ + {\ + GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMVAL,__VA_ARGS__))\ + undefname = -1\ };\ +public:\ + name(void): value_(undefname) {};\ + name(EnumType value): value_(value) {};\ + template \ + static inline void write(Writer &WR,const std::string &s, const name &obj)\ + {\ + switch (obj.value_)\ + {\ + GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMCASE,__VA_ARGS__))\ + default: Grid::write(WR,s,#undefname); break;\ + }\ + }\ \ - template<>\ - class EnumIO {\ - public:\ - template \ - static inline void write(Writer &WR,const std::string &s, const name &obj){ \ - switch (obj) {\ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMCASE,__VA_ARGS__))\ - default: Grid::write(WR,s,#undefname); break;\ - }\ - }\ - \ - template \ - static inline void read(Reader &RD,const std::string &s, name &obj){ \ - std::string buf;\ - Grid::read(RD, s, buf);\ - if (buf == #undefname) {obj = name::undefname;}\ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMTEST,__VA_ARGS__))\ - else {obj = name::undefname;}\ - }\ - };\ - \ - inline std::ostream & operator << (std::ostream &os, const name &obj ) { \ + template \ + static inline void read(Reader &RD,const std::string &s, name &obj)\ + {\ + std::string buf;\ + Grid::read(RD, s, buf);\ + if (buf == #undefname) {obj = name::undefname;}\ + GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMTEST,__VA_ARGS__))\ + else {obj = name::undefname;}\ + }\ + inline operator EnumType(void) const\ + {\ + return value_;\ + }\ + inline friend std::ostream & operator<<(std::ostream &os, const name &obj)\ + {\ switch (obj) {\ - GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMCASEIO,__VA_ARGS__))\ - default: os << #undefname; break;\ + GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMCASEIO,__VA_ARGS__))\ + default: os << #undefname; break;\ }\ return os;\ - }; + }\ +private:\ + EnumType value_;\ +}; + #endif From 2af9ab903445291377bb323ee349ddf9c7e94abf Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 20 Dec 2016 12:40:26 +0100 Subject: [PATCH 189/807] old Makefile cleaning --- programs/Makefile.am | 1 - 1 file changed, 1 deletion(-) delete mode 100644 programs/Makefile.am diff --git a/programs/Makefile.am b/programs/Makefile.am deleted file mode 100644 index ff7f6584..00000000 --- a/programs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = qed-fvol From 9ac3ac41df095e3208c126f4b52bdf9f1b58937a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 20 Dec 2016 12:41:01 +0100 Subject: [PATCH 190/807] serialisable Photon parameters --- lib/qcd/action/gauge/Photon.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/qcd/action/gauge/Photon.h b/lib/qcd/action/gauge/Photon.h index b6c1b76f..bbe3ebf7 100644 --- a/lib/qcd/action/gauge/Photon.h +++ b/lib/qcd/action/gauge/Photon.h @@ -28,6 +28,7 @@ #ifndef QCD_PHOTON_ACTION_H #define QCD_PHOTON_ACTION_H + namespace Grid{ namespace QCD{ @@ -36,8 +37,8 @@ namespace QCD{ { public: INHERIT_GIMPL_TYPES(Gimpl); - enum class Gauge {Feynman, Coulomb, Landau}; - enum class ZmScheme {QedL, QedTL}; + GRID_SERIALIZABLE_ENUM(Gauge, undef, feynman, 1, coulomb, 2, landau, 3); + GRID_SERIALIZABLE_ENUM(ZmScheme, undef, qedL, 1, qedTL, 2); public: Photon(Gauge gauge, ZmScheme zmScheme); virtual ~Photon(void) = default; @@ -104,7 +105,7 @@ namespace QCD{ switch (zmScheme_) { - case ZmScheme::QedTL: + case ZmScheme::qedTL: { std::vector zm(nd,0); TComplex Tzero = Complex(0.0,0.0); @@ -113,7 +114,7 @@ namespace QCD{ break; } - case ZmScheme::QedL: + case ZmScheme::qedL: { LatticeInteger spNrm(grid), coor(grid); GaugeLinkField z(grid); From db9c28a773c5d93d3c757ea4f8af75876106b948 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 20 Dec 2016 12:41:39 +0100 Subject: [PATCH 191/807] qed-fvol: Photon parameter name fix --- extras/qed-fvol/qed-fvol.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/qed-fvol/qed-fvol.cc b/extras/qed-fvol/qed-fvol.cc index f0f5079f..951c36ad 100644 --- a/extras/qed-fvol/qed-fvol.cc +++ b/extras/qed-fvol/qed-fvol.cc @@ -62,8 +62,8 @@ int main(int argc, char *argv[]) std::vector mpi_layout = GridDefaultMpi(); GridCartesian grid(latt_size,simd_layout,mpi_layout); GridParallelRNG pRNG(&grid); - PhotonR photon(PhotonR::Gauge::Feynman, - PhotonR::ZmScheme::QedL); + PhotonR photon(PhotonR::Gauge::feynman, + PhotonR::ZmScheme::qedL); EmField a(&grid); EmField expA(&grid); From ce1a115e0b8ff288c3615f8e150ef100053354bc Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Tue, 20 Dec 2016 17:51:30 +0000 Subject: [PATCH 192/807] Removing redundant arguments for integrator functions, step 1 --- lib/lattice/Lattice_base.h | 19 +++- lib/qcd/hmc/GenericHMCrunner.h | 39 ++++---- lib/qcd/hmc/integrators/Integrator.h | 3 +- lib/simd/Grid_avx.h | 115 +++++++++++------------ lib/supported_compilers.h | 2 +- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 60 +++++++++++- tests/solver/Test_dwf_cg_prec_LsVec.cc | 6 +- 7 files changed, 152 insertions(+), 92 deletions(-) diff --git a/lib/lattice/Lattice_base.h b/lib/lattice/Lattice_base.h index e4dc1ca8..e6536830 100644 --- a/lib/lattice/Lattice_base.h +++ b/lib/lattice/Lattice_base.h @@ -255,19 +255,28 @@ PARALLEL_FOR_LOOP } Lattice(const Lattice& r){ // copy constructor - _grid = r._grid; - checkerboard = r.checkerboard; + _grid = r._grid; + checkerboard = r.checkerboard; _odata.resize(_grid->oSites());// essential - PARALLEL_FOR_LOOP + PARALLEL_FOR_LOOP for(int ss=0;ss<_grid->oSites();ss++){ - _odata[ss]=r._odata[ss]; + _odata[ss]=r._odata[ss]; } - } + } virtual ~Lattice(void) = default; + void reset(GridBase* grid) { + if (_grid != grid) { + _grid = grid; + _odata.resize(grid->oSites()); + checkerboard = 0; + } + } + + template strong_inline Lattice & operator = (const sobj & r){ PARALLEL_FOR_LOOP for(int ss=0;ss<_grid->oSites();ss++){ diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index 114595b1..2530559f 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -27,17 +27,17 @@ with this program; if not, write to the Free Software Foundation, Inc., directory *************************************************************************************/ /* END LEGAL */ -#ifndef GENERIC_HMC_RUNNER -#define GENERIC_HMC_RUNNER +#ifndef GRID_GENERIC_HMC_RUNNER +#define GRID_GENERIC_HMC_RUNNER namespace Grid { namespace QCD { - // Virtual Class for HMC specific for gauge theories - // implement a specific theory by defining the BuildTheAction - template - class BinaryHmcRunnerTemplate { - public: +// Virtual Class for HMC specific for gauge theories +// implement a specific theory by defining the BuildTheAction +template +class BinaryHmcRunnerTemplate { +public: INHERIT_FIELD_TYPES(Implementation); typedef Implementation ImplPolicy; @@ -56,8 +56,10 @@ namespace QCD { IntegratorParameters MDparameters; GridCartesian * UGrid; - GridCartesian * FGrid; GridRedBlackCartesian *UrbGrid; + + // These two are unnecessary, eliminate + GridCartesian * FGrid; GridRedBlackCartesian *FrbGrid; std::vector SerialSeed; @@ -68,11 +70,11 @@ namespace QCD { ParallelSeed = P; } - virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? + virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? // A couple of wrapper classes template - void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { + void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { NoSmearing S; Runner(argc, argv, Checkpoint, S); } @@ -83,6 +85,8 @@ namespace QCD { } ////////////////////////////// + + template void Runner(int argc, @@ -141,11 +145,7 @@ namespace QCD { Field U(UGrid); - typedef MinimumNorm2 - IntegratorType; // change here to change the algorithm - + typedef MinimumNorm2 IntegratorType; // change here to change the algorithm IntegratorType MDynamics(UGrid, MDparameters, TheAction, Smearing); HMCparameters HMCpar; @@ -187,7 +187,7 @@ namespace QCD { // Run it HMC.evolve(); } - }; +}; // These are for gauge fields typedef BinaryHmcRunnerTemplate BinaryHmcRunner; @@ -199,6 +199,7 @@ namespace QCD { typedef BinaryHmcRunnerTemplate ScalarBinaryHmcRunner; -} -} -#endif + +} // namespace QCD +} // namespace Grid +#endif diff --git a/lib/qcd/hmc/integrators/Integrator.h b/lib/qcd/hmc/integrators/Integrator.h index db3712c0..48ec746c 100644 --- a/lib/qcd/hmc/integrators/Integrator.h +++ b/lib/qcd/hmc/integrators/Integrator.h @@ -189,7 +189,8 @@ class Integrator { // Initialization of momenta and actions void refresh(Field& U, GridParallelRNG& pRNG) { - assert(P._grid == U._grid); + //assert(P._grid == U._grid); + P.reset(U._grid); std::cout << GridLogIntegrator << "Integrator refresh\n"; FieldImplementation::generate_momenta(P, pRNG); diff --git a/lib/simd/Grid_avx.h b/lib/simd/Grid_avx.h index 77927b10..ac6ec9f4 100644 --- a/lib/simd/Grid_avx.h +++ b/lib/simd/Grid_avx.h @@ -1,6 +1,6 @@ /************************************************************************************* - Grid physics library, www.github.com/paboyle/Grid + Grid physics library, www.github.com/paboyle/Grid Source file: ./lib/simd/Grid_avx.h @@ -29,15 +29,6 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -//---------------------------------------------------------------------- -/*! @file Grid_avx.h - @brief Optimization libraries for AVX1/2 instructions set - - Using intrinsics -*/ -// Time-stamp: <2015-06-16 23:30:41 neo> -//---------------------------------------------------------------------- - #include #ifdef AVXFMA4 #include @@ -66,9 +57,9 @@ namespace Optimization { double f[4]; }; - struct Vsplat{ - //Complex float - inline __m256 operator()(float a, float b){ + struct Vsplat{ + // Complex float + inline __m256 operator()(float a, float b) { return _mm256_set_ps(b,a,b,a,b,a,b,a); } // Real float @@ -90,7 +81,7 @@ namespace Optimization { }; struct Vstore{ - //Float + //Float inline void operator()(__m256 a, float* F){ _mm256_store_ps(F,a); } @@ -119,15 +110,15 @@ namespace Optimization { }; struct Vset{ - // Complex float + // Complex float inline __m256 operator()(Grid::ComplexF *a){ return _mm256_set_ps(a[3].imag(),a[3].real(),a[2].imag(),a[2].real(),a[1].imag(),a[1].real(),a[0].imag(),a[0].real()); } - // Complex double + // Complex double inline __m256d operator()(Grid::ComplexD *a){ return _mm256_set_pd(a[1].imag(),a[1].real(),a[0].imag(),a[0].real()); } - // Real float + // Real float inline __m256 operator()(float *a){ return _mm256_set_ps(a[7],a[6],a[5],a[4],a[3],a[2],a[1],a[0]); } @@ -144,8 +135,8 @@ namespace Optimization { template struct Reduce{ - //Need templated class to overload output type - //General form must generate error if compiled + // Need templated class to overload output type + // General form must generate error if compiled inline Out_type operator()(In_type in){ printf("Error, using wrong Reduce function\n"); exit(1); @@ -224,7 +215,7 @@ namespace Optimization { ymm1 = _mm256_shuffle_ps(b,b,_MM_SELECT_FOUR_FOUR(2,3,0,1)); // ymm1 <- br,bi ymm2 = _mm256_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(3,3,1,1)); // ymm2 <- ai,ai ymm1 = _mm256_mul_ps(ymm1,ymm2); // ymm1 <- br ai, ai bi - return _mm256_addsub_ps(ymm0,ymm1); + return _mm256_addsub_ps(ymm0,ymm1); #endif #if defined (AVXFMA4) __m256 a_real = _mm256_shuffle_ps(a,a,_MM_SELECT_FOUR_FOUR(2,2,0,0)); // ar ar, @@ -241,10 +232,10 @@ namespace Optimization { #endif } // Complex double - inline __m256d operator()(__m256d a, __m256d b){ - //Multiplication of (ak+ibk)*(ck+idk) + inline __m256d operator()(__m256d a, __m256d b) { + // Multiplication of (ak+ibk)*(ck+idk) // a + i b can be stored as a data structure - //From intel optimisation reference guide + // From intel optimisation reference guide /* movsldup xmm0, Src1; load real parts into the destination, ; a1, a1, a0, a0 @@ -268,7 +259,7 @@ namespace Optimization { __m256d ymm0,ymm1,ymm2; ymm0 = _mm256_shuffle_pd(a,a,0x0); // ymm0 <- ar ar, ar,ar b'00,00 ymm0 = _mm256_mul_pd(ymm0,b); // ymm0 <- ar bi, ar br - ymm1 = _mm256_shuffle_pd(b,b,0x5); // ymm1 <- br,bi b'01,01 + ymm1 = _mm256_shuffle_pd(b,b,0x5); // ymm1 <- br,bi b'01,01 ymm2 = _mm256_shuffle_pd(a,a,0xF); // ymm2 <- ai,ai b'11,11 ymm1 = _mm256_mul_pd(ymm1,ymm2); // ymm1 <- br ai, ai bi return _mm256_addsub_pd(ymm0,ymm1); @@ -365,10 +356,10 @@ namespace Optimization { } }; - struct Div{ + struct Div { // Real float - inline __m256 operator()(__m256 a, __m256 b){ - return _mm256_div_ps(a,b); + inline __m256 operator()(__m256 a, __m256 b) { + return _mm256_div_ps(a, b); } // Real double inline __m256d operator()(__m256d a, __m256d b){ @@ -454,7 +445,7 @@ namespace Optimization { #define _mm256_alignr_epi64_grid(ret,a,b,n) ret=(__m256d) _mm256_alignr_epi8((__m256i)a,(__m256i)b,(n*8)%16) #endif -#if defined (AVX1) || defined (AVXFMA) +#if defined (AVX1) || defined (AVXFMA) #define _mm256_alignr_epi32_grid(ret,a,b,n) { \ __m128 aa, bb; \ \ @@ -487,7 +478,7 @@ namespace Optimization { struct Rotate{ - static inline __m256 rotate(__m256 in,int n){ + static inline __m256 rotate(__m256 in,int n){ switch(n){ case 0: return tRotate<0>(in);break; case 1: return tRotate<1>(in);break; @@ -500,7 +491,7 @@ namespace Optimization { default: assert(0); } } - static inline __m256d rotate(__m256d in,int n){ + static inline __m256d rotate(__m256d in,int n){ switch(n){ case 0: return tRotate<0>(in);break; case 1: return tRotate<1>(in);break; @@ -509,28 +500,28 @@ namespace Optimization { default: assert(0); } } - - - template - static inline __m256 tRotate(__m256 in){ - __m256 tmp = Permute::Permute0(in); - __m256 ret = in; - if ( n > 3 ) { - _mm256_alignr_epi32_grid(ret,in,tmp,n); - } else { - _mm256_alignr_epi32_grid(ret,tmp,in,n); - } - return ret; - }; + template - static inline __m256d tRotate(__m256d in){ - __m256d tmp = Permute::Permute0(in); - __m256d ret = in; - if ( n > 1 ) { - _mm256_alignr_epi64_grid(ret,in,tmp,n); + static inline __m256 tRotate(__m256 in){ + __m256 tmp = Permute::Permute0(in); + __m256 ret; + if ( n > 3 ) { + _mm256_alignr_epi32_grid(ret,in,tmp,n); } else { - _mm256_alignr_epi64_grid(ret,tmp,in,n); + _mm256_alignr_epi32_grid(ret,tmp,in,n); + } + return ret; + } + + template + static inline __m256d tRotate(__m256d in){ + __m256d tmp = Permute::Permute0(in); + __m256d ret; + if ( n > 1 ) { + _mm256_alignr_epi64_grid(ret,in,tmp,n); + } else { + _mm256_alignr_epi64_grid(ret,tmp,in,n); } return ret; }; @@ -543,7 +534,7 @@ namespace Optimization { __m256 v1,v2; v1=Optimization::Permute::Permute0(in); // avx 256; quad complex single v1= _mm256_add_ps(v1,in); - v2=Optimization::Permute::Permute1(v1); + v2=Optimization::Permute::Permute1(v1); v1 = _mm256_add_ps(v1,v2); u256f conv; conv.v = v1; return Grid::ComplexF(conv.f[0],conv.f[1]); @@ -555,15 +546,15 @@ namespace Optimization { __m256 v1,v2; v1 = Optimization::Permute::Permute0(in); // avx 256; octo-double v1 = _mm256_add_ps(v1,in); - v2 = Optimization::Permute::Permute1(v1); + v2 = Optimization::Permute::Permute1(v1); v1 = _mm256_add_ps(v1,v2); - v2 = Optimization::Permute::Permute2(v1); + v2 = Optimization::Permute::Permute2(v1); v1 = _mm256_add_ps(v1,v2); u256f conv; conv.v=v1; return conv.f[0]; } - - + + //Complex double Reduce template<> inline Grid::ComplexD Reduce::operator()(__m256d in){ @@ -573,14 +564,14 @@ namespace Optimization { u256d conv; conv.v = v1; return Grid::ComplexD(conv.f[0],conv.f[1]); } - + //Real double Reduce template<> inline Grid::RealD Reduce::operator()(__m256d in){ __m256d v1,v2; v1 = Optimization::Permute::Permute0(in); // avx 256; quad double v1 = _mm256_add_pd(v1,in); - v2 = Optimization::Permute::Permute1(v1); + v2 = Optimization::Permute::Permute1(v1); v1 = _mm256_add_pd(v1,v2); u256d conv; conv.v = v1; return conv.f[0]; @@ -593,17 +584,17 @@ namespace Optimization { printf("Reduce : Missing integer implementation -> FIX\n"); assert(0); } - + } ////////////////////////////////////////////////////////////////////////////////////// -// Here assign types +// Here assign types typedef __m256 SIMD_Ftype; // Single precision type typedef __m256d SIMD_Dtype; // Double precision type typedef __m256i SIMD_Itype; // Integer type - // prefecthing + // prefecthing inline void v_prefetch0(int size, const char *ptr){ for(int i=0;i using ReduceSIMD = Optimization::Reduce; + template using ReduceSIMD = Optimization::Reduce; // Arithmetic operations typedef Optimization::Sum SumSIMD; @@ -632,4 +623,4 @@ namespace Optimization { typedef Optimization::TimesMinusI TimesMinusISIMD; typedef Optimization::TimesI TimesISIMD; -} +} // namespace Grid diff --git a/lib/supported_compilers.h b/lib/supported_compilers.h index cec68713..b4cd9a78 100644 --- a/lib/supported_compilers.h +++ b/lib/supported_compilers.h @@ -46,4 +46,4 @@ #endif -#endif +#endif // COMPILER_CHECK_H diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc index 4c650357..d5228ce8 100644 --- a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc +++ b/tests/hmc/Test_hmc_WilsonGauge_Binary.cc @@ -63,6 +63,11 @@ class HMCRunnerParameters : Serializable { class HmcRunner : public BinaryHmcRunner { public: HMCRunnerParameters HMCPar; + void BuildTheAction(int argc, char **argv){} +}; +/* + + // eliminate arcg and argv from here void BuildTheAction(int argc, char **argv) { @@ -90,6 +95,7 @@ class HmcRunner : public BinaryHmcRunner { // Add observables // options for checkpointers + // this can be moved outside the BuildTheAction //BinaryHmcCheckpointer //ILDGHmcCheckpointer //NerscHmcCheckpointer @@ -107,9 +113,11 @@ class HmcRunner : public BinaryHmcRunner { ObservablesList.push_back(&PlaqLog); ObservablesList.push_back(&Checkpoint); + // This must run from here so that the grids are defined Run(argc, argv, Checkpoint); // no smearing }; }; +*/ } } @@ -136,7 +144,57 @@ int main(int argc, char **argv) { TheHMC.MDparameters.set(TheHMC.HMCPar.MDsteps, TheHMC.HMCPar.TrajectorLength); - TheHMC.BuildTheAction(argc, argv); + //TheHMC.BuildTheAction(argc, argv); + + + + // Typedefs to simplify notation + typedef WilsonGaugeActionR GaugeAction; + typedef WilsonImplR ImplPolicy; + typedef WilsonFermionR FermionAction; + typedef typename FermionAction::FermionField FermionField; + + // this can be simplified too. MakeDefaultGrid(Nd) + TheHMC.UGrid = SpaceTimeGrid::makeFourDimGrid( + GridDefaultLatt(), + GridDefaultSimd(Nd, vComplex::Nsimd()), + GridDefaultMpi()); + + + // Gauge action + std::cout << GridLogMessage << "Beta: " << TheHMC.HMCPar.beta << std::endl; + GaugeAction Waction(TheHMC.HMCPar.beta); + + // Collect actions + ActionLevel Level1(1); + Level1.push_back(&Waction); + TheHMC.TheAction.push_back(Level1); + + // Add observables + // options for checkpointers + // this can be moved outside the BuildTheAction + //BinaryHmcCheckpointer + //ILDGHmcCheckpointer + //NerscHmcCheckpointer + NerscHmcCheckpointer Checkpoint( + TheHMC.HMCPar.conf_prefix, TheHMC.HMCPar.rng_prefix, TheHMC.HMCPar.SaveInterval, TheHMC.HMCPar.format); + // Can implement also a specific function in the hmcrunner + // AddCheckpoint (...) that takes the same parameters + a string/tag + // defining the type of the checkpointer + // with tags can be implemented by overloading and no ifs + // Then force all checkpoint to have few common functions + // return an object that is then passed to the Run function + + PlaquetteLogger PlaqLog( + std::string("Plaquette")); + TheHMC.ObservablesList.push_back(&PlaqLog); + TheHMC.ObservablesList.push_back(&Checkpoint); + + // This must run from here so that the grids are defined + TheHMC.Run(argc, argv, Checkpoint); // no smearing + + + Grid_finalize(); } diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc index 3fbec4d3..dfa0a194 100644 --- a/tests/solver/Test_dwf_cg_prec_LsVec.cc +++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc @@ -67,7 +67,7 @@ int main(int argc, char** argv) { GridParallelRNG RNG4(UGrid); RNG4.SeedFixedIntegers(seeds4); - std::cout << GridLogMessage << "Generating random ferrmion field" << std::endl; + std::cout << GridLogMessage << "Generating random fermion field" << std::endl; LatticeFermion src(FGrid); random(RNG5, src); LatticeFermion result(FGrid); @@ -96,7 +96,7 @@ int main(int argc, char** argv) { GridStopWatch CGTimer; SchurDiagMooeeOperator HermOpEO(Ddwf); - ConjugateGradient CG(1.0e-8, 10000, 0);// switch off the assert + ConjugateGradient CG(1.0e-8, 10000, 0); // switch off the assert Ddwf.ZeroCounters(); CGTimer.Start(); @@ -110,4 +110,4 @@ int main(int argc, char** argv) { Ddwf.Report(); Grid_finalize(); -} +} From 7a85fddc7e4082b17500edb7fc08cf68efcda984 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 22 Dec 2016 00:25:36 +0100 Subject: [PATCH 193/807] Hadrons: modification of registration mechanism to allow for persistent caches --- extras/Hadrons/Application.cc | 2 +- extras/Hadrons/Environment.cc | 47 +++++++++++++++++++++++++++++----- extras/Hadrons/Environment.hpp | 4 ++- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index cf7906eb..4bb3b383 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -306,7 +306,7 @@ void Application::configLoop(void) << " " << BIG_SEP << std::endl; env_.setTrajectory(t); env_.executeProgram(program_); - env_.freeAll(); } LOG(Message) << BIG_SEP << " End of measurement " << BIG_SEP << std::endl; + env_.freeAll(); } diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 4b230e20..68c170b8 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -410,12 +410,19 @@ Environment::Size Environment::executeProgram(const std::vector &p) // general memory management /////////////////////////////////////////////////// void Environment::addObject(const std::string name, const int moduleAddress) { - ObjInfo info; - - info.name = name; - info.module = moduleAddress; - object_.push_back(std::move(info)); - objectAddress_[name] = static_cast(object_.size() - 1); + if (!hasObject(name)) + { + ObjInfo info; + + info.name = name; + info.module = moduleAddress; + object_.push_back(std::move(info)); + objectAddress_[name] = static_cast(object_.size() - 1); + } + else + { + HADRON_ERROR("object '" + name + "' already exists"); + } } 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, const unsigned int size, const unsigned int Ls) { + if (!hasObject(name)) + { + addObject(name); + } 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 { return (getObjectLs(address) > 1); diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index 41a7a008..041bcc0e 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -137,7 +137,7 @@ public: Size executeProgram(const std::vector &p); // general memory management void addObject(const std::string name, - const int moduleAddress); + const int moduleAddress = -1); void registerObject(const unsigned int address, const unsigned int size, const unsigned int Ls = 1); @@ -176,6 +176,8 @@ public: bool hasObject(const std::string name) const; bool hasRegisteredObject(const unsigned int address) 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 std::string name) const; Environment::Size getTotalSize(void) const; From 3215ae6b7e82acb91caa42d2799d63e6a3676461 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 22 Dec 2016 00:26:30 +0100 Subject: [PATCH 194/807] Hadrons: genetic scheduler crashes in multi-thread with 1 module, multi-threading deactivated for now --- extras/Hadrons/GeneticScheduler.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp index 7b5fc183..c9256d96 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/extras/Hadrons/GeneticScheduler.hpp @@ -134,7 +134,7 @@ void GeneticScheduler::nextGeneration(void) LOG(Debug) << "Starting population:\n" << *this << std::endl; // random mutations - PARALLEL_FOR_LOOP + //PARALLEL_FOR_LOOP for (unsigned int i = 0; i < par_.popSize; ++i) { doMutation(); @@ -142,7 +142,7 @@ void GeneticScheduler::nextGeneration(void) LOG(Debug) << "After mutations:\n" << *this << std::endl; // mating - PARALLEL_FOR_LOOP + //PARALLEL_FOR_LOOP for (unsigned int i = 0; i < par_.popSize/2; ++i) { doCrossover(); From 17b3a10d46e46823f0a380647c4953c2ffd74ea4 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 22 Dec 2016 00:29:19 +0100 Subject: [PATCH 195/807] stochastic QED: function to cache 1/sqrt(khat^2) --- lib/qcd/action/gauge/Photon.h | 47 +++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/lib/qcd/action/gauge/Photon.h b/lib/qcd/action/gauge/Photon.h index bbe3ebf7..faa63b42 100644 --- a/lib/qcd/action/gauge/Photon.h +++ b/lib/qcd/action/gauge/Photon.h @@ -44,7 +44,10 @@ namespace QCD{ virtual ~Photon(void) = default; void FreePropagator(const GaugeField &in, GaugeField &out); void MomentumSpacePropagator(const GaugeField &in, GaugeField &out); + void StochasticWeight(GaugeLinkField &weight); void StochasticField(GaugeField &out, GridParallelRNG &rng); + void StochasticField(GaugeField &out, GridParallelRNG &rng, + const GaugeLinkField &weight); private: void invKHatSquared(GaugeLinkField &out); void zmSub(GaugeLinkField &out); @@ -148,32 +151,50 @@ namespace QCD{ } template - void Photon::StochasticField(GaugeField &out, GridParallelRNG &rng) + void Photon::StochasticWeight(GaugeLinkField &weight) { - auto *grid = dynamic_cast(out._grid); - const unsigned int nd = grid->_ndimension; - std::vector latt_size = grid->_fdimensions; - GaugeLinkField sqrtK2Inv(grid), r(grid); - GaugeField aTilde(grid); - FFT fft(grid); + auto *grid = dynamic_cast(weight._grid); + const unsigned int nd = grid->_ndimension; + std::vector latt_size = grid->_fdimensions; Integer vol = 1; for(int d = 0; d < nd; d++) { vol = vol * latt_size[d]; } - - invKHatSquared(sqrtK2Inv); - sqrtK2Inv = sqrt(vol*real(sqrtK2Inv)); - zmSub(sqrtK2Inv); + invKHatSquared(weight); + weight = sqrt(vol*real(weight)); + zmSub(weight); + } + + template + void Photon::StochasticField(GaugeField &out, GridParallelRNG &rng) + { + auto *grid = dynamic_cast(out._grid); + GaugeLinkField weight(grid); + + StochasticWeight(weight); + StochasticField(out, rng, weight); + } + + template + void Photon::StochasticField(GaugeField &out, GridParallelRNG &rng, + const GaugeLinkField &weight) + { + auto *grid = dynamic_cast(out._grid); + const unsigned int nd = grid->_ndimension; + GaugeLinkField r(grid); + GaugeField aTilde(grid); + FFT fft(grid); + for(int mu = 0; mu < nd; mu++) { gaussian(rng, r); - r = sqrtK2Inv*r; + r = weight*r; pokeLorentz(aTilde, r, mu); } fft.FFT_all_dim(out, aTilde, FFT::backward); - + out = real(out); } // template From 4c3fd9fa3f6976c1297715d1e2239797bb0dd45b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 22 Dec 2016 00:29:41 +0100 Subject: [PATCH 196/807] stochastic QED field module in Hadrons --- extras/Hadrons/Modules.hpp | 1 + extras/Hadrons/Modules/MGauge/StochEm.cc | 88 +++++++++++++++++++++ extras/Hadrons/Modules/MGauge/StochEm.hpp | 96 +++++++++++++++++++++++ extras/Hadrons/modules.inc | 2 + 4 files changed, 187 insertions(+) create mode 100644 extras/Hadrons/Modules/MGauge/StochEm.cc create mode 100644 extras/Hadrons/Modules/MGauge/StochEm.hpp diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp index 77ae08b7..5d1a456c 100644 --- a/extras/Hadrons/Modules.hpp +++ b/extras/Hadrons/Modules.hpp @@ -32,6 +32,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #include #include #include +#include #include #include #include diff --git a/extras/Hadrons/Modules/MGauge/StochEm.cc b/extras/Hadrons/Modules/MGauge/StochEm.cc new file mode 100644 index 00000000..c7a9fc4f --- /dev/null +++ b/extras/Hadrons/Modules/MGauge/StochEm.cc @@ -0,0 +1,88 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/Modules/MGauge/StochEm.cc + +Copyright (C) 2015 +Copyright (C) 2016 + + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ +#include + +using namespace Grid; +using namespace Hadrons; +using namespace MGauge; + +/****************************************************************************** +* TStochEm implementation * +******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +TStochEm::TStochEm(const std::string name) +: Module(name) +{} + +// dependencies/products /////////////////////////////////////////////////////// +std::vector TStochEm::getInput(void) +{ + std::vector in; + + return in; +} + +std::vector TStochEm::getOutput(void) +{ + std::vector out = {getName()}; + + return out; +} + +// setup /////////////////////////////////////////////////////////////////////// +void TStochEm::setup(void) +{ + if (!env().hasRegisteredObject("_" + getName() + "_weight")) + { + env().registerLattice("_" + getName() + "_weight"); + } + env().registerLattice(getName()); +} + +// execution /////////////////////////////////////////////////////////////////// +void TStochEm::execute(void) +{ + PhotonR photon(par().gauge, par().zmScheme); + EmField &a = *env().createLattice(getName()); + EmComp *w; + + if (!env().hasCreatedObject("_" + getName() + "_weight")) + { + LOG(Message) << "Caching stochatic EM potential weight (gauge: " + << par().gauge << ", zero-mode scheme: " + << par().zmScheme << ")..." << std::endl; + w = env().createLattice("_" + getName() + "_weight"); + photon.StochasticWeight(*w); + } + else + { + w = env().getObject("_" + getName() + "_weight"); + } + LOG(Message) << "Generating stochatic EM potential..." << std::endl; + photon.StochasticField(a, *env().get4dRng(), *w); +} diff --git a/extras/Hadrons/Modules/MGauge/StochEm.hpp b/extras/Hadrons/Modules/MGauge/StochEm.hpp new file mode 100644 index 00000000..04a7c48c --- /dev/null +++ b/extras/Hadrons/Modules/MGauge/StochEm.hpp @@ -0,0 +1,96 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/Modules/MGauge/StochEm.hpp + +Copyright (C) 2015 +Copyright (C) 2016 + + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +See the full license in the file "LICENSE" in the top level distribution directory +*************************************************************************************/ +/* END LEGAL */ +#ifndef Hadrons_StochEm_hpp_ +#define Hadrons_StochEm_hpp_ + +#include +#include +#include + +BEGIN_HADRONS_NAMESPACE + +/****************************************************************************** + * StochEm * + ******************************************************************************/ +BEGIN_MODULE_NAMESPACE(MGauge) + +template +class QedGimpl +{ +public: + typedef S Simd; + + template + using iImplGaugeLink = iScalar>>; + template + using iImplGaugeField = iVector>, Nd>; + + typedef iImplGaugeLink SiteGaugeLink; + typedef iImplGaugeField SiteGaugeField; + + typedef Lattice GaugeLinkField; + typedef Lattice GaugeField; +}; + +typedef QedGimpl QedGimplR; +typedef Photon PhotonR; + +class StochEmPar: Serializable +{ +public: + GRID_SERIALIZABLE_CLASS_MEMBERS(StochEmPar, + PhotonR::Gauge, gauge, + PhotonR::ZmScheme, zmScheme); +}; + +class TStochEm: public Module +{ +public: + typedef PhotonR::GaugeField EmField; + typedef PhotonR::GaugeLinkField EmComp; +public: + // constructor + TStochEm(const std::string name); + // destructor + virtual ~TStochEm(void) = default; + // dependency relation + virtual std::vector getInput(void); + virtual std::vector getOutput(void); + // setup + virtual void setup(void); + // execution + virtual void execute(void); +}; + +MODULE_REGISTER_NS(StochEm, TStochEm, MGauge); + +END_MODULE_NAMESPACE + +END_HADRONS_NAMESPACE + +#endif // Hadrons_StochEm_hpp_ diff --git a/extras/Hadrons/modules.inc b/extras/Hadrons/modules.inc index 4251ffa3..8b559024 100644 --- a/extras/Hadrons/modules.inc +++ b/extras/Hadrons/modules.inc @@ -1,6 +1,7 @@ modules_cc =\ Modules/MGauge/Load.cc \ Modules/MGauge/Random.cc \ + Modules/MGauge/StochEm.cc \ Modules/MGauge/Unit.cc modules_hpp =\ @@ -10,6 +11,7 @@ modules_hpp =\ Modules/MContraction/Meson.hpp \ Modules/MGauge/Load.hpp \ Modules/MGauge/Random.hpp \ + Modules/MGauge/StochEm.hpp \ Modules/MGauge/Unit.hpp \ Modules/MSolver/RBPrecCG.hpp \ Modules/MSource/Point.hpp \ From 52148463418c22fd114dee45c84b11e303010897 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Thu, 22 Dec 2016 12:41:56 +0000 Subject: [PATCH 197/807] Adding a resource manager --- lib/Grid.h | 2 + lib/qcd/action/ActionBase.h | 49 ++--- lib/qcd/action/gauge/WilsonGaugeAction.h | 17 +- lib/qcd/hmc/GenericHMCrunner.h | 257 +++++++++++------------ lib/qcd/hmc/HMC.h | 6 +- lib/qcd/hmc/HMCModules.h | 96 +++++++++ lib/qcd/hmc/HMCResourceManager.h | 110 ++++++++++ lib/qcd/hmc/integrators/Integrator.h | 19 +- tests/hmc/Test_hmc_WilsonGauge_Binary.cc | 188 ++++++----------- tests/solver/Test_dwf_cg_prec_LsVec.cc | 2 +- 10 files changed, 435 insertions(+), 311 deletions(-) create mode 100644 lib/qcd/hmc/HMCModules.h create mode 100644 lib/qcd/hmc/HMCResourceManager.h diff --git a/lib/Grid.h b/lib/Grid.h index 78b5a6bd..7eaf8511 100644 --- a/lib/Grid.h +++ b/lib/Grid.h @@ -87,6 +87,8 @@ Author: paboyle #include #include #include +#include +#include #include #include diff --git a/lib/qcd/action/ActionBase.h b/lib/qcd/action/ActionBase.h index 371ccd24..6ff4bcb1 100644 --- a/lib/qcd/action/ActionBase.h +++ b/lib/qcd/action/ActionBase.h @@ -36,14 +36,13 @@ template class Action { public: bool is_smeared = false; - // Boundary conditions? // Heatbath? - virtual void refresh(const GaugeField& U, - GridParallelRNG& pRNG) = 0; // refresh pseudofermions - virtual RealD S(const GaugeField& U) = 0; // evaluate the action - virtual void deriv(const GaugeField& U, - GaugeField& dSdU) = 0; // evaluate the action derivative - virtual std::string action_name() = 0; // return the action name - virtual ~Action(){}; + // Heatbath? + virtual void refresh(const GaugeField& U, const GridParallelRNG& pRNG) = 0; // refresh pseudofermions + virtual RealD S(const GaugeField& U) = 0; // evaluate the action + virtual void deriv(const GaugeField& U, GaugeField& dSdU) = 0; // evaluate the action derivative + virtual std::string action_name() = 0; // return the action name + virtual std::string LogParameters() = 0; // prints action parameters + virtual ~Action(){} }; // Indexing of tuple types @@ -60,32 +59,10 @@ struct Index> { static const std::size_t value = 1 + Index>::value; }; -/* -template -struct ActionLevel { - public: - typedef Action* - ActPtr; // now force the same colours as the rest of the code - - //Add supported representations here - - - unsigned int multiplier; - - std::vector actions; - - ActionLevel(unsigned int mul = 1) : actions(0), multiplier(mul) { - assert(mul >= 1); - }; - - void push_back(ActPtr ptr) { actions.push_back(ptr); } -}; -*/ - template struct ActionLevel { public: - unsigned int multiplier; + unsigned int multiplier; // Fundamental repr actions separated because of the smearing typedef Action* ActPtr; @@ -98,15 +75,13 @@ struct ActionLevel { std::vector& actions; - ActionLevel(unsigned int mul = 1) : actions(std::get<0>(actions_hirep)), multiplier(mul) { + explicit ActionLevel(unsigned int mul = 1) : actions(std::get<0>(actions_hirep)), multiplier(mul) { // initialize the hirep vectors to zero. - //apply(this->resize, actions_hirep, 0); //need a working resize + // apply(this->resize, actions_hirep, 0); //need a working resize assert(mul >= 1); - }; - - //void push_back(ActPtr ptr) { actions.push_back(ptr); } - + } + // void push_back(ActPtr ptr) { actions.push_back(ptr); } template < class GenField > void push_back(Action* ptr) { diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/lib/qcd/action/gauge/WilsonGaugeAction.h index aa61abf2..fd281e20 100644 --- a/lib/qcd/action/gauge/WilsonGaugeAction.h +++ b/lib/qcd/action/gauge/WilsonGaugeAction.h @@ -43,18 +43,22 @@ class WilsonGaugeAction : public Action { public: INHERIT_GIMPL_TYPES(Gimpl); - // typedef LorentzScalar GaugeLinkField; - private: RealD beta; public: - WilsonGaugeAction(RealD b) : beta(b){}; + explicit WilsonGaugeAction(RealD b) : beta(b){} - virtual std::string action_name(){return "WilsonGaugeAction";} + virtual std::string action_name() {return "WilsonGaugeAction";} + + virtual std::string LogParameters(){ + std::stringstream sstream; + sstream << GridLogMessage << "[WilsonGaugeAction] Beta: " << beta << std::endl; + return sstream.str(); + } virtual void refresh(const GaugeField &U, - GridParallelRNG &pRNG){}; // noop as no pseudoferms + const GridParallelRNG &pRNG){}; // noop as no pseudoferms virtual RealD S(const GaugeField &U) { RealD plaq = WilsonLoops::avgPlaquette(U); @@ -80,8 +84,7 @@ class WilsonGaugeAction : public Action { PokeIndex(dSdU, dSdU_mu, mu); } - - }; + } }; diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h index 2530559f..1d328f8e 100644 --- a/lib/qcd/hmc/GenericHMCrunner.h +++ b/lib/qcd/hmc/GenericHMCrunner.h @@ -30,176 +30,167 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef GRID_GENERIC_HMC_RUNNER #define GRID_GENERIC_HMC_RUNNER + +#include + namespace Grid { namespace QCD { -// Virtual Class for HMC specific for gauge theories -// implement a specific theory by defining the BuildTheAction -template +template class Integrator, + class RepresentationsPolicy = NoHirep > class BinaryHmcRunnerTemplate { public: - INHERIT_FIELD_TYPES(Implementation); - typedef Implementation ImplPolicy; + INHERIT_FIELD_TYPES(Implementation); + typedef Implementation ImplPolicy; // visible from outside + template < typename S = NoSmearing > + using IntegratorType = Integrator; - enum StartType_t { ColdStart, - HotStart, - TepidStart, - CheckpointStart }; + enum StartType_t + { + ColdStart, + HotStart, + TepidStart, + CheckpointStart, + FilenameStart + }; - ActionSet TheAction; + struct HMCPayload + { + StartType_t StartType; + HMCparameters Parameters; - // A vector of HmcObservable - // that can be injected from outside - std::vector *> - ObservablesList; + HMCPayload() { StartType = HotStart; } + }; - IntegratorParameters MDparameters; + // These can be rationalised, some private + HMCPayload Payload; // Parameters + HMCResourceManager Resources; + IntegratorParameters MDparameters; - GridCartesian * UGrid; - GridRedBlackCartesian *UrbGrid; + ActionSet TheAction; + + // A vector of HmcObservable that can be injected from outside + std::vector *> ObservablesList; + + //GridCartesian * UGrid; // These two are unnecessary, eliminate - GridCartesian * FGrid; - GridRedBlackCartesian *FrbGrid; + // GridRedBlackCartesian *UrbGrid; + // GridCartesian * FGrid; + // GridRedBlackCartesian *FrbGrid; - std::vector SerialSeed; - std::vector ParallelSeed; + void ReadCommandLine(int argc, char ** argv) { + std::string arg; - void RNGSeeds(std::vector S, std::vector P) { - SerialSeed = S; - ParallelSeed = P; - } + if (GridCmdOptionExists(argv, argv + argc, "--StartType")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--StartType"); + if (arg == "HotStart") { + Payload.StartType = HotStart; + } else if (arg == "ColdStart") { + Payload.StartType = ColdStart; + } else if (arg == "TepidStart") { + Payload.StartType = TepidStart; + } else if (arg == "CheckpointStart") { + Payload.StartType = CheckpointStart; + } else { + std::cout << GridLogError << "Unrecognized option in --StartType\n"; + std::cout + << GridLogError + << "Valid [HotStart, ColdStart, TepidStart, CheckpointStart]\n"; + assert(0); + } + } - virtual void BuildTheAction(int argc, char **argv) = 0; // necessary? + if (GridCmdOptionExists(argv, argv + argc, "--StartTrajectory")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--StartTrajectory"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + Payload.Parameters.StartTrajectory = ivec[0]; + } - // A couple of wrapper classes - template - void Run(int argc, char **argv, IOCheckpointer &Checkpoint) { - NoSmearing S; - Runner(argc, argv, Checkpoint, S); - } + if (GridCmdOptionExists(argv, argv + argc, "--Trajectories")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--Trajectories"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + Payload.Parameters.Trajectories = ivec[0]; + } - template - void Run(int argc, char **argv, IOCheckpointer &CP, SmearingPolicy &S) { - Runner(argc, argv, CP, S); - } - ////////////////////////////// + if (GridCmdOptionExists(argv, argv + argc, "--Thermalizations")) { + arg = GridCmdOptionPayload(argv, argv + argc, "--Thermalizations"); + std::vector ivec(0); + GridCmdOptionIntVector(arg, ivec); + Payload.Parameters.NoMetropolisUntil = ivec[0]; + } - + } + // A couple of wrapper functions + template void Run(IOCheckpointer &CP) { + NoSmearing S; + Runner(CP, S); + } - template - void Runner(int argc, - char ** argv, - IOCheckpointer &Checkpoint, - SmearingPolicy &Smearing) { - StartType_t StartType = HotStart; + template void Run(IOCheckpointer &CP, SmearingPolicy &S) { + Runner(CP, S); + } - std::string arg; + ////////////////////////////////////////////////////////////////// - if (GridCmdOptionExists(argv, argv + argc, "--StartType")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--StartType"); - if (arg == "HotStart") { - StartType = HotStart; - } else if (arg == "ColdStart") { - StartType = ColdStart; - } else if (arg == "TepidStart") { - StartType = TepidStart; - } else if (arg == "CheckpointStart") { - StartType = CheckpointStart; - } else { - std::cout << GridLogError << "Unrecognized option in --StartType\n"; - std::cout - << GridLogError - << "Valid [HotStart, ColdStart, TepidStart, CheckpointStart]\n"; - assert(0); - } - } +private: + template + void Runner(IOCheckpointer &Checkpoint, SmearingPolicy &Smearing) { + auto UGrid = Resources.GetCartesian(); + Resources.AddRNGs(); + Field U(UGrid); - int StartTraj = 0; - if (GridCmdOptionExists(argv, argv + argc, "--StartTrajectory")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--StartTrajectory"); - std::vector ivec(0); - GridCmdOptionIntVector(arg, ivec); - StartTraj = ivec[0]; - } + typedef IntegratorType TheIntegrator; + TheIntegrator MDynamics(UGrid, MDparameters, TheAction, Smearing); - int NumTraj = 1; - if (GridCmdOptionExists(argv, argv + argc, "--Trajectories")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--Trajectories"); - std::vector ivec(0); - GridCmdOptionIntVector(arg, ivec); - NumTraj = ivec[0]; - } - - int NumThermalizations = 10; - if (GridCmdOptionExists(argv, argv + argc, "--Thermalizations")) { - arg = GridCmdOptionPayload(argv, argv + argc, "--Thermalizations"); - std::vector ivec(0); - GridCmdOptionIntVector(arg, ivec); - NumThermalizations = ivec[0]; - } - - GridSerialRNG sRNG; - GridParallelRNG pRNG(UGrid); - Field U(UGrid); - - - typedef MinimumNorm2 IntegratorType; // change here to change the algorithm - IntegratorType MDynamics(UGrid, MDparameters, TheAction, Smearing); - - HMCparameters HMCpar; - HMCpar.StartTrajectory = StartTraj; - HMCpar.Trajectories = NumTraj; - HMCpar.NoMetropolisUntil = NumThermalizations; - - if (StartType == HotStart) { + if (Payload.StartType == HotStart) { // Hot start - HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerialSeed); - pRNG.SeedFixedIntegers(ParallelSeed); - Implementation::HotConfiguration(pRNG, U); - } else if (StartType == ColdStart) { + Payload.Parameters.MetropolisTest = true; + Resources.SeedFixedIntegers(); + Implementation::HotConfiguration(Resources.GetParallelRNG(), U); + } else if (Payload.StartType == ColdStart) { // Cold start - HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerialSeed); - pRNG.SeedFixedIntegers(ParallelSeed); - Implementation::ColdConfiguration(pRNG, U); - } else if (StartType == TepidStart) { + Payload.Parameters.MetropolisTest = true; + Resources.SeedFixedIntegers(); + Implementation::ColdConfiguration(Resources.GetParallelRNG(), U); + } else if (Payload.StartType == TepidStart) { // Tepid start - HMCpar.MetropolisTest = true; - sRNG.SeedFixedIntegers(SerialSeed); - pRNG.SeedFixedIntegers(ParallelSeed); - Implementation::TepidConfiguration(pRNG, U); - } else if (StartType == CheckpointStart) { - HMCpar.MetropolisTest = true; + Payload.Parameters.MetropolisTest = true; + Resources.SeedFixedIntegers(); + Implementation::TepidConfiguration(Resources.GetParallelRNG(), U); + } else if (Payload.StartType == CheckpointStart) { + Payload.Parameters.MetropolisTest = true; // CheckpointRestart - Checkpoint.CheckpointRestore(StartTraj, U, sRNG, pRNG); - } + Checkpoint.CheckpointRestore(Payload.Parameters.StartTrajectory, U, Resources.GetSerialRNG(), Resources.GetParallelRNG()); + } - Smearing.set_Field(U); + Smearing.set_Field(U); - HybridMonteCarlo HMC(HMCpar, MDynamics, sRNG, pRNG, U); + HybridMonteCarlo HMC(Payload.Parameters, MDynamics, Resources.GetSerialRNG(), Resources.GetParallelRNG(), U); - for (int obs = 0; obs < ObservablesList.size(); obs++) - HMC.AddObservable(ObservablesList[obs]); + for (int obs = 0; obs < ObservablesList.size(); obs++) + HMC.AddObservable(ObservablesList[obs]); // Run it - HMC.evolve(); - } + HMC.evolve(); +} }; - // These are for gauge fields - typedef BinaryHmcRunnerTemplate BinaryHmcRunner; - typedef BinaryHmcRunnerTemplate BinaryHmcRunnerF; - typedef BinaryHmcRunnerTemplate BinaryHmcRunnerD; +// These are for gauge fields, default integrator MinimumNorm2 +template