Hadrons: namespace macro to tackle GCC 5 bug

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

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,
-    public:
+                                    std::string, gauge,
-        GRID_SERIALIZABLE_CLASS_MEMBERS(DWFPar,
+                                    unsigned int, Ls,
-                                        std::string, gauge,
+                                    double      , mass,
-                                        unsigned int, Ls,
+                                    double      , M5);
-                                        double      , mass,
+};
-                                        double      , M5);
+
-    };
+class DWF: public Module<DWFPar>
-    
+{
-    class DWF: public Module<DWFPar>
+public:
-    {
+    // constructor
-    public:
+    DWF(const std::string name);
-        // constructor
+    // destructor
-        DWF(const std::string name);
+    virtual ~DWF(void) = default;
-        // destructor
+    // dependency relation
-        virtual ~DWF(void) = default;
+    virtual std::vector<std::string> getInput(void);
-        // dependency relation
+    virtual std::vector<std::string> getOutput(void);
-        virtual std::vector<std::string> getInput(void);
+    // setup
-        virtual std::vector<std::string> getOutput(void);
+    virtual void setup(void);
-        // setup
+    // execution
-        virtual void setup(void);
+    virtual void execute(void);
-        // execution
+};
-        virtual void execute(void);
+
-    };
+END_MODULE_NAMESPACE
-}
 
 MODULE_REGISTER_NS(DWF, MAction);
 

extras/Hadrons/Modules/MAction/Wilson.hpp

@@ -37,32 +37,33 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                            Wilson quark action                             *
  ******************************************************************************/
-namespace MAction
+BEGIN_MODULE_NAMESPACE(MAction)
-{
-    class WilsonPar: Serializable
-    {
-    public:
-        GRID_SERIALIZABLE_CLASS_MEMBERS(WilsonPar,
-                                        std::string, gauge,
-                                        double     , mass);
-    };
 
-    class Wilson: public Module<WilsonPar>
+class WilsonPar: Serializable
-    {
+{
-    public:
+public:
-        // constructor
+    GRID_SERIALIZABLE_CLASS_MEMBERS(WilsonPar,
-        Wilson(const std::string name);
+                                    std::string, gauge,
-        // destructor
+                                    double     , mass);
-        virtual ~Wilson(void) = default;
+};
-        // dependencies/products
+
-        virtual std::vector<std::string> getInput(void);
+class Wilson: public Module<WilsonPar>
-        virtual std::vector<std::string> getOutput(void);
+{
-        // setup
+public:
-        virtual void setup(void);
+    // constructor
-        // execution
+    Wilson(const std::string name);
-        virtual void execute(void);
+    // destructor
-    };
+    virtual ~Wilson(void) = default;
-}
+    // dependencies/products
+    virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getOutput(void);
+    // setup
+    virtual void setup(void);
+    // execution
+    virtual void execute(void);
+};
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Wilson, MAction);
 

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<MesonPar>
+{
+public:
+    class Result: Serializable
     {
     public:
-        GRID_SERIALIZABLE_CLASS_MEMBERS(MesonPar,
+        GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
-                                        std::string, q1,
+                                        std::vector<std::vector<std::vector<Complex>>>, corr);
-                                        std::string, q2,
-                                        std::string, output);
     };
-    
+public:
-    class Meson: public Module<MesonPar>
+    // constructor
-    {
+    Meson(const std::string name);
-    public:
+    // destructor
-        class Result: Serializable
+    virtual ~Meson(void) = default;
-        {
+    // dependencies/products
-        public:
+    virtual std::vector<std::string> getInput(void);
-            GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
+    virtual std::vector<std::string> getOutput(void);
-                                            std::vector<std::vector<std::vector<Complex>>>, corr);
+    // execution
-        };
+    virtual void execute(void);
-    public:
+};
-        // constructor
+
-        Meson(const std::string name);
+END_MODULE_NAMESPACE
-        // destructor
-        virtual ~Meson(void) = default;
-        // dependencies/products
-        virtual std::vector<std::string> getInput(void);
-        virtual std::vector<std::string> getOutput(void);
-        // execution
-        virtual void execute(void);
-    };
-}
 
 MODULE_REGISTER_NS(Meson, MContraction);
 

extras/Hadrons/Modules/MGauge/Load.hpp

@@ -37,31 +37,32 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                         Load a NERSC configuration                         *
  ******************************************************************************/
-namespace MGauge
+BEGIN_MODULE_NAMESPACE(MGauge)
-{
-    class LoadPar: Serializable
-    {
-    public:
-        GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPar,
-                                        std::string, file);
-    };
 
-    class Load: public Module<LoadPar>
+class LoadPar: Serializable
-    {
+{
-    public:
+public:
-        // constructor
+    GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPar,
-        Load(const std::string name);
+                                    std::string, file);
-        // destructor
+};
-        virtual ~Load(void) = default;
+
-        // dependency relation
+class Load: public Module<LoadPar>
-        virtual std::vector<std::string> getInput(void);
+{
-        virtual std::vector<std::string> getOutput(void);
+public:
-        // setup
+    // constructor
-        virtual void setup(void);
+    Load(const std::string name);
-        // execution
+    // destructor
-        virtual void execute(void);
+    virtual ~Load(void) = default;
-    };
+    // dependency relation
-}
+    virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getOutput(void);
+    // setup
+    virtual void setup(void);
+    // execution
+    virtual void execute(void);
+};
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Load, MGauge);
 

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<NoPar>
 {
-    class Random: public Module<NoPar>
+public:
-    {
+    // constructor
-    public:
+    Random(const std::string name);
-        // constructor
+    // destructor
-        Random(const std::string name);
+    virtual ~Random(void) = default;
-        // destructor
+    // dependency relation
-        virtual ~Random(void) = default;
+    virtual std::vector<std::string> getInput(void);
-        // dependency relation
+    virtual std::vector<std::string> getOutput(void);
-        virtual std::vector<std::string> getInput(void);
+    // setup
-        virtual std::vector<std::string> getOutput(void);
+    virtual void setup(void);
-        // setup
+    // execution
-        virtual void setup(void);
+    virtual void execute(void);
-        // execution
+};
-        virtual void execute(void);
+
-    };
+END_MODULE_NAMESPACE
-}
 
 MODULE_REGISTER_NS(Random, MGauge);
 

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<NoPar>
 {
-    class Unit: public Module<NoPar>
+public:
-    {
+    // constructor
-    public:
+    Unit(const std::string name);
-        // constructor
+    // destructor
-        Unit(const std::string name);
+    virtual ~Unit(void) = default;
-        // destructor
+    // dependencies/products
-        virtual ~Unit(void) = default;
+    virtual std::vector<std::string> getInput(void);
-        // dependencies/products
+    virtual std::vector<std::string> getOutput(void);
-        virtual std::vector<std::string> getInput(void);
+    // setup
-        virtual std::vector<std::string> getOutput(void);
+    virtual void setup(void);
-        // setup
+    // execution
-        virtual void setup(void);
+    virtual void execute(void);
-        // execution
+};
-        virtual void execute(void);
+
-    };
+END_MODULE_NAMESPACE
-}
 
 MODULE_REGISTER_NS(Unit, MGauge);
 

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,
-    public:
+                                    std::string, action,
-        GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar,
+                                    double     , residual);
-                                        std::string, action,
+};
-                                        double     , residual);
+
-    };
+class RBPrecCG: public Module<RBPrecCGPar>
-    
+{
-    class RBPrecCG: public Module<RBPrecCGPar>
+public:
-    {
+    // constructor
-    public:
+    RBPrecCG(const std::string name);
-        // constructor
+    // destructor
-        RBPrecCG(const std::string name);
+    virtual ~RBPrecCG(void) = default;
-        // destructor
+    // dependencies/products
-        virtual ~RBPrecCG(void) = default;
+    virtual std::vector<std::string> getInput(void);
-        // dependencies/products
+    virtual std::vector<std::string> getOutput(void);
-        virtual std::vector<std::string> getInput(void);
+    // setup
-        virtual std::vector<std::string> getOutput(void);
+    virtual void setup(void);
-        // setup
+    // execution
-        virtual void setup(void);
+    virtual void execute(void);
-        // execution
+};
-        virtual void execute(void);
+
-    };
+END_MODULE_NAMESPACE
-}
 
 MODULE_REGISTER_NS(RBPrecCG, MSolver);
 

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,
-    public:
+                                    std::string, position);
-        GRID_SERIALIZABLE_CLASS_MEMBERS(PointPar,
+};
-                                        std::string, position);
+
-    };
+class Point: public Module<PointPar>
-    
+{
-    class Point: public Module<PointPar>
+public:
-    {
+    // constructor
-    public:
+    Point(const std::string name);
-        // constructor
+    // destructor
-        Point(const std::string name);
+    virtual ~Point(void) = default;
-        // destructor
+    // dependency relation
-        virtual ~Point(void) = default;
+    virtual std::vector<std::string> getInput(void);
-        // dependency relation
+    virtual std::vector<std::string> getOutput(void);
-        virtual std::vector<std::string> getInput(void);
+    // setup
-        virtual std::vector<std::string> getOutput(void);
+    virtual void setup(void);
-        // setup
+    // execution
-        virtual void setup(void);
+    virtual void execute(void);
-        // execution
+};
-        virtual void execute(void);
+
-    };
+END_MODULE_NAMESPACE
-}
 
 MODULE_REGISTER_NS(Point, MSource);
 

extras/Hadrons/Modules/MSource/Z2.hpp

@@ -49,32 +49,33 @@ BEGIN_HADRONS_NAMESPACE
 /******************************************************************************
  *                                 Z2                                         *
  ******************************************************************************/
-namespace MSource
+BEGIN_MODULE_NAMESPACE(MSource)
-{
-    class Z2Par: Serializable
-    {
-    public:
-        GRID_SERIALIZABLE_CLASS_MEMBERS(Z2Par,
-                                        unsigned int, tA,
-                                        unsigned int, tB);
-    };
 
-    class Z2: public Module<Z2Par>
+class Z2Par: Serializable
-    {
+{
-    public:
+public:
-        // constructor
+    GRID_SERIALIZABLE_CLASS_MEMBERS(Z2Par,
-        Z2(const std::string name);
+                                    unsigned int, tA,
-        // destructor
+                                    unsigned int, tB);
-        virtual ~Z2(void) = default;
+};
-        // dependency relation
+
-        virtual std::vector<std::string> getInput(void);
+class Z2: public Module<Z2Par>
-        virtual std::vector<std::string> getOutput(void);
+{
-        // setup
+public:
-        virtual void setup(void);
+    // constructor
-        // execution
+    Z2(const std::string name);
-        virtual void execute(void);
+    // destructor
-    };
+    virtual ~Z2(void) = default;
-}
+    // dependency relation
+    virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getOutput(void);
+    // setup
+    virtual void setup(void);
+    // execution
+    virtual void execute(void);
+};
+
+END_MODULE_NAMESPACE
 
 MODULE_REGISTER_NS(Z2, MSource);
 

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,
-    public:
+                                    unsigned int, i);
-        GRID_SERIALIZABLE_CLASS_MEMBERS(___FILEBASENAME___Par,
+};
-                                        unsigned int, i);
+
-    };
+class ___FILEBASENAME___: public Module<___FILEBASENAME___Par>
-    
+{
-    class ___FILEBASENAME___: public Module<___FILEBASENAME___Par>
+public:
-    {
+    // constructor
-    public:
+    ___FILEBASENAME___(const std::string name);
-        // constructor
+    // destructor
-        ___FILEBASENAME___(const std::string name);
+    virtual ~___FILEBASENAME___(void) = default;
-        // destructor
+    // dependency relation
-        virtual ~___FILEBASENAME___(void) = default;
+    virtual std::vector<std::string> getInput(void);
-        // dependency relation
+    virtual std::vector<std::string> getOutput(void);
-        virtual std::vector<std::string> getInput(void);
+    // setup
-        virtual std::vector<std::string> getOutput(void);
+    virtual void setup(void);
-        // setup
+    // execution
-        virtual void setup(void);
+    virtual void execute(void);
-        // execution
+};
-        virtual void execute(void);
+
-    };
+END_MODULE_NAMESPACE
-}
 
 MODULE_REGISTER_NS(___FILEBASENAME___, ___NAMESPACE___);