From 677757cfebde4861d3701445dee19b9be209304e Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 25 Jan 2017 12:47:22 +0000 Subject: [PATCH 1/4] Added and tested SITMO PRNG --- configure.ac | 5 +- lib/lattice/Lattice_rng.h | 7 +- lib/sitmo_rng/sitmo_prng_engine.hpp | 385 ++++++++++++++++++++++++++++ 3 files changed, 395 insertions(+), 2 deletions(-) create mode 100644 lib/sitmo_rng/sitmo_prng_engine.hpp diff --git a/configure.ac b/configure.ac index f848bd23..d3ba9de2 100644 --- a/configure.ac +++ b/configure.ac @@ -319,7 +319,7 @@ AM_CONDITIONAL(BUILD_COMMS_MPI3L, [ test "${comms_type}X" == "mpi3lX" ] ) AM_CONDITIONAL(BUILD_COMMS_NONE, [ test "${comms_type}X" == "noneX" ]) ############### RNG selection -AC_ARG_ENABLE([rng],[AC_HELP_STRING([--enable-rng=ranlux48|mt19937],\ +AC_ARG_ENABLE([rng],[AC_HELP_STRING([--enable-rng=ranlux48|mt19937|sitmo],\ [Select Random Number Generator to be used])],\ [ac_RNG=${enable_rng}],[ac_RNG=ranlux48]) @@ -330,6 +330,9 @@ case ${ac_RNG} in mt19937) AC_DEFINE([RNG_MT19937],[1],[RNG_MT19937] ) ;; + sitmo) + AC_DEFINE([RNG_SITMO],[1],[RNG_SITMO] ) + ;; *) AC_MSG_ERROR([${ac_RNG} unsupported --enable-rng option]); ;; diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index 51cc16ec..2caf2de4 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -30,6 +30,7 @@ Author: paboyle #define GRID_LATTICE_RNG_H #include +#include namespace Grid { @@ -114,10 +115,14 @@ namespace Grid { typedef uint64_t RngStateType; typedef std::ranlux48 RngEngine; static const int RngStateCount = 15; -#else +#elif RNG_MT19937 typedef std::mt19937 RngEngine; typedef uint32_t RngStateType; static const int RngStateCount = std::mt19937::state_size; +#elif RNG_SITMO + typedef sitmo::prng_engine RngEngine; + typedef uint64_t RngStateType; + static const int RngStateCount = 4; #endif std::vector _generators; std::vector> _uniform; diff --git a/lib/sitmo_rng/sitmo_prng_engine.hpp b/lib/sitmo_rng/sitmo_prng_engine.hpp new file mode 100644 index 00000000..baa50390 --- /dev/null +++ b/lib/sitmo_rng/sitmo_prng_engine.hpp @@ -0,0 +1,385 @@ +// Copyright (c) 2012-2013 M.A. (Thijs) van den Berg, http://sitmo.com/ +// +// Use, modification and distribution are subject to the MIT Software License. +// +// The MIT License (MIT) +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +// version history: +// version 1, 6 Sep 2012 +// version 2, 10 Dec 2013 +// bug fix in the discard() routine, it was discarding to many elements +// added the version() method +// version 3...5, 13 Dec 2013 +// fixed type-conversion earning +// fixed potential issues with constructor template matching + +#ifndef SITMO_PRNG_ENGINE_HPP +#define SITMO_PRNG_ENGINE_HPP +#include + +#ifdef __GNUC__ + #include // respecting the C99 standard. +#endif +#ifdef _MSC_VER + typedef unsigned __int64 uint64_t; // Visual Studio 6.0(VC6) and newer.. + typedef unsigned __int32 uint32_t; +#endif + +// Double mixing function +#define MIX2(x0,x1,rx,z0,z1,rz) \ + x0 += x1; \ + z0 += z1; \ + x1 = (x1 << rx) | (x1 >> (64-rx)); \ + z1 = (z1 << rz) | (z1 >> (64-rz)); \ + x1 ^= x0; \ + z1 ^= z0; + + +// Double mixing function with key adition +#define MIXK(x0,x1,rx,z0,z1,rz,k0,k1,l0,l1) \ + x1 += k1; \ + z1 += l1; \ + x0 += x1+k0; \ + z0 += z1+l0; \ + x1 = (x1 << rx) | (x1 >> (64-rx)); \ + z1 = (z1 << rz) | (z1 >> (64-rz)); \ + x1 ^= x0; \ + z1 ^= z0; \ + + +namespace sitmo { + + // enable_if for C__98 compilers + template + struct sitmo_enable_if { typedef T type; }; + + template + struct sitmo_enable_if { }; + + // SFINAE check for the existence of a "void generate(int*,int*)"member function + template + struct has_generate_template + { + typedef char (&Two)[2];; + template struct helper {}; + template static char test(helper >*); + template static Two test(...); + static bool const value = sizeof(test(0)) == sizeof(char); + }; + + +class prng_engine +{ +public: + // "req" are requirements as stated in the C++ 11 draft n3242=11-0012 + // + // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 1 + typedef uint32_t result_type; + + // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 3 + static result_type (min)() { return 0; } + + // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 4 + static result_type (max)() { return 0xFFFFFFFF; } + + // ------------------------------------------------- + // Constructors + // ------------------------------------------------- + + // req: 26.5.1.4 Random number engine requirements, p.907 table 117, row 1 + // Creates an engine with the same initial state as all other + // default-constructed engines of type E. + prng_engine() + { + seed(); + } + + // req: 26.5.1.4 Random number engine requirements, p.907 table 117, row 2 + // Creates an engine that compares equal to x. + prng_engine(const prng_engine& x) + { + for (unsigned short i=0; i<4; ++i) { + _s[i] = x._s[i]; + _k[i] = x._k[i]; + _o[i] = x._o[i]; + } + _o_counter = x._o_counter; + } + + + // req: 26.5.1.4 Random number engine requirements, p.907 table 117, row 3 + // Creates an engine with initial O(size of state) state determined by s. + prng_engine(uint32_t s) + { + seed(s); + } + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 4 + // Creates an engine with an initial state that depends on a sequence + // produced by one call to q.generate. + template + prng_engine(Seq& q, typename sitmo_enable_if< has_generate_template::value >::type* = 0 ) + { + seed(q); + } + + // ------------------------------------------------- + // Seeding + // ------------------------------------------------- + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 5 + void seed() + { + for (unsigned short i=0; i<4; ++i) { + _k[i] = 0; + _s[i] = 0; + } + _o_counter = 0; + + _o[0] = 0x09218ebde6c85537; + _o[1] = 0x55941f5266d86105; + _o[2] = 0x4bd25e16282434dc; + _o[3] = 0xee29ec846bd2e40b; + } + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 6 + // s needs to be of return_type, which is uint32_t + void seed(uint32_t s) + { + for (unsigned short i=0; i<4; ++i) { + _k[i] = 0; + _s[i] = 0; + } + _k[0] = s; + _o_counter = 0; + + encrypt_counter(); + } + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 7 + template + void seed(Seq& q, typename sitmo_enable_if< has_generate_template::value >::type* = 0 ) + { + typename Seq::result_type w[8]; + q.generate(&w[0], &w[8]); + + for (unsigned short i=0; i<4; ++i) { + _k[i] = ( static_cast(w[2*i]) << 32) | w[2*i+1]; + _s[i] = 0; + } + _o_counter = 0; + + encrypt_counter(); + } + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 8 + // Advances e’s state ei to ei+1 = TA(ei) and returns GA(ei). + uint32_t operator()() + { + // can we return a value from the current block? + if (_o_counter < 8) { + unsigned short _o_index = _o_counter >> 1; + _o_counter++; + if (_o_counter&1) + return _o[_o_index] & 0xFFFFFFFF; + else + return _o[_o_index] >> 32; + } + + // generate a new block and return the first 32 bits + inc_counter(); + encrypt_counter(); + _o_counter = 1; // the next call + return _o[0] & 0xFFFFFFFF; // this call + } + + // ------------------------------------------------- + // misc + // ------------------------------------------------- + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 9 + // Advances e’s state ei to ei+z by any means equivalent to z + // consecutive calls e(). + void discard(uint64_t z) + { + // check if we stay in the current block + if (z < 8 - _o_counter) { + _o_counter += static_cast(z); + return; + } + + // we will have to generate a new block... + z -= (8 - _o_counter); // discard the remainder of the current blok + _o_counter = z % 8; // set the pointer in the correct element in the new block + z -= _o_counter; // update z + z >>= 3; // the number of buffers is elements/8 + ++z; // and one more because we crossed the buffer line + inc_counter(z); + encrypt_counter(); + } + + // ------------------------------------------------- + // IO + // ------------------------------------------------- + template + friend std::basic_ostream& + operator<<(std::basic_ostream& os, const prng_engine& s) { + for (unsigned short i=0; i<4; ++i) + os << s._k[i] << ' ' << s._s[i] << ' ' << s._o[i] << ' '; + os << s._o_counter; + return os; + } + + template + friend std::basic_istream& + operator>>(std::basic_istream& is, prng_engine& s) { + for (unsigned short i=0; i<4; ++i) + is >> s._k[i] >> s._s[i] >> s._o[i]; + is >> s._o_counter; + return is; + } + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 10 + // This operator is an equivalence relation. With Sx and Sy as the infinite + // sequences of values that would be generated by repeated future calls to + // x() and y(), respectively, returns true if Sx = Sy; else returns false. + bool operator==(const prng_engine& y) + { + if (_o_counter != y._o_counter) return false; + for (unsigned short i=0; i<4; ++i) { + if (_s[i] != y._s[i]) return false; + if (_k[i] != y._k[i]) return false; + if (_o[i] != y._o[i]) return false; + } + return true; + } + + // req: 26.5.1.4 Random number engine requirements, p.908 table 117, row 11 + bool operator!=(const prng_engine& y) + { + return !(*this == y); + } + + // Extra function to set the key + void set_key(uint64_t k0=0, uint64_t k1=0, uint64_t k2=0, uint64_t k3=0) + { + _k[0] = k0; _k[1] = k1; _k[2] = k2; _k[3] = k3; + encrypt_counter(); + } + + // set the counter + void set_counter(uint64_t s0=0, uint64_t s1=0, uint64_t s2=0, uint64_t s3=0, unsigned short o_counter=0) + { + _s[0] = s0; + _s[1] = s1; + _s[2] = s2; + _s[3] = s3; + _o_counter = o_counter % 8; + encrypt_counter(); + } + + + // versioning + uint32_t version() + { + return 5; + } + +private: + void encrypt_counter() + { + uint64_t b[4]; + uint64_t k[5]; + + for (unsigned short i=0; i<4; ++i) b[i] = _s[i]; + for (unsigned short i=0; i<4; ++i) k[i] = _k[i]; + + k[4] = 0x1BD11BDAA9FC1A22 ^ k[0] ^ k[1] ^ k[2] ^ k[3]; + + MIXK(b[0], b[1], 14, b[2], b[3], 16, k[0], k[1], k[2], k[3]); + MIX2(b[0], b[3], 52, b[2], b[1], 57); + MIX2(b[0], b[1], 23, b[2], b[3], 40); + MIX2(b[0], b[3], 5, b[2], b[1], 37); + MIXK(b[0], b[1], 25, b[2], b[3], 33, k[1], k[2], k[3], k[4]+1); + MIX2(b[0], b[3], 46, b[2], b[1], 12); + MIX2(b[0], b[1], 58, b[2], b[3], 22); + MIX2(b[0], b[3], 32, b[2], b[1], 32); + + MIXK(b[0], b[1], 14, b[2], b[3], 16, k[2], k[3], k[4], k[0]+2); + MIX2(b[0], b[3], 52, b[2], b[1], 57); + MIX2(b[0], b[1], 23, b[2], b[3], 40); + MIX2(b[0], b[3], 5, b[2], b[1], 37); + MIXK(b[0], b[1], 25, b[2], b[3], 33, k[3], k[4], k[0], k[1]+3); + + MIX2(b[0], b[3], 46, b[2], b[1], 12); + MIX2(b[0], b[1], 58, b[2], b[3], 22); + MIX2(b[0], b[3], 32, b[2], b[1], 32); + + MIXK(b[0], b[1], 14, b[2], b[3], 16, k[4], k[0], k[1], k[2]+4); + MIX2(b[0], b[3], 52, b[2], b[1], 57); + MIX2(b[0], b[1], 23, b[2], b[3], 40); + MIX2(b[0], b[3], 5, b[2], b[1], 37); + + for (unsigned int i=0; i<4; ++i) _o[i] = b[i] + k[i]; + _o[3] += 5; + } + + void inc_counter() + { + ++_s[0]; + if (_s[0] != 0) return; + + ++_s[1]; + if (_s[1] != 0) return; + + ++_s[2]; + if (_s[2] != 0) return; + + ++_s[3]; + } + + void inc_counter(uint64_t z) + { + if (z > 0xFFFFFFFFFFFFFFFF - _s[0]) { // check if we will overflow the first 64 bit int + ++_s[1]; + if (_s[1] == 0) { + ++_s[2]; + if (_s[2] == 0) { + ++_s[3]; + } + } + } + _s[0] += z; + } + +private: + uint64_t _k[4]; // key + uint64_t _s[4]; // state (counter) + uint64_t _o[4]; // cipher output 4 * 64 bit = 256 bit output + unsigned short _o_counter; // output chunk counter, the 256 random bits in _o + // are returned in eight 32 bit chunks +}; + + +} // namespace sitmo + +#undef MIXK +#undef MIX2 + +#endif \ No newline at end of file From 70ed9fc40cc71abb598ea41d96f1682680c2fb47 Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Wed, 25 Jan 2017 18:10:41 +0000 Subject: [PATCH 2/4] Updating the engine to the last version --- lib/sitmo_rng/sitmo_prng_engine.hpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/sitmo_rng/sitmo_prng_engine.hpp b/lib/sitmo_rng/sitmo_prng_engine.hpp index baa50390..c76a0080 100644 --- a/lib/sitmo_rng/sitmo_prng_engine.hpp +++ b/lib/sitmo_rng/sitmo_prng_engine.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2013 M.A. (Thijs) van den Berg, http://sitmo.com/ +// Copyright (c) 2012-2016 M.A. (Thijs) van den Berg, http://sitmo.com/ // // Use, modification and distribution are subject to the MIT Software License. // @@ -29,6 +29,8 @@ // version 3...5, 13 Dec 2013 // fixed type-conversion earning // fixed potential issues with constructor template matching +// version 6, 4 March 2016 +// made min() max() constexpr for C+11 compiler (thanks to James Joseph Balamuta) #ifndef SITMO_PRNG_ENGINE_HPP #define SITMO_PRNG_ENGINE_HPP @@ -92,12 +94,15 @@ public: // // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 1 typedef uint32_t result_type; - - // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 3 - static result_type (min)() { return 0; } - // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 4 + // req: 26.5.1.3 Uniform random number generator requirements, p.906, table 116, row 3 & 4 +#if __cplusplus <= 199711L + static result_type (min)() { return 0; } static result_type (max)() { return 0xFFFFFFFF; } +#else + static constexpr result_type (min)() { return 0; } + static constexpr result_type (max)() { return 0xFFFFFFFF; } +#endif // ------------------------------------------------- // Constructors From fad743fbb1504aa05be9e73167362fd2de5a1a5a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 26 Jan 2017 17:00:41 -0800 Subject: [PATCH 3/4] Build system sanity check: corrected several headers not in the format --- lib/Init.cc | 2 +- lib/Log.cc | 2 +- lib/PerfCount.cc | 4 ++-- lib/Stat.cc | 6 +++--- lib/algorithms/approx/MultiShiftFunction.cc | 2 +- lib/algorithms/approx/Remez.cc | 2 +- lib/algorithms/iterative/Matrix.h | 2 +- lib/communicator/Communicator_base.cc | 2 +- lib/communicator/Communicator_mpi.cc | 2 +- lib/communicator/Communicator_mpi3.cc | 2 +- lib/communicator/Communicator_none.cc | 2 +- lib/communicator/Communicator_shmem.cc | 2 +- lib/pugixml/pugixml.cc | 2 +- lib/qcd/action/fermion/CayleyFermion5D.cc | 2 +- lib/qcd/action/fermion/CayleyFermion5Dcache.cc | 2 +- lib/qcd/action/fermion/CayleyFermion5Ddense.cc | 2 +- lib/qcd/action/fermion/CayleyFermion5Dssp.cc | 2 +- lib/qcd/action/fermion/CayleyFermion5Dvec.cc | 2 +- lib/qcd/action/fermion/ContinuedFractionFermion5D.cc | 2 +- lib/qcd/action/fermion/PartialFractionFermion5D.cc | 2 +- lib/qcd/action/fermion/WilsonFermion.cc | 2 +- lib/qcd/action/fermion/WilsonFermion5D.cc | 4 ++-- lib/qcd/action/fermion/WilsonKernels.cc | 2 +- lib/qcd/action/fermion/WilsonKernelsAsm.cc | 2 +- lib/qcd/action/fermion/WilsonKernelsHand.cc | 2 +- lib/qcd/action/fermion/WilsonTMFermion.cc | 2 +- lib/qcd/hmc/HMC.cc | 2 +- lib/qcd/spin/Dirac.cc | 2 +- lib/qcd/utils/SpaceTimeGrid.cc | 2 +- lib/serialisation/BinaryIO.cc | 2 +- lib/serialisation/Hdf5IO.cc | 2 +- lib/serialisation/TextIO.cc | 2 +- lib/serialisation/XmlIO.cc | 2 +- lib/stencil/Lebesgue.cc | 2 +- lib/stencil/Stencil_common.cc | 2 +- tests/qdpxx/Test_qdpxx_loops_staples.cc | 2 +- tests/qdpxx/Test_qdpxx_munprec.cc | 2 +- 37 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/Init.cc b/lib/Init.cc index d6d6b9f8..5abe7a4b 100644 --- a/lib/Init.cc +++ b/lib/Init.cc @@ -41,7 +41,7 @@ Author: paboyle #include #include #include -#include +#include #include #include #include diff --git a/lib/Log.cc b/lib/Log.cc index 7521657b..1a7d8a58 100644 --- a/lib/Log.cc +++ b/lib/Log.cc @@ -29,7 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include #include diff --git a/lib/PerfCount.cc b/lib/PerfCount.cc index b61851a9..ba0241a2 100644 --- a/lib/PerfCount.cc +++ b/lib/PerfCount.cc @@ -26,8 +26,8 @@ Author: paboyle *************************************************************************************/ /* END LEGAL */ -#include -#include +#include +#include namespace Grid { diff --git a/lib/Stat.cc b/lib/Stat.cc index 7f2e4086..e6fa978e 100644 --- a/lib/Stat.cc +++ b/lib/Stat.cc @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include namespace Grid { diff --git a/lib/algorithms/approx/MultiShiftFunction.cc b/lib/algorithms/approx/MultiShiftFunction.cc index fc642ad7..24776e96 100644 --- a/lib/algorithms/approx/MultiShiftFunction.cc +++ b/lib/algorithms/approx/MultiShiftFunction.cc @@ -25,7 +25,7 @@ Author: Azusa Yamaguchi See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { double MultiShiftFunction::approx(double x) diff --git a/lib/algorithms/approx/Remez.cc b/lib/algorithms/approx/Remez.cc index 38d60088..ca00a330 100644 --- a/lib/algorithms/approx/Remez.cc +++ b/lib/algorithms/approx/Remez.cc @@ -20,7 +20,7 @@ #include #include -#include +#include // Constructor AlgRemez::AlgRemez(double lower, double upper, long precision) diff --git a/lib/algorithms/iterative/Matrix.h b/lib/algorithms/iterative/Matrix.h index afdda2d5..cb78a598 100644 --- a/lib/algorithms/iterative/Matrix.h +++ b/lib/algorithms/iterative/Matrix.h @@ -36,7 +36,7 @@ Author: Peter Boyle #include #include #include -#include +#include /** Sign function **/ diff --git a/lib/communicator/Communicator_base.cc b/lib/communicator/Communicator_base.cc index b003d867..f882d282 100644 --- a/lib/communicator/Communicator_base.cc +++ b/lib/communicator/Communicator_base.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include "Grid.h" +#include namespace Grid { /////////////////////////////////////////////////////////////// diff --git a/lib/communicator/Communicator_mpi.cc b/lib/communicator/Communicator_mpi.cc index 65ced9c7..7f29c239 100644 --- a/lib/communicator/Communicator_mpi.cc +++ b/lib/communicator/Communicator_mpi.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include "Grid.h" +#include #include namespace Grid { diff --git a/lib/communicator/Communicator_mpi3.cc b/lib/communicator/Communicator_mpi3.cc index c707ec1f..2e17e531 100644 --- a/lib/communicator/Communicator_mpi3.cc +++ b/lib/communicator/Communicator_mpi3.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include "Grid.h" +#include #include namespace Grid { diff --git a/lib/communicator/Communicator_none.cc b/lib/communicator/Communicator_none.cc index 5e91b305..af55af46 100644 --- a/lib/communicator/Communicator_none.cc +++ b/lib/communicator/Communicator_none.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include "Grid.h" +#include namespace Grid { /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/lib/communicator/Communicator_shmem.cc b/lib/communicator/Communicator_shmem.cc index 56e03224..b7a263a4 100644 --- a/lib/communicator/Communicator_shmem.cc +++ b/lib/communicator/Communicator_shmem.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include "Grid.h" +#include #include namespace Grid { diff --git a/lib/pugixml/pugixml.cc b/lib/pugixml/pugixml.cc index 525d1419..a4f8fde2 100644 --- a/lib/pugixml/pugixml.cc +++ b/lib/pugixml/pugixml.cc @@ -14,7 +14,7 @@ #ifndef SOURCE_PUGIXML_CPP #define SOURCE_PUGIXML_CPP -#include +#include #include #include diff --git a/lib/qcd/action/fermion/CayleyFermion5D.cc b/lib/qcd/action/fermion/CayleyFermion5D.cc index 781380e5..14b4edb6 100644 --- a/lib/qcd/action/fermion/CayleyFermion5D.cc +++ b/lib/qcd/action/fermion/CayleyFermion5D.cc @@ -30,7 +30,7 @@ Author: paboyle /* END LEGAL */ #include -#include +#include namespace Grid { diff --git a/lib/qcd/action/fermion/CayleyFermion5Dcache.cc b/lib/qcd/action/fermion/CayleyFermion5Dcache.cc index 8e7df945..84c8b5bf 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dcache.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dcache.cc @@ -29,7 +29,7 @@ Author: paboyle *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { diff --git a/lib/qcd/action/fermion/CayleyFermion5Ddense.cc b/lib/qcd/action/fermion/CayleyFermion5Ddense.cc index 5fa75b50..6c79da4b 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Ddense.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Ddense.cc @@ -30,7 +30,7 @@ Author: paboyle /* END LEGAL */ #include -#include +#include namespace Grid { diff --git a/lib/qcd/action/fermion/CayleyFermion5Dssp.cc b/lib/qcd/action/fermion/CayleyFermion5Dssp.cc index ad7daddb..0224e533 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dssp.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dssp.cc @@ -29,7 +29,7 @@ Author: paboyle *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc index ed742ea3..b99198fa 100644 --- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc +++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc @@ -30,7 +30,7 @@ Author: paboyle /* END LEGAL */ -#include +#include namespace Grid { diff --git a/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc b/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc index e58ab4da..73681a90 100644 --- a/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc +++ b/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc @@ -26,7 +26,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { namespace QCD { diff --git a/lib/qcd/action/fermion/PartialFractionFermion5D.cc b/lib/qcd/action/fermion/PartialFractionFermion5D.cc index 4fcb8784..0c3e9397 100644 --- a/lib/qcd/action/fermion/PartialFractionFermion5D.cc +++ b/lib/qcd/action/fermion/PartialFractionFermion5D.cc @@ -26,7 +26,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { namespace QCD { diff --git a/lib/qcd/action/fermion/WilsonFermion.cc b/lib/qcd/action/fermion/WilsonFermion.cc index 04c3671f..e2b02290 100644 --- a/lib/qcd/action/fermion/WilsonFermion.cc +++ b/lib/qcd/action/fermion/WilsonFermion.cc @@ -29,7 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { namespace QCD { diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/lib/qcd/action/fermion/WilsonFermion5D.cc index d70c98c3..252fe368 100644 --- a/lib/qcd/action/fermion/WilsonFermion5D.cc +++ b/lib/qcd/action/fermion/WilsonFermion5D.cc @@ -29,8 +29,8 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include -#include +#include +#include namespace Grid { namespace QCD { diff --git a/lib/qcd/action/fermion/WilsonKernels.cc b/lib/qcd/action/fermion/WilsonKernels.cc index 43776c86..68efd395 100644 --- a/lib/qcd/action/fermion/WilsonKernels.cc +++ b/lib/qcd/action/fermion/WilsonKernels.cc @@ -28,7 +28,7 @@ See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { namespace QCD { diff --git a/lib/qcd/action/fermion/WilsonKernelsAsm.cc b/lib/qcd/action/fermion/WilsonKernelsAsm.cc index d7a9edd3..6ab9961f 100644 --- a/lib/qcd/action/fermion/WilsonKernelsAsm.cc +++ b/lib/qcd/action/fermion/WilsonKernelsAsm.cc @@ -30,7 +30,7 @@ Author: Guido Cossu *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { diff --git a/lib/qcd/action/fermion/WilsonKernelsHand.cc b/lib/qcd/action/fermion/WilsonKernelsHand.cc index f5900832..ff1e0d29 100644 --- a/lib/qcd/action/fermion/WilsonKernelsHand.cc +++ b/lib/qcd/action/fermion/WilsonKernelsHand.cc @@ -26,7 +26,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include #define REGISTER diff --git a/lib/qcd/action/fermion/WilsonTMFermion.cc b/lib/qcd/action/fermion/WilsonTMFermion.cc index f74f9f00..1d59474e 100644 --- a/lib/qcd/action/fermion/WilsonTMFermion.cc +++ b/lib/qcd/action/fermion/WilsonTMFermion.cc @@ -25,7 +25,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { namespace QCD { diff --git a/lib/qcd/hmc/HMC.cc b/lib/qcd/hmc/HMC.cc index 3cb39111..6386f5bf 100644 --- a/lib/qcd/hmc/HMC.cc +++ b/lib/qcd/hmc/HMC.cc @@ -27,7 +27,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid{ namespace QCD{ diff --git a/lib/qcd/spin/Dirac.cc b/lib/qcd/spin/Dirac.cc index 8279a4a7..3e0c4b9b 100644 --- a/lib/qcd/spin/Dirac.cc +++ b/lib/qcd/spin/Dirac.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { diff --git a/lib/qcd/utils/SpaceTimeGrid.cc b/lib/qcd/utils/SpaceTimeGrid.cc index 695c7f69..81af5f24 100644 --- a/lib/qcd/utils/SpaceTimeGrid.cc +++ b/lib/qcd/utils/SpaceTimeGrid.cc @@ -25,7 +25,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include namespace Grid { namespace QCD { diff --git a/lib/serialisation/BinaryIO.cc b/lib/serialisation/BinaryIO.cc index ae0b0744..dbee9d8b 100644 --- a/lib/serialisation/BinaryIO.cc +++ b/lib/serialisation/BinaryIO.cc @@ -26,7 +26,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace std; diff --git a/lib/serialisation/Hdf5IO.cc b/lib/serialisation/Hdf5IO.cc index c5313495..b9bb0b87 100644 --- a/lib/serialisation/Hdf5IO.cc +++ b/lib/serialisation/Hdf5IO.cc @@ -1,4 +1,4 @@ -#include +#include using namespace Grid; #ifndef H5_NO_NAMESPACE diff --git a/lib/serialisation/TextIO.cc b/lib/serialisation/TextIO.cc index 39b987d0..ed6f4f5c 100644 --- a/lib/serialisation/TextIO.cc +++ b/lib/serialisation/TextIO.cc @@ -26,7 +26,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace std; diff --git a/lib/serialisation/XmlIO.cc b/lib/serialisation/XmlIO.cc index d8953a00..f8469ada 100644 --- a/lib/serialisation/XmlIO.cc +++ b/lib/serialisation/XmlIO.cc @@ -26,7 +26,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace std; diff --git a/lib/stencil/Lebesgue.cc b/lib/stencil/Lebesgue.cc index c83975a9..97dd2cf4 100644 --- a/lib/stencil/Lebesgue.cc +++ b/lib/stencil/Lebesgue.cc @@ -26,7 +26,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include #include namespace Grid { diff --git a/lib/stencil/Stencil_common.cc b/lib/stencil/Stencil_common.cc index af4e23fd..66fccb4c 100644 --- a/lib/stencil/Stencil_common.cc +++ b/lib/stencil/Stencil_common.cc @@ -26,7 +26,7 @@ Author: Peter Boyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include "Grid.h" +#include namespace Grid { } diff --git a/tests/qdpxx/Test_qdpxx_loops_staples.cc b/tests/qdpxx/Test_qdpxx_loops_staples.cc index c5999065..cf2e0796 100644 --- a/tests/qdpxx/Test_qdpxx_loops_staples.cc +++ b/tests/qdpxx/Test_qdpxx_loops_staples.cc @@ -25,7 +25,7 @@ Author: Azusa Yamaguchi See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include double calc_grid_p (Grid::QCD::LatticeGaugeField & lat); double calc_chroma_p (Grid::QCD::LatticeGaugeField & lat); diff --git a/tests/qdpxx/Test_qdpxx_munprec.cc b/tests/qdpxx/Test_qdpxx_munprec.cc index 2f847702..fd60566d 100644 --- a/tests/qdpxx/Test_qdpxx_munprec.cc +++ b/tests/qdpxx/Test_qdpxx_munprec.cc @@ -26,7 +26,7 @@ Author: paboyle See the full license in the file "LICENSE" in the top level distribution directory *************************************************************************************/ /* END LEGAL */ -#include +#include int Ls=8; double M5=1.6; From 3bf993d81ad0ae1a0c9491979681163ba1222c1c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 26 Jan 2017 17:00:59 -0800 Subject: [PATCH 4/4] gitignore update --- .gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5838caf7..3f6ea78e 100644 --- a/.gitignore +++ b/.gitignore @@ -104,4 +104,11 @@ lib/fftw/* # libtool macros # ################## m4/lt* -m4/libtool.m4 \ No newline at end of file +m4/libtool.m4 + +# Buck files # +############## +.buck* +buck-out +BUCK +make-bin-BUCK.sh