Merge branch 'develop' into feature/qed-fvol

2024-11-10 15:55:37 +00:00 · 2017-01-27 16:59:53 -08:00 · 2017-01-27 16:59:53 -08:00 · 28d99b5297
commit 28d99b5297
parent f3ca29af6c 3bf993d81a
39 changed files with 52 additions and 44 deletions
--- a/.gitignore
+++ b/.gitignore
@ -105,3 +105,10 @@ lib/fftw/*
 ##################
 m4/lt*
 m4/libtool.m4
+
+# Buck files #
+##############
+.buck*
+buck-out
+BUCK
+make-bin-BUCK.sh
--- a/lib/Init.cc
+++ b/lib/Init.cc
@ -41,7 +41,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include <signal.h>
 #include <iostream>
 #include <iterator>
-#include <Grid.h>
+#include <Grid/Grid.h>
 #include <algorithm>
 #include <iterator>
 #include <cstdlib>
--- 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 <Grid.h>
+#include <Grid/Grid.h>

 #include <cxxabi.h>

--- a/lib/PerfCount.cc
+++ b/lib/PerfCount.cc
@ -26,8 +26,8 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    *************************************************************************************/
    /*  END LEGAL */

-#include <Grid.h>
-#include <PerfCount.h>
+#include <Grid/Grid.h>
+#include <Grid/PerfCount.h>

 namespace Grid {

--- a/lib/Stat.cc
+++ b/lib/Stat.cc
@ -1,6 +1,6 @@
-#include <Grid.h>
-#include <PerfCount.h>
-#include <Stat.h>
+#include <Grid/Grid.h>
+#include <Grid/PerfCount.h>
+#include <Grid/Stat.h>


 namespace Grid { 
--- a/lib/algorithms/approx/MultiShiftFunction.cc
+++ b/lib/algorithms/approx/MultiShiftFunction.cc
@ -25,7 +25,7 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid {
 double MultiShiftFunction::approx(double x)
--- a/lib/algorithms/approx/Remez.cc
+++ b/lib/algorithms/approx/Remez.cc
@ -20,7 +20,7 @@
 #include<iomanip>
 #include<cassert>

-#include<algorithms/approx/Remez.h>
+#include<Grid/algorithms/approx/Remez.h>

 // Constructor
 AlgRemez::AlgRemez(double lower, double upper, long precision) 
--- a/lib/algorithms/iterative/Matrix.h
+++ b/lib/algorithms/iterative/Matrix.h
@ -36,7 +36,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <iomanip>
 #include <complex>
 #include <typeinfo>
-#include <Grid.h>
+#include <Grid/Grid.h>


 /** Sign function **/
--- a/lib/communicator/Communicator_base.cc
+++ b/lib/communicator/Communicator_base.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include "Grid.h"
+#include <Grid/Grid.h>
 namespace Grid {

 ///////////////////////////////////////////////////////////////
--- a/lib/communicator/Communicator_mpi.cc
+++ b/lib/communicator/Communicator_mpi.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include "Grid.h"
+#include <Grid/Grid.h>
 #include <mpi.h>

 namespace Grid {
--- a/lib/communicator/Communicator_mpi3.cc
+++ b/lib/communicator/Communicator_mpi3.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include "Grid.h"
+#include <Grid/Grid.h>
 #include <mpi.h>

 namespace Grid {
--- a/lib/communicator/Communicator_none.cc
+++ b/lib/communicator/Communicator_none.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include "Grid.h"
+#include <Grid/Grid.h>
 namespace Grid {

 ///////////////////////////////////////////////////////////////////////////////////////////////////
--- a/lib/communicator/Communicator_shmem.cc
+++ b/lib/communicator/Communicator_shmem.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include "Grid.h"
+#include <Grid/Grid.h>
 #include <mpp/shmem.h>

 namespace Grid {
--- a/lib/lattice/Lattice_transfer.h
+++ b/lib/lattice/Lattice_transfer.h
@ -386,7 +386,8 @@ void InsertSlice(Lattice<vobj> &lowDim,Lattice<vobj> & higherDim,int slice, int
  }

  // the above should guarantee that the operations are local
-  PARALLEL_FOR_LOOP
+  // Guido: check the threading here
+  //PARALLEL_FOR_LOOP
  for(int idx=0;idx<lg->lSites();idx++){
    std::vector<int> lcoor(nl);
    std::vector<int> hcoor(nh);
@ -428,7 +429,7 @@ void ExtractSlice(Lattice<vobj> &lowDim, Lattice<vobj> & higherDim,int slice, in
    }
  }
  // the above should guarantee that the operations are local
-  PARALLEL_FOR_LOOP
+  //PARALLEL_FOR_LOOP
  for(int idx=0;idx<lg->lSites();idx++){
    std::vector<int> lcoor(nl);
    std::vector<int> hcoor(nh);
--- a/lib/pugixml/pugixml.cc
+++ b/lib/pugixml/pugixml.cc
@ -14,7 +14,7 @@
 #ifndef SOURCE_PUGIXML_CPP
 #define SOURCE_PUGIXML_CPP

-#include <pugixml/pugixml.h>
+#include <Grid/pugixml/pugixml.h>

 #include <stdlib.h>
 #include <stdio.h>
--- a/lib/qcd/action/fermion/CayleyFermion5D.cc
+++ b/lib/qcd/action/fermion/CayleyFermion5D.cc
@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    /*  END LEGAL */

 #include <Grid/Eigen/Dense>
-#include <Grid.h>
+#include <Grid/Grid.h>


 namespace Grid {
--- a/lib/qcd/action/fermion/CayleyFermion5Dcache.cc
+++ b/lib/qcd/action/fermion/CayleyFermion5Dcache.cc
@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    *************************************************************************************/
    /*  END LEGAL */

-#include <Grid.h>
+#include <Grid/Grid.h>


 namespace Grid {
--- a/lib/qcd/action/fermion/CayleyFermion5Ddense.cc
+++ b/lib/qcd/action/fermion/CayleyFermion5Ddense.cc
@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    /*  END LEGAL */

 #include <Grid/Eigen/Dense>
-#include <Grid.h>
+#include <Grid/Grid.h>


 namespace Grid {
--- a/lib/qcd/action/fermion/CayleyFermion5Dssp.cc
+++ b/lib/qcd/action/fermion/CayleyFermion5Dssp.cc
@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    *************************************************************************************/
    /*  END LEGAL */

-#include <Grid.h>
+#include <Grid/Grid.h>


 namespace Grid {
--- a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc
+++ b/lib/qcd/action/fermion/CayleyFermion5Dvec.cc
@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    /*  END LEGAL */


-#include <Grid.h>
+#include <Grid/Grid.h>


 namespace Grid {
--- a/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc
+++ b/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc
@ -26,7 +26,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid {
  namespace QCD {
--- a/lib/qcd/action/fermion/PartialFractionFermion5D.cc
+++ b/lib/qcd/action/fermion/PartialFractionFermion5D.cc
@ -26,7 +26,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>
 namespace Grid {
  namespace QCD {

--- 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 <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid {
 namespace QCD {
--- a/lib/qcd/action/fermion/WilsonFermion5D.cc
+++ b/lib/qcd/action/fermion/WilsonFermion5D.cc
@ -29,8 +29,8 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
-#include <PerfCount.h>
+#include <Grid/Grid.h>
+#include <Grid/PerfCount.h>

 namespace Grid {
 namespace QCD {
--- 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 <Grid.h>
+#include <Grid/Grid.h>
 namespace Grid {
 namespace QCD {

--- a/lib/qcd/action/fermion/WilsonKernelsAsm.cc
+++ b/lib/qcd/action/fermion/WilsonKernelsAsm.cc
@ -30,7 +30,7 @@ Author: Guido Cossu <guido.cossu@ed.ac.uk>
 *************************************************************************************/
 /*  END LEGAL */

-#include <Grid.h>
+#include <Grid/Grid.h>


 namespace Grid {
--- a/lib/qcd/action/fermion/WilsonKernelsHand.cc
+++ b/lib/qcd/action/fermion/WilsonKernelsHand.cc
@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 #define REGISTER

--- a/lib/qcd/action/fermion/WilsonTMFermion.cc
+++ b/lib/qcd/action/fermion/WilsonTMFermion.cc
@ -25,7 +25,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid {
 namespace QCD {
--- a/lib/qcd/hmc/HMC.cc
+++ b/lib/qcd/hmc/HMC.cc
@ -27,7 +27,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid{
  namespace QCD{
--- a/lib/qcd/spin/Dirac.cc
+++ b/lib/qcd/spin/Dirac.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid {

--- a/lib/qcd/utils/SpaceTimeGrid.cc
+++ b/lib/qcd/utils/SpaceTimeGrid.cc
@ -25,7 +25,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 namespace Grid { 
  namespace QCD {
--- a/lib/serialisation/BinaryIO.cc
+++ b/lib/serialisation/BinaryIO.cc
@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 using namespace Grid;
 using namespace std;
--- a/lib/serialisation/Hdf5IO.cc
+++ b/lib/serialisation/Hdf5IO.cc
@ -1,4 +1,4 @@
-#include <Grid.h>
+#include <Grid/Grid.h>

 using namespace Grid;
 #ifndef H5_NO_NAMESPACE
--- a/lib/serialisation/TextIO.cc
+++ b/lib/serialisation/TextIO.cc
@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 using namespace Grid;
 using namespace std;
--- a/lib/serialisation/XmlIO.cc
+++ b/lib/serialisation/XmlIO.cc
@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 using namespace Grid;
 using namespace std;
--- a/lib/stencil/Lebesgue.cc
+++ b/lib/stencil/Lebesgue.cc
@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>
 #include <algorithm>

 namespace Grid {
--- a/lib/stencil/Stencil_common.cc
+++ b/lib/stencil/Stencil_common.cc
@ -26,7 +26,7 @@ Author: Peter Boyle <peterboyle@Peters-MacBook-Pro-2.local>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include "Grid.h"
+#include <Grid/Grid.h>

 namespace Grid {
 }
--- a/tests/qdpxx/Test_qdpxx_loops_staples.cc
+++ b/tests/qdpxx/Test_qdpxx_loops_staples.cc
@ -25,7 +25,7 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 double calc_grid_p      (Grid::QCD::LatticeGaugeField & lat);
 double calc_chroma_p    (Grid::QCD::LatticeGaugeField & lat);
--- a/tests/qdpxx/Test_qdpxx_munprec.cc
+++ b/tests/qdpxx/Test_qdpxx_munprec.cc
@ -26,7 +26,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
    See the full license in the file "LICENSE" in the top level distribution directory
    *************************************************************************************/
    /*  END LEGAL */
-#include <Grid.h>
+#include <Grid/Grid.h>

 int    Ls=8;
 double M5=1.6;