From fb7d021b9d0cd162587280702d09e48299d5a929 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 28 Aug 2018 15:00:40 +0100 Subject: [PATCH] Hadrons: moving Hadrons to root directory, build system improvements --- {lib => Grid}/DisableWarnings.h | 0 {lib => Grid}/Grid.h | 0 {lib => Grid}/GridCore.h | 0 {lib => Grid}/GridQCDcore.h | 0 {lib => Grid}/GridStd.h | 0 {lib => Grid}/Grid_Eigen_Dense.h | 0 {lib => Grid}/Makefile.am | 2 +- {lib => Grid}/algorithms/Algorithms.h | 0 {lib => Grid}/algorithms/CoarsenedMatrix.h | 0 {lib => Grid}/algorithms/FFT.h | 0 {lib => Grid}/algorithms/LinearOperator.h | 0 {lib => Grid}/algorithms/Preconditioner.h | 0 {lib => Grid}/algorithms/SparseMatrix.h | 0 {lib => Grid}/algorithms/approx/Chebyshev.h | 0 {lib => Grid}/algorithms/approx/Forecast.h | 0 {lib => Grid}/algorithms/approx/LICENSE | 0 .../algorithms/approx/MultiShiftFunction.cc | 0 .../algorithms/approx/MultiShiftFunction.h | 0 {lib => Grid}/algorithms/approx/README | 0 {lib => Grid}/algorithms/approx/Remez.cc | 0 {lib => Grid}/algorithms/approx/Remez.h | 0 {lib => Grid}/algorithms/approx/Zolotarev.cc | 0 {lib => Grid}/algorithms/approx/Zolotarev.h | 0 {lib => Grid}/algorithms/approx/bigfloat.h | 0 .../algorithms/approx/bigfloat_double.h | 0 .../algorithms/iterative/AdefGeneric.h | 0 .../iterative/BlockConjugateGradient.h | 0 .../algorithms/iterative/ConjugateGradient.h | 0 .../iterative/ConjugateGradientMixedPrec.h | 0 .../iterative/ConjugateGradientMultiShift.h | 0 .../ConjugateGradientReliableUpdate.h | 0 .../algorithms/iterative/ConjugateResidual.h | 0 .../algorithms/iterative/Deflation.h | 0 .../iterative/ImplicitlyRestartedLanczos.h | 0 .../iterative/LocalCoherenceLanczos.h | 0 .../algorithms/iterative/NormalEquations.h | 0 .../iterative/PrecConjugateResidual.h | 0 .../PrecGeneralisedConjugateResidual.h | 0 .../algorithms/iterative/SchurRedBlack.h | 0 {lib => Grid}/allocator/AlignedAllocator.cc | 0 {lib => Grid}/allocator/AlignedAllocator.h | 0 {lib => Grid}/cartesian/Cartesian.h | 0 {lib => Grid}/cartesian/Cartesian_base.h | 0 {lib => Grid}/cartesian/Cartesian_full.h | 0 {lib => Grid}/cartesian/Cartesian_red_black.h | 0 {lib => Grid}/communicator/Communicator.h | 0 .../communicator/Communicator_base.cc | 0 .../communicator/Communicator_base.h | 0 .../communicator/Communicator_mpi3.cc | 0 .../communicator/Communicator_none.cc | 0 {lib => Grid}/communicator/SharedMemory.cc | 0 {lib => Grid}/communicator/SharedMemory.h | 0 {lib => Grid}/communicator/SharedMemoryMPI.cc | 0 .../communicator/SharedMemoryNone.cc | 0 {lib => Grid}/cshift/Cshift.h | 0 {lib => Grid}/cshift/Cshift_common.h | 0 {lib => Grid}/cshift/Cshift_mpi.h | 0 {lib => Grid}/cshift/Cshift_none.h | 0 {lib => Grid}/json/json.hpp | 0 {lib => Grid}/lattice/Lattice.h | 0 {lib => Grid}/lattice/Lattice_ET.h | 0 {lib => Grid}/lattice/Lattice_arith.h | 0 {lib => Grid}/lattice/Lattice_base.h | 0 {lib => Grid}/lattice/Lattice_comparison.h | 0 .../lattice/Lattice_comparison_utils.h | 0 {lib => Grid}/lattice/Lattice_conformable.h | 0 {lib => Grid}/lattice/Lattice_coordinate.h | 0 {lib => Grid}/lattice/Lattice_local.h | 0 {lib => Grid}/lattice/Lattice_overload.h | 0 {lib => Grid}/lattice/Lattice_peekpoke.h | 0 {lib => Grid}/lattice/Lattice_reality.h | 0 {lib => Grid}/lattice/Lattice_reduction.h | 0 {lib => Grid}/lattice/Lattice_rng.h | 0 {lib => Grid}/lattice/Lattice_trace.h | 0 {lib => Grid}/lattice/Lattice_transfer.h | 0 {lib => Grid}/lattice/Lattice_transpose.h | 0 {lib => Grid}/lattice/Lattice_unary.h | 0 {lib => Grid}/lattice/Lattice_where.h | 0 {lib => Grid}/log/Log.cc | 0 {lib => Grid}/log/Log.h | 0 {lib => Grid}/parallelIO/BinaryIO.h | 0 {lib => Grid}/parallelIO/IldgIO.h | 0 {lib => Grid}/parallelIO/IldgIOtypes.h | 0 {lib => Grid}/parallelIO/MetaData.h | 0 {lib => Grid}/parallelIO/NerscIO.h | 0 {lib => Grid}/perfmon/PerfCount.cc | 0 {lib => Grid}/perfmon/PerfCount.h | 0 {lib => Grid}/perfmon/Stat.cc | 0 {lib => Grid}/perfmon/Stat.h | 0 {lib => Grid}/perfmon/Timer.h | 0 {lib => Grid}/pugixml/pugiconfig.hpp | 0 {lib => Grid}/pugixml/pugixml.cc | 0 {lib => Grid}/pugixml/pugixml.h | 0 {lib => Grid}/pugixml/readme.txt | 0 {lib => Grid}/qcd/LatticeTheories.h | 0 {lib => Grid}/qcd/QCD.h | 0 {lib => Grid}/qcd/action/Action.h | 0 {lib => Grid}/qcd/action/ActionBase.h | 0 {lib => Grid}/qcd/action/ActionCore.h | 0 {lib => Grid}/qcd/action/ActionParams.h | 0 {lib => Grid}/qcd/action/ActionSet.h | 0 .../qcd/action/fermion/AbstractEOFAFermion.h | 0 .../qcd/action/fermion/CayleyFermion5D.cc | 0 .../qcd/action/fermion/CayleyFermion5D.h | 0 .../action/fermion/CayleyFermion5Dcache.cc | 0 .../action/fermion/CayleyFermion5Ddense.cc | 0 .../qcd/action/fermion/CayleyFermion5Dssp.cc | 0 .../qcd/action/fermion/CayleyFermion5Dvec.cc | 0 .../fermion/ContinuedFractionFermion5D.cc | 0 .../fermion/ContinuedFractionFermion5D.h | 0 .../action/fermion/DomainWallEOFAFermion.cc | 0 .../action/fermion/DomainWallEOFAFermion.h | 0 .../fermion/DomainWallEOFAFermioncache.cc | 0 .../fermion/DomainWallEOFAFermiondense.cc | 0 .../fermion/DomainWallEOFAFermionssp.cc | 0 .../fermion/DomainWallEOFAFermionvec.cc | 0 .../qcd/action/fermion/DomainWallFermion.h | 0 {lib => Grid}/qcd/action/fermion/Fermion.h | 0 .../qcd/action/fermion/FermionCore.h | 0 .../qcd/action/fermion/FermionOperator.h | 0 .../qcd/action/fermion/FermionOperatorImpl.h | 0 .../fermion/ImprovedStaggeredFermion.cc | 0 .../action/fermion/ImprovedStaggeredFermion.h | 0 .../fermion/ImprovedStaggeredFermion5D.cc | 0 .../fermion/ImprovedStaggeredFermion5D.h | 0 .../qcd/action/fermion/MobiusEOFAFermion.cc | 0 .../qcd/action/fermion/MobiusEOFAFermion.h | 0 .../action/fermion/MobiusEOFAFermioncache.cc | 0 .../action/fermion/MobiusEOFAFermiondense.cc | 0 .../action/fermion/MobiusEOFAFermionssp.cc | 0 .../action/fermion/MobiusEOFAFermionvec.cc | 0 .../qcd/action/fermion/MobiusFermion.h | 0 .../action/fermion/MobiusZolotarevFermion.h | 0 .../fermion/OverlapWilsonCayleyTanhFermion.h | 0 .../OverlapWilsonCayleyZolotarevFermion.h | 0 .../OverlapWilsonContfracTanhFermion.h | 0 .../OverlapWilsonContfracZolotarevFermion.h | 0 .../OverlapWilsonPartialFractionTanhFermion.h | 0 ...lapWilsonPartialFractionZolotarevFermion.h | 0 .../fermion/PartialFractionFermion5D.cc | 0 .../action/fermion/PartialFractionFermion5D.h | 0 .../qcd/action/fermion/ScaledShamirFermion.h | 0 .../qcd/action/fermion/SchurDiagTwoKappa.h | 0 .../action/fermion/ShamirZolotarevFermion.h | 0 .../qcd/action/fermion/StaggeredKernels.cc | 0 .../qcd/action/fermion/StaggeredKernels.h | 0 .../qcd/action/fermion/StaggeredKernelsAsm.cc | 0 .../action/fermion/StaggeredKernelsHand.cc | 0 .../qcd/action/fermion/WilsonCloverFermion.cc | 0 .../qcd/action/fermion/WilsonCloverFermion.h | 0 .../qcd/action/fermion/WilsonCompressor.h | 0 .../qcd/action/fermion/WilsonFermion.cc | 0 .../qcd/action/fermion/WilsonFermion.h | 0 .../qcd/action/fermion/WilsonFermion5D.cc | 0 .../qcd/action/fermion/WilsonFermion5D.h | 0 .../qcd/action/fermion/WilsonKernels.cc | 0 .../qcd/action/fermion/WilsonKernels.h | 0 .../qcd/action/fermion/WilsonKernelsAsm.cc | 0 .../action/fermion/WilsonKernelsAsmAvx512.h | 0 .../qcd/action/fermion/WilsonKernelsAsmBody.h | 0 .../action/fermion/WilsonKernelsAsmBody.h.ab | 0 .../action/fermion/WilsonKernelsAsmBody.h.abc | 0 .../qcd/action/fermion/WilsonKernelsAsmQPX.h | 0 .../qcd/action/fermion/WilsonKernelsHand.cc | 0 .../fermion/WilsonKernelsHandGparity.cc | 0 .../qcd/action/fermion/WilsonTMFermion.cc | 0 .../qcd/action/fermion/WilsonTMFermion.h | 0 .../qcd/action/fermion/ZMobiusFermion.h | 0 .../qcd/action/fermion/g5HermitianLinop.h | 0 {lib => Grid}/qcd/action/gauge/Gauge.h | 0 .../qcd/action/gauge/GaugeImplTypes.h | 0 .../qcd/action/gauge/GaugeImplementations.h | 0 {lib => Grid}/qcd/action/gauge/Photon.h | 0 .../action/gauge/PlaqPlusRectangleAction.h | 0 .../qcd/action/gauge/WilsonGaugeAction.h | 0 .../EvenOddSchurDifferentiable.h | 0 .../pseudofermion/ExactOneFlavourRatio.h | 0 .../pseudofermion/OneFlavourEvenOddRational.h | 0 .../OneFlavourEvenOddRationalRatio.h | 0 .../action/pseudofermion/OneFlavourRational.h | 0 .../pseudofermion/OneFlavourRationalRatio.h | 0 .../qcd/action/pseudofermion/PseudoFermion.h | 0 .../qcd/action/pseudofermion/TwoFlavour.h | 0 .../action/pseudofermion/TwoFlavourEvenOdd.h | 0 .../pseudofermion/TwoFlavourEvenOddRatio.h | 0 .../action/pseudofermion/TwoFlavourRatio.h | 0 {lib => Grid}/qcd/action/scalar/Scalar.h | 0 .../qcd/action/scalar/ScalarAction.h | 0 {lib => Grid}/qcd/action/scalar/ScalarImpl.h | 0 .../action/scalar/ScalarInteractionAction.h | 0 {lib => Grid}/qcd/hmc/GenericHMCrunner.h | 0 {lib => Grid}/qcd/hmc/HMC.h | 0 {lib => Grid}/qcd/hmc/HMCModules.h | 0 {lib => Grid}/qcd/hmc/HMCResourceManager.h | 0 {lib => Grid}/qcd/hmc/HMCRunnerModule.h | 0 {lib => Grid}/qcd/hmc/HMC_GridModules.h | 0 {lib => Grid}/qcd/hmc/HMC_aggregate.h | 0 {lib => Grid}/qcd/hmc/UsingHMC.md | 0 .../qcd/hmc/checkpointers/BaseCheckpointer.h | 0 .../hmc/checkpointers/BinaryCheckpointer.h | 0 .../hmc/checkpointers/CheckPointerModules.h | 0 .../qcd/hmc/checkpointers/CheckPointers.h | 0 .../qcd/hmc/checkpointers/ILDGCheckpointer.h | 0 .../qcd/hmc/checkpointers/NerscCheckpointer.h | 0 .../hmc/checkpointers/ScidacCheckpointer.h | 0 .../qcd/hmc/integrators/Integrator.h | 0 .../hmc/integrators/Integrator_algorithm.h | 0 {lib => Grid}/qcd/modules/ActionModules.h | 0 {lib => Grid}/qcd/modules/Factory.h | 0 .../qcd/modules/FermionOperatorModules.h | 0 {lib => Grid}/qcd/modules/Modules.cc | 0 {lib => Grid}/qcd/modules/Modules.h | 0 {lib => Grid}/qcd/modules/ObservableModules.h | 0 {lib => Grid}/qcd/modules/Registration.h | 0 {lib => Grid}/qcd/modules/SolverModules.h | 0 {lib => Grid}/qcd/modules/mods.h | 0 .../qcd/observables/hmc_observable.h | 0 {lib => Grid}/qcd/observables/plaquette.h | 0 {lib => Grid}/qcd/observables/polyakov_loop.h | 0 .../qcd/observables/topological_charge.h | 0 .../qcd/representations/Representations.h | 0 {lib => Grid}/qcd/representations/adjoint.h | 0 .../qcd/representations/fundamental.h | 0 {lib => Grid}/qcd/representations/hmc_types.h | 0 {lib => Grid}/qcd/representations/two_index.h | 0 {lib => Grid}/qcd/smearing/APEsmearing.h | 0 {lib => Grid}/qcd/smearing/BaseSmearing.h | 0 .../qcd/smearing/GaugeConfiguration.h | 0 {lib => Grid}/qcd/smearing/Smearing.h | 0 {lib => Grid}/qcd/smearing/StoutSmearing.h | 0 {lib => Grid}/qcd/smearing/WilsonFlow.h | 0 {lib => Grid}/qcd/spin/Dirac.h | 0 {lib => Grid}/qcd/spin/Gamma.cc | 0 {lib => Grid}/qcd/spin/Gamma.h | 0 {lib => Grid}/qcd/spin/Spin.h | 0 {lib => Grid}/qcd/spin/TwoSpinor.h | 0 {lib => Grid}/qcd/spin/gamma-gen/gamma-gen.nb | 0 {lib => Grid}/qcd/utils/CovariantCshift.h | 0 {lib => Grid}/qcd/utils/CovariantLaplacian.h | 0 {lib => Grid}/qcd/utils/GaugeFix.h | 0 {lib => Grid}/qcd/utils/LinalgUtils.h | 0 {lib => Grid}/qcd/utils/Metric.h | 0 {lib => Grid}/qcd/utils/SUn.h | 0 {lib => Grid}/qcd/utils/SUnAdjoint.h | 0 {lib => Grid}/qcd/utils/SUnTwoIndex.h | 0 {lib => Grid}/qcd/utils/ScalarObjs.h | 0 {lib => Grid}/qcd/utils/SpaceTimeGrid.cc | 0 {lib => Grid}/qcd/utils/SpaceTimeGrid.h | 0 {lib => Grid}/qcd/utils/Utils.h | 0 {lib => Grid}/qcd/utils/WilsonLoops.h | 0 {lib => Grid}/serialisation/BaseIO.h | 0 {lib => Grid}/serialisation/BinaryIO.cc | 0 {lib => Grid}/serialisation/BinaryIO.h | 0 {lib => Grid}/serialisation/Hdf5IO.cc | 0 {lib => Grid}/serialisation/Hdf5IO.h | 0 {lib => Grid}/serialisation/Hdf5Type.h | 0 {lib => Grid}/serialisation/JSON_IO.cc | 0 {lib => Grid}/serialisation/JSON_IO.h | 0 {lib => Grid}/serialisation/MacroMagic.h | 0 {lib => Grid}/serialisation/Serialisation.h | 0 {lib => Grid}/serialisation/TextIO.cc | 0 {lib => Grid}/serialisation/TextIO.h | 0 {lib => Grid}/serialisation/VectorUtils.h | 0 {lib => Grid}/serialisation/XmlIO.cc | 0 {lib => Grid}/serialisation/XmlIO.h | 0 {lib => Grid}/simd/BGQQPX.h | 0 {lib => Grid}/simd/Grid_avx.h | 0 {lib => Grid}/simd/Grid_avx512.h | 0 {lib => Grid}/simd/Grid_generic.h | 0 {lib => Grid}/simd/Grid_generic_types.h | 0 {lib => Grid}/simd/Grid_imci.h | 0 {lib => Grid}/simd/Grid_neon.h | 0 {lib => Grid}/simd/Grid_qpx.h | 0 {lib => Grid}/simd/Grid_sse4.h | 0 {lib => Grid}/simd/Grid_vector_types.h | 0 {lib => Grid}/simd/Grid_vector_unops.h | 0 {lib => Grid}/simd/IBM_qpx.h | 0 {lib => Grid}/simd/IBM_qpx_double.h | 0 {lib => Grid}/simd/IBM_qpx_single.h | 0 {lib => Grid}/simd/Intel512avx.h | 0 {lib => Grid}/simd/Intel512common.h | 0 {lib => Grid}/simd/Intel512double.h | 0 {lib => Grid}/simd/Intel512imci.h | 0 {lib => Grid}/simd/Intel512single.h | 0 {lib => Grid}/simd/Intel512wilson.h | 0 {lib => Grid}/simd/Simd.h | 0 {lib => Grid}/simd/l1p.h | 0 {lib => Grid}/sitmo_rng/README | 0 {lib => Grid}/sitmo_rng/sitmo_prng_engine.hpp | 0 {lib => Grid}/stencil/Lebesgue.cc | 0 {lib => Grid}/stencil/Lebesgue.h | 0 {lib => Grid}/stencil/SimpleCompressor.h | 0 {lib => Grid}/stencil/Stencil.cc | 0 {lib => Grid}/stencil/Stencil.h | 0 {lib => Grid}/tensors/Tensor_Ta.h | 0 {lib => Grid}/tensors/Tensor_arith.h | 0 {lib => Grid}/tensors/Tensor_arith_add.h | 0 {lib => Grid}/tensors/Tensor_arith_mac.h | 0 {lib => Grid}/tensors/Tensor_arith_mul.h | 0 {lib => Grid}/tensors/Tensor_arith_scalar.h | 0 {lib => Grid}/tensors/Tensor_arith_sub.h | 0 {lib => Grid}/tensors/Tensor_class.h | 0 {lib => Grid}/tensors/Tensor_determinant.h | 0 {lib => Grid}/tensors/Tensor_exp.h | 0 {lib => Grid}/tensors/Tensor_extract_merge.h | 0 {lib => Grid}/tensors/Tensor_index.h | 0 {lib => Grid}/tensors/Tensor_inner.h | 0 {lib => Grid}/tensors/Tensor_logical.h | 0 {lib => Grid}/tensors/Tensor_outer.h | 0 {lib => Grid}/tensors/Tensor_reality.h | 0 {lib => Grid}/tensors/Tensor_trace.h | 0 {lib => Grid}/tensors/Tensor_traits.h | 0 {lib => Grid}/tensors/Tensor_transpose.h | 0 {lib => Grid}/tensors/Tensor_unary.h | 0 {lib => Grid}/tensors/Tensors.h | 0 {lib => Grid}/threads/Threads.h | 0 {lib => Grid}/util/CompilerCompatible.h | 0 {lib => Grid}/util/Init.cc | 0 {lib => Grid}/util/Init.h | 0 {lib => Grid}/util/Lexicographic.h | 0 {lib => Grid}/util/Profiling.h | 0 {lib => Grid}/util/Sha.h | 0 {lib => Grid}/util/Util.h | 0 {lib => Grid}/util/version.cc | 0 Grid/version.h | 1 + {extras/Hadrons => Hadrons}/A2AVectors.hpp | 6 +- {extras/Hadrons => Hadrons}/Application.cc | 6 +- {extras/Hadrons => Hadrons}/Application.hpp | 6 +- {extras/Hadrons => Hadrons}/DilutedNoise.hpp | 2 +- {extras/Hadrons => Hadrons}/EigenPack.hpp | 2 +- {extras/Hadrons => Hadrons}/Environment.cc | 6 +- {extras/Hadrons => Hadrons}/Environment.hpp | 2 +- {extras/Hadrons => Hadrons}/Exceptions.cc | 6 +- {extras/Hadrons => Hadrons}/Exceptions.hpp | 2 +- {extras/Hadrons => Hadrons}/Factory.hpp | 2 +- .../Hadrons => Hadrons}/GeneticScheduler.hpp | 4 +- {extras/Hadrons => Hadrons}/Global.cc | 2 +- {extras/Hadrons => Hadrons}/Global.hpp | 2 +- {extras/Hadrons => Hadrons}/Graph.hpp | 2 +- {extras/Hadrons => Hadrons}/HadronsXmlRun.cc | 2 +- {extras/Hadrons => Hadrons}/Makefile.am | 2 +- {extras/Hadrons => Hadrons}/Module.cc | 2 +- {extras/Hadrons => Hadrons}/Module.hpp | 4 +- {extras/Hadrons => Hadrons}/ModuleFactory.hpp | 6 +- Hadrons/Modules.hpp | 96 +++++++ .../Modules/MAction/DWF.cc | 2 +- .../Modules/MAction/DWF.hpp | 6 +- .../Modules/MAction/MobiusDWF.cc | 2 +- .../Modules/MAction/MobiusDWF.hpp | 6 +- .../Modules/MAction/ScaledDWF.cc | 2 +- .../Modules/MAction/ScaledDWF.hpp | 6 +- .../Modules/MAction/Wilson.cc | 2 +- .../Modules/MAction/Wilson.hpp | 6 +- .../Modules/MAction/WilsonClover.cc | 2 +- .../Modules/MAction/WilsonClover.hpp | 6 +- .../Modules/MAction/ZMobiusDWF.cc | 2 +- .../Modules/MAction/ZMobiusDWF.hpp | 6 +- .../Modules/MContraction/A2AMesonField.cc | 2 +- .../Modules/MContraction/A2AMesonField.hpp | 12 +- .../MContraction/A2AMesonFieldKernels.hpp | 4 +- .../Modules/MContraction/Baryon.cc | 2 +- .../Modules/MContraction/Baryon.hpp | 6 +- .../Modules/MContraction/DiscLoop.cc | 2 +- .../Modules/MContraction/DiscLoop.hpp | 6 +- .../Modules/MContraction/Gamma3pt.cc | 2 +- .../Modules/MContraction/Gamma3pt.hpp | 6 +- .../Modules/MContraction/Meson.cc | 2 +- .../Modules/MContraction/Meson.hpp | 6 +- .../Modules/MContraction/WardIdentity.cc | 2 +- .../Modules/MContraction/WardIdentity.hpp | 6 +- .../Modules/MContraction/WeakHamiltonian.hpp | 6 +- .../MContraction/WeakHamiltonianEye.cc | 2 +- .../MContraction/WeakHamiltonianEye.hpp | 2 +- .../MContraction/WeakHamiltonianNonEye.cc | 2 +- .../MContraction/WeakHamiltonianNonEye.hpp | 2 +- .../MContraction/WeakNeutral4ptDisc.cc | 2 +- .../MContraction/WeakNeutral4ptDisc.hpp | 2 +- .../Modules/MFermion/FreeProp.cc | 2 +- .../Modules/MFermion/FreeProp.hpp | 6 +- .../Modules/MFermion/GaugeProp.cc | 2 +- .../Modules/MFermion/GaugeProp.hpp | 8 +- .../Modules/MGauge/FundtoHirep.cc | 2 +- .../Modules/MGauge/FundtoHirep.hpp | 6 +- .../Modules/MGauge/Random.cc | 2 +- .../Modules/MGauge/Random.hpp | 6 +- .../Modules/MGauge/StochEm.cc | 2 +- .../Modules/MGauge/StochEm.hpp | 6 +- .../Modules/MGauge/StoutSmearing.cc | 2 +- .../Modules/MGauge/StoutSmearing.hpp | 6 +- .../Modules/MGauge/Unit.cc | 2 +- .../Modules/MGauge/Unit.hpp | 6 +- .../Modules/MGauge/UnitEm.cc | 2 +- .../Modules/MGauge/UnitEm.hpp | 6 +- .../Modules/MIO/LoadBinary.cc | 2 +- .../Modules/MIO/LoadBinary.hpp | 6 +- .../Modules/MIO/LoadCoarseEigenPack.cc | 2 +- .../Modules/MIO/LoadCoarseEigenPack.hpp | 8 +- .../Modules/MIO/LoadEigenPack.cc | 2 +- .../Modules/MIO/LoadEigenPack.hpp | 8 +- .../Modules/MIO/LoadNersc.cc | 2 +- .../Modules/MIO/LoadNersc.hpp | 6 +- .../Modules/MLoop/NoiseLoop.cc | 2 +- .../Modules/MLoop/NoiseLoop.hpp | 6 +- .../MNoise/TimeDilutedSpinColorDiagonal.cc | 2 +- .../MNoise/TimeDilutedSpinColorDiagonal.hpp | 8 +- .../Modules/MScalar/ChargedProp.cc | 4 +- .../Modules/MScalar/ChargedProp.hpp | 6 +- .../Modules/MScalar/FreeProp.cc | 4 +- .../Modules/MScalar/FreeProp.hpp | 6 +- .../Modules/MScalar/Scalar.hpp | 0 .../Modules/MScalar/ScalarVP.cc | 6 +- .../Modules/MScalar/ScalarVP.hpp | 6 +- .../Modules/MScalar/VPCounterTerms.cc | 4 +- .../Modules/MScalar/VPCounterTerms.hpp | 6 +- .../Modules/MScalarSUN/Div.cc | 2 +- .../Modules/MScalarSUN/Div.hpp | 8 +- .../Modules/MScalarSUN/EMT.cc | 2 +- .../Modules/MScalarSUN/EMT.hpp | 8 +- .../Modules/MScalarSUN/Grad.cc | 2 +- .../Modules/MScalarSUN/Grad.hpp | 8 +- .../Modules/MScalarSUN/ShiftProbe.cc | 2 +- .../Modules/MScalarSUN/ShiftProbe.hpp | 8 +- .../Modules/MScalarSUN/StochFreeField.cc | 2 +- .../Modules/MScalarSUN/StochFreeField.hpp | 6 +- .../Modules/MScalarSUN/TimeMomProbe.cc | 2 +- .../Modules/MScalarSUN/TimeMomProbe.hpp | 8 +- .../Modules/MScalarSUN/TrKinetic.cc | 2 +- .../Modules/MScalarSUN/TrKinetic.hpp | 8 +- .../Modules/MScalarSUN/TrMag.cc | 2 +- .../Modules/MScalarSUN/TrMag.hpp | 8 +- .../Modules/MScalarSUN/TrPhi.cc | 2 +- .../Modules/MScalarSUN/TrPhi.hpp | 8 +- .../Modules/MScalarSUN/TransProj.cc | 2 +- .../Modules/MScalarSUN/TransProj.hpp | 8 +- .../Modules/MScalarSUN/TwoPoint.cc | 2 +- .../Modules/MScalarSUN/TwoPoint.hpp | 8 +- .../Modules/MScalarSUN/TwoPointNPR.cc | 2 +- .../Modules/MScalarSUN/TwoPointNPR.hpp | 8 +- .../Modules/MScalarSUN/Utils.hpp | 4 +- .../Modules/MSink/Point.cc | 2 +- .../Modules/MSink/Point.hpp | 6 +- .../Modules/MSink/Smear.cc | 2 +- .../Modules/MSink/Smear.hpp | 6 +- .../Modules/MSolver/A2AVectors.cc | 2 +- .../Modules/MSolver/A2AVectors.hpp | 14 +- .../Modules/MSolver/LocalCoherenceLanczos.cc | 2 +- .../Modules/MSolver/LocalCoherenceLanczos.hpp | 8 +- .../Modules/MSolver/RBPrecCG.cc | 2 +- .../Modules/MSolver/RBPrecCG.hpp | 10 +- .../Modules/MSource/Point.cc | 2 +- .../Modules/MSource/Point.hpp | 6 +- .../Modules/MSource/SeqConserved.cc | 2 +- .../Modules/MSource/SeqConserved.hpp | 6 +- .../Modules/MSource/SeqGamma.cc | 2 +- .../Modules/MSource/SeqGamma.hpp | 6 +- .../Modules/MSource/Wall.cc | 2 +- .../Modules/MSource/Wall.hpp | 6 +- .../Hadrons => Hadrons}/Modules/MSource/Z2.cc | 2 +- .../Modules/MSource/Z2.hpp | 6 +- .../Modules/MUtilities/RandomVectors.cc | 2 +- .../Modules/MUtilities/RandomVectors.hpp | 6 +- .../Modules/MUtilities/TestSeqConserved.cc | 2 +- .../Modules/MUtilities/TestSeqConserved.hpp | 6 +- .../Modules/MUtilities/TestSeqGamma.cc | 2 +- .../Modules/MUtilities/TestSeqGamma.hpp | 6 +- .../templates/Module_in_NS.cc.template | 0 .../templates/Module_in_NS.hpp.template | 0 .../templates/Module_tmp_in_NS.cc.template | 0 .../templates/Module_tmp_in_NS.hpp.template | 0 {extras/Hadrons => Hadrons}/Solver.hpp | 2 +- {extras/Hadrons => Hadrons}/VirtualMachine.cc | 6 +- .../Hadrons => Hadrons}/VirtualMachine.hpp | 6 +- {extras/Hadrons => Hadrons}/add_module.sh | 0 .../add_module_template.sh | 0 .../Hadrons => Hadrons}/make_module_inst.sh | 0 .../Hadrons => Hadrons}/make_module_list.sh | 0 {extras/Hadrons => Hadrons}/modules.inc | 0 Makefile.am | 4 +- configure.ac | 15 +- extras/Hadrons/Modules.hpp | 96 ------- extras/Makefile.am | 1 - extras/qed-fvol/Global.cc | 11 - extras/qed-fvol/Global.hpp | 42 --- extras/qed-fvol/Makefile.am | 9 - extras/qed-fvol/WilsonLoops.h | 265 ------------------ extras/qed-fvol/qed-fvol.cc | 88 ------ lib/.dirstamp | 0 lib/Hadrons | 1 - lib/qcd/hmc/.dirstamp | 0 lib/qcd/hmc/integrators/.dirstamp | 0 lib/simd/.dirstamp | 0 scripts/filelist | 2 +- scripts/update_eigen.sh | 12 +- tests/hadrons/Test_QED.cc | 4 +- tests/hadrons/Test_free_prop.cc | 4 +- tests/hadrons/Test_hadrons.hpp | 4 +- tests/hadrons/Test_hadrons_meson_3pt.cc | 4 +- tests/hadrons/Test_hadrons_spectrum.cc | 4 +- tests/hadrons/Test_hadrons_wilsonFund.cc | 4 +- 499 files changed, 429 insertions(+), 846 deletions(-) rename {lib => Grid}/DisableWarnings.h (100%) rename {lib => Grid}/Grid.h (100%) rename {lib => Grid}/GridCore.h (100%) rename {lib => Grid}/GridQCDcore.h (100%) rename {lib => Grid}/GridStd.h (100%) rename {lib => Grid}/Grid_Eigen_Dense.h (100%) rename {lib => Grid}/Makefile.am (94%) rename {lib => Grid}/algorithms/Algorithms.h (100%) rename {lib => Grid}/algorithms/CoarsenedMatrix.h (100%) rename {lib => Grid}/algorithms/FFT.h (100%) rename {lib => Grid}/algorithms/LinearOperator.h (100%) rename {lib => Grid}/algorithms/Preconditioner.h (100%) rename {lib => Grid}/algorithms/SparseMatrix.h (100%) rename {lib => Grid}/algorithms/approx/Chebyshev.h (100%) rename {lib => Grid}/algorithms/approx/Forecast.h (100%) rename {lib => Grid}/algorithms/approx/LICENSE (100%) rename {lib => Grid}/algorithms/approx/MultiShiftFunction.cc (100%) rename {lib => Grid}/algorithms/approx/MultiShiftFunction.h (100%) rename {lib => Grid}/algorithms/approx/README (100%) rename {lib => Grid}/algorithms/approx/Remez.cc (100%) rename {lib => Grid}/algorithms/approx/Remez.h (100%) rename {lib => Grid}/algorithms/approx/Zolotarev.cc (100%) rename {lib => Grid}/algorithms/approx/Zolotarev.h (100%) rename {lib => Grid}/algorithms/approx/bigfloat.h (100%) rename {lib => Grid}/algorithms/approx/bigfloat_double.h (100%) rename {lib => Grid}/algorithms/iterative/AdefGeneric.h (100%) rename {lib => Grid}/algorithms/iterative/BlockConjugateGradient.h (100%) rename {lib => Grid}/algorithms/iterative/ConjugateGradient.h (100%) rename {lib => Grid}/algorithms/iterative/ConjugateGradientMixedPrec.h (100%) rename {lib => Grid}/algorithms/iterative/ConjugateGradientMultiShift.h (100%) rename {lib => Grid}/algorithms/iterative/ConjugateGradientReliableUpdate.h (100%) rename {lib => Grid}/algorithms/iterative/ConjugateResidual.h (100%) rename {lib => Grid}/algorithms/iterative/Deflation.h (100%) rename {lib => Grid}/algorithms/iterative/ImplicitlyRestartedLanczos.h (100%) rename {lib => Grid}/algorithms/iterative/LocalCoherenceLanczos.h (100%) rename {lib => Grid}/algorithms/iterative/NormalEquations.h (100%) rename {lib => Grid}/algorithms/iterative/PrecConjugateResidual.h (100%) rename {lib => Grid}/algorithms/iterative/PrecGeneralisedConjugateResidual.h (100%) rename {lib => Grid}/algorithms/iterative/SchurRedBlack.h (100%) rename {lib => Grid}/allocator/AlignedAllocator.cc (100%) rename {lib => Grid}/allocator/AlignedAllocator.h (100%) rename {lib => Grid}/cartesian/Cartesian.h (100%) rename {lib => Grid}/cartesian/Cartesian_base.h (100%) rename {lib => Grid}/cartesian/Cartesian_full.h (100%) rename {lib => Grid}/cartesian/Cartesian_red_black.h (100%) rename {lib => Grid}/communicator/Communicator.h (100%) rename {lib => Grid}/communicator/Communicator_base.cc (100%) rename {lib => Grid}/communicator/Communicator_base.h (100%) rename {lib => Grid}/communicator/Communicator_mpi3.cc (100%) rename {lib => Grid}/communicator/Communicator_none.cc (100%) rename {lib => Grid}/communicator/SharedMemory.cc (100%) rename {lib => Grid}/communicator/SharedMemory.h (100%) rename {lib => Grid}/communicator/SharedMemoryMPI.cc (100%) rename {lib => Grid}/communicator/SharedMemoryNone.cc (100%) rename {lib => Grid}/cshift/Cshift.h (100%) rename {lib => Grid}/cshift/Cshift_common.h (100%) rename {lib => Grid}/cshift/Cshift_mpi.h (100%) rename {lib => Grid}/cshift/Cshift_none.h (100%) rename {lib => Grid}/json/json.hpp (100%) rename {lib => Grid}/lattice/Lattice.h (100%) rename {lib => Grid}/lattice/Lattice_ET.h (100%) rename {lib => Grid}/lattice/Lattice_arith.h (100%) rename {lib => Grid}/lattice/Lattice_base.h (100%) rename {lib => Grid}/lattice/Lattice_comparison.h (100%) rename {lib => Grid}/lattice/Lattice_comparison_utils.h (100%) rename {lib => Grid}/lattice/Lattice_conformable.h (100%) rename {lib => Grid}/lattice/Lattice_coordinate.h (100%) rename {lib => Grid}/lattice/Lattice_local.h (100%) rename {lib => Grid}/lattice/Lattice_overload.h (100%) rename {lib => Grid}/lattice/Lattice_peekpoke.h (100%) rename {lib => Grid}/lattice/Lattice_reality.h (100%) rename {lib => Grid}/lattice/Lattice_reduction.h (100%) rename {lib => Grid}/lattice/Lattice_rng.h (100%) rename {lib => Grid}/lattice/Lattice_trace.h (100%) rename {lib => Grid}/lattice/Lattice_transfer.h (100%) rename {lib => Grid}/lattice/Lattice_transpose.h (100%) rename {lib => Grid}/lattice/Lattice_unary.h (100%) rename {lib => Grid}/lattice/Lattice_where.h (100%) rename {lib => Grid}/log/Log.cc (100%) rename {lib => Grid}/log/Log.h (100%) rename {lib => Grid}/parallelIO/BinaryIO.h (100%) rename {lib => Grid}/parallelIO/IldgIO.h (100%) rename {lib => Grid}/parallelIO/IldgIOtypes.h (100%) rename {lib => Grid}/parallelIO/MetaData.h (100%) rename {lib => Grid}/parallelIO/NerscIO.h (100%) rename {lib => Grid}/perfmon/PerfCount.cc (100%) rename {lib => Grid}/perfmon/PerfCount.h (100%) rename {lib => Grid}/perfmon/Stat.cc (100%) rename {lib => Grid}/perfmon/Stat.h (100%) rename {lib => Grid}/perfmon/Timer.h (100%) rename {lib => Grid}/pugixml/pugiconfig.hpp (100%) rename {lib => Grid}/pugixml/pugixml.cc (100%) rename {lib => Grid}/pugixml/pugixml.h (100%) rename {lib => Grid}/pugixml/readme.txt (100%) rename {lib => Grid}/qcd/LatticeTheories.h (100%) rename {lib => Grid}/qcd/QCD.h (100%) rename {lib => Grid}/qcd/action/Action.h (100%) rename {lib => Grid}/qcd/action/ActionBase.h (100%) rename {lib => Grid}/qcd/action/ActionCore.h (100%) rename {lib => Grid}/qcd/action/ActionParams.h (100%) rename {lib => Grid}/qcd/action/ActionSet.h (100%) rename {lib => Grid}/qcd/action/fermion/AbstractEOFAFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/CayleyFermion5D.cc (100%) rename {lib => Grid}/qcd/action/fermion/CayleyFermion5D.h (100%) rename {lib => Grid}/qcd/action/fermion/CayleyFermion5Dcache.cc (100%) rename {lib => Grid}/qcd/action/fermion/CayleyFermion5Ddense.cc (100%) rename {lib => Grid}/qcd/action/fermion/CayleyFermion5Dssp.cc (100%) rename {lib => Grid}/qcd/action/fermion/CayleyFermion5Dvec.cc (100%) rename {lib => Grid}/qcd/action/fermion/ContinuedFractionFermion5D.cc (100%) rename {lib => Grid}/qcd/action/fermion/ContinuedFractionFermion5D.h (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallEOFAFermion.cc (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallEOFAFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallEOFAFermioncache.cc (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallEOFAFermiondense.cc (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallEOFAFermionssp.cc (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallEOFAFermionvec.cc (100%) rename {lib => Grid}/qcd/action/fermion/DomainWallFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/Fermion.h (100%) rename {lib => Grid}/qcd/action/fermion/FermionCore.h (100%) rename {lib => Grid}/qcd/action/fermion/FermionOperator.h (100%) rename {lib => Grid}/qcd/action/fermion/FermionOperatorImpl.h (100%) rename {lib => Grid}/qcd/action/fermion/ImprovedStaggeredFermion.cc (100%) rename {lib => Grid}/qcd/action/fermion/ImprovedStaggeredFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/ImprovedStaggeredFermion5D.cc (100%) rename {lib => Grid}/qcd/action/fermion/ImprovedStaggeredFermion5D.h (100%) rename {lib => Grid}/qcd/action/fermion/MobiusEOFAFermion.cc (100%) rename {lib => Grid}/qcd/action/fermion/MobiusEOFAFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/MobiusEOFAFermioncache.cc (100%) rename {lib => Grid}/qcd/action/fermion/MobiusEOFAFermiondense.cc (100%) rename {lib => Grid}/qcd/action/fermion/MobiusEOFAFermionssp.cc (100%) rename {lib => Grid}/qcd/action/fermion/MobiusEOFAFermionvec.cc (100%) rename {lib => Grid}/qcd/action/fermion/MobiusFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/MobiusZolotarevFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/PartialFractionFermion5D.cc (100%) rename {lib => Grid}/qcd/action/fermion/PartialFractionFermion5D.h (100%) rename {lib => Grid}/qcd/action/fermion/ScaledShamirFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/SchurDiagTwoKappa.h (100%) rename {lib => Grid}/qcd/action/fermion/ShamirZolotarevFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/StaggeredKernels.cc (100%) rename {lib => Grid}/qcd/action/fermion/StaggeredKernels.h (100%) rename {lib => Grid}/qcd/action/fermion/StaggeredKernelsAsm.cc (100%) rename {lib => Grid}/qcd/action/fermion/StaggeredKernelsHand.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonCloverFermion.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonCloverFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonCompressor.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonFermion.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonFermion5D.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonFermion5D.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernels.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernels.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsAsm.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsAsmAvx512.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsAsmBody.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsAsmBody.h.ab (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsAsmBody.h.abc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsAsmQPX.h (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsHand.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonKernelsHandGparity.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonTMFermion.cc (100%) rename {lib => Grid}/qcd/action/fermion/WilsonTMFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/ZMobiusFermion.h (100%) rename {lib => Grid}/qcd/action/fermion/g5HermitianLinop.h (100%) rename {lib => Grid}/qcd/action/gauge/Gauge.h (100%) rename {lib => Grid}/qcd/action/gauge/GaugeImplTypes.h (100%) rename {lib => Grid}/qcd/action/gauge/GaugeImplementations.h (100%) rename {lib => Grid}/qcd/action/gauge/Photon.h (100%) rename {lib => Grid}/qcd/action/gauge/PlaqPlusRectangleAction.h (100%) rename {lib => Grid}/qcd/action/gauge/WilsonGaugeAction.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/ExactOneFlavourRatio.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/OneFlavourEvenOddRational.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/OneFlavourRational.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/OneFlavourRationalRatio.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/PseudoFermion.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/TwoFlavour.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/TwoFlavourEvenOdd.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h (100%) rename {lib => Grid}/qcd/action/pseudofermion/TwoFlavourRatio.h (100%) rename {lib => Grid}/qcd/action/scalar/Scalar.h (100%) rename {lib => Grid}/qcd/action/scalar/ScalarAction.h (100%) rename {lib => Grid}/qcd/action/scalar/ScalarImpl.h (100%) rename {lib => Grid}/qcd/action/scalar/ScalarInteractionAction.h (100%) rename {lib => Grid}/qcd/hmc/GenericHMCrunner.h (100%) rename {lib => Grid}/qcd/hmc/HMC.h (100%) rename {lib => Grid}/qcd/hmc/HMCModules.h (100%) rename {lib => Grid}/qcd/hmc/HMCResourceManager.h (100%) rename {lib => Grid}/qcd/hmc/HMCRunnerModule.h (100%) rename {lib => Grid}/qcd/hmc/HMC_GridModules.h (100%) rename {lib => Grid}/qcd/hmc/HMC_aggregate.h (100%) rename {lib => Grid}/qcd/hmc/UsingHMC.md (100%) rename {lib => Grid}/qcd/hmc/checkpointers/BaseCheckpointer.h (100%) rename {lib => Grid}/qcd/hmc/checkpointers/BinaryCheckpointer.h (100%) rename {lib => Grid}/qcd/hmc/checkpointers/CheckPointerModules.h (100%) rename {lib => Grid}/qcd/hmc/checkpointers/CheckPointers.h (100%) rename {lib => Grid}/qcd/hmc/checkpointers/ILDGCheckpointer.h (100%) rename {lib => Grid}/qcd/hmc/checkpointers/NerscCheckpointer.h (100%) rename {lib => Grid}/qcd/hmc/checkpointers/ScidacCheckpointer.h (100%) rename {lib => Grid}/qcd/hmc/integrators/Integrator.h (100%) rename {lib => Grid}/qcd/hmc/integrators/Integrator_algorithm.h (100%) rename {lib => Grid}/qcd/modules/ActionModules.h (100%) rename {lib => Grid}/qcd/modules/Factory.h (100%) rename {lib => Grid}/qcd/modules/FermionOperatorModules.h (100%) rename {lib => Grid}/qcd/modules/Modules.cc (100%) rename {lib => Grid}/qcd/modules/Modules.h (100%) rename {lib => Grid}/qcd/modules/ObservableModules.h (100%) rename {lib => Grid}/qcd/modules/Registration.h (100%) rename {lib => Grid}/qcd/modules/SolverModules.h (100%) rename {lib => Grid}/qcd/modules/mods.h (100%) rename {lib => Grid}/qcd/observables/hmc_observable.h (100%) rename {lib => Grid}/qcd/observables/plaquette.h (100%) rename {lib => Grid}/qcd/observables/polyakov_loop.h (100%) rename {lib => Grid}/qcd/observables/topological_charge.h (100%) rename {lib => Grid}/qcd/representations/Representations.h (100%) rename {lib => Grid}/qcd/representations/adjoint.h (100%) rename {lib => Grid}/qcd/representations/fundamental.h (100%) rename {lib => Grid}/qcd/representations/hmc_types.h (100%) rename {lib => Grid}/qcd/representations/two_index.h (100%) rename {lib => Grid}/qcd/smearing/APEsmearing.h (100%) rename {lib => Grid}/qcd/smearing/BaseSmearing.h (100%) rename {lib => Grid}/qcd/smearing/GaugeConfiguration.h (100%) rename {lib => Grid}/qcd/smearing/Smearing.h (100%) rename {lib => Grid}/qcd/smearing/StoutSmearing.h (100%) rename {lib => Grid}/qcd/smearing/WilsonFlow.h (100%) rename {lib => Grid}/qcd/spin/Dirac.h (100%) rename {lib => Grid}/qcd/spin/Gamma.cc (100%) rename {lib => Grid}/qcd/spin/Gamma.h (100%) rename {lib => Grid}/qcd/spin/Spin.h (100%) rename {lib => Grid}/qcd/spin/TwoSpinor.h (100%) rename {lib => Grid}/qcd/spin/gamma-gen/gamma-gen.nb (100%) rename {lib => Grid}/qcd/utils/CovariantCshift.h (100%) rename {lib => Grid}/qcd/utils/CovariantLaplacian.h (100%) rename {lib => Grid}/qcd/utils/GaugeFix.h (100%) rename {lib => Grid}/qcd/utils/LinalgUtils.h (100%) rename {lib => Grid}/qcd/utils/Metric.h (100%) rename {lib => Grid}/qcd/utils/SUn.h (100%) rename {lib => Grid}/qcd/utils/SUnAdjoint.h (100%) rename {lib => Grid}/qcd/utils/SUnTwoIndex.h (100%) rename {lib => Grid}/qcd/utils/ScalarObjs.h (100%) rename {lib => Grid}/qcd/utils/SpaceTimeGrid.cc (100%) rename {lib => Grid}/qcd/utils/SpaceTimeGrid.h (100%) rename {lib => Grid}/qcd/utils/Utils.h (100%) rename {lib => Grid}/qcd/utils/WilsonLoops.h (100%) rename {lib => Grid}/serialisation/BaseIO.h (100%) rename {lib => Grid}/serialisation/BinaryIO.cc (100%) rename {lib => Grid}/serialisation/BinaryIO.h (100%) rename {lib => Grid}/serialisation/Hdf5IO.cc (100%) rename {lib => Grid}/serialisation/Hdf5IO.h (100%) rename {lib => Grid}/serialisation/Hdf5Type.h (100%) rename {lib => Grid}/serialisation/JSON_IO.cc (100%) rename {lib => Grid}/serialisation/JSON_IO.h (100%) rename {lib => Grid}/serialisation/MacroMagic.h (100%) rename {lib => Grid}/serialisation/Serialisation.h (100%) rename {lib => Grid}/serialisation/TextIO.cc (100%) rename {lib => Grid}/serialisation/TextIO.h (100%) rename {lib => Grid}/serialisation/VectorUtils.h (100%) rename {lib => Grid}/serialisation/XmlIO.cc (100%) rename {lib => Grid}/serialisation/XmlIO.h (100%) rename {lib => Grid}/simd/BGQQPX.h (100%) rename {lib => Grid}/simd/Grid_avx.h (100%) rename {lib => Grid}/simd/Grid_avx512.h (100%) rename {lib => Grid}/simd/Grid_generic.h (100%) rename {lib => Grid}/simd/Grid_generic_types.h (100%) rename {lib => Grid}/simd/Grid_imci.h (100%) rename {lib => Grid}/simd/Grid_neon.h (100%) rename {lib => Grid}/simd/Grid_qpx.h (100%) rename {lib => Grid}/simd/Grid_sse4.h (100%) rename {lib => Grid}/simd/Grid_vector_types.h (100%) rename {lib => Grid}/simd/Grid_vector_unops.h (100%) rename {lib => Grid}/simd/IBM_qpx.h (100%) rename {lib => Grid}/simd/IBM_qpx_double.h (100%) rename {lib => Grid}/simd/IBM_qpx_single.h (100%) rename {lib => Grid}/simd/Intel512avx.h (100%) rename {lib => Grid}/simd/Intel512common.h (100%) rename {lib => Grid}/simd/Intel512double.h (100%) rename {lib => Grid}/simd/Intel512imci.h (100%) rename {lib => Grid}/simd/Intel512single.h (100%) rename {lib => Grid}/simd/Intel512wilson.h (100%) rename {lib => Grid}/simd/Simd.h (100%) rename {lib => Grid}/simd/l1p.h (100%) rename {lib => Grid}/sitmo_rng/README (100%) rename {lib => Grid}/sitmo_rng/sitmo_prng_engine.hpp (100%) rename {lib => Grid}/stencil/Lebesgue.cc (100%) rename {lib => Grid}/stencil/Lebesgue.h (100%) rename {lib => Grid}/stencil/SimpleCompressor.h (100%) rename {lib => Grid}/stencil/Stencil.cc (100%) rename {lib => Grid}/stencil/Stencil.h (100%) rename {lib => Grid}/tensors/Tensor_Ta.h (100%) rename {lib => Grid}/tensors/Tensor_arith.h (100%) rename {lib => Grid}/tensors/Tensor_arith_add.h (100%) rename {lib => Grid}/tensors/Tensor_arith_mac.h (100%) rename {lib => Grid}/tensors/Tensor_arith_mul.h (100%) rename {lib => Grid}/tensors/Tensor_arith_scalar.h (100%) rename {lib => Grid}/tensors/Tensor_arith_sub.h (100%) rename {lib => Grid}/tensors/Tensor_class.h (100%) rename {lib => Grid}/tensors/Tensor_determinant.h (100%) rename {lib => Grid}/tensors/Tensor_exp.h (100%) rename {lib => Grid}/tensors/Tensor_extract_merge.h (100%) rename {lib => Grid}/tensors/Tensor_index.h (100%) rename {lib => Grid}/tensors/Tensor_inner.h (100%) rename {lib => Grid}/tensors/Tensor_logical.h (100%) rename {lib => Grid}/tensors/Tensor_outer.h (100%) rename {lib => Grid}/tensors/Tensor_reality.h (100%) rename {lib => Grid}/tensors/Tensor_trace.h (100%) rename {lib => Grid}/tensors/Tensor_traits.h (100%) rename {lib => Grid}/tensors/Tensor_transpose.h (100%) rename {lib => Grid}/tensors/Tensor_unary.h (100%) rename {lib => Grid}/tensors/Tensors.h (100%) rename {lib => Grid}/threads/Threads.h (100%) rename {lib => Grid}/util/CompilerCompatible.h (100%) rename {lib => Grid}/util/Init.cc (100%) rename {lib => Grid}/util/Init.h (100%) rename {lib => Grid}/util/Lexicographic.h (100%) rename {lib => Grid}/util/Profiling.h (100%) rename {lib => Grid}/util/Sha.h (100%) rename {lib => Grid}/util/Util.h (100%) rename {lib => Grid}/util/version.cc (100%) create mode 100644 Grid/version.h rename {extras/Hadrons => Hadrons}/A2AVectors.hpp (98%) rename {extras/Hadrons => Hadrons}/Application.cc (98%) rename {extras/Hadrons => Hadrons}/Application.hpp (97%) rename {extras/Hadrons => Hadrons}/DilutedNoise.hpp (99%) rename {extras/Hadrons => Hadrons}/EigenPack.hpp (99%) rename {extras/Hadrons => Hadrons}/Environment.cc (98%) rename {extras/Hadrons => Hadrons}/Environment.hpp (99%) rename {extras/Hadrons => Hadrons}/Exceptions.cc (96%) rename {extras/Hadrons => Hadrons}/Exceptions.hpp (99%) rename {extras/Hadrons => Hadrons}/Factory.hpp (98%) rename {extras/Hadrons => Hadrons}/GeneticScheduler.hpp (99%) rename {extras/Hadrons => Hadrons}/Global.cc (99%) rename {extras/Hadrons => Hadrons}/Global.hpp (99%) rename {extras/Hadrons => Hadrons}/Graph.hpp (99%) rename {extras/Hadrons => Hadrons}/HadronsXmlRun.cc (98%) rename {extras/Hadrons => Hadrons}/Makefile.am (94%) rename {extras/Hadrons => Hadrons}/Module.cc (99%) rename {extras/Hadrons => Hadrons}/Module.hpp (99%) rename {extras/Hadrons => Hadrons}/ModuleFactory.hpp (93%) create mode 100644 Hadrons/Modules.hpp rename {extras/Hadrons => Hadrons}/Modules/MAction/DWF.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MAction/DWF.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MAction/MobiusDWF.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MAction/MobiusDWF.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MAction/ScaledDWF.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MAction/ScaledDWF.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MAction/Wilson.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MAction/Wilson.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MAction/WilsonClover.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MAction/WilsonClover.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MAction/ZMobiusDWF.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MAction/ZMobiusDWF.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/A2AMesonField.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/A2AMesonField.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/A2AMesonFieldKernels.hpp (99%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/Baryon.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/Baryon.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/DiscLoop.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/DiscLoop.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/Gamma3pt.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/Gamma3pt.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/Meson.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/Meson.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WardIdentity.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WardIdentity.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakHamiltonian.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakHamiltonianEye.cc (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakHamiltonianEye.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakHamiltonianNonEye.cc (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakHamiltonianNonEye.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakNeutral4ptDisc.cc (98%) rename {extras/Hadrons => Hadrons}/Modules/MContraction/WeakNeutral4ptDisc.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MFermion/FreeProp.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MFermion/FreeProp.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MFermion/GaugeProp.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MFermion/GaugeProp.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/FundtoHirep.cc (97%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/FundtoHirep.hpp (95%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/Random.cc (97%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/Random.hpp (94%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/StochEm.cc (98%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/StochEm.hpp (95%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/StoutSmearing.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/StoutSmearing.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/Unit.cc (97%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/Unit.hpp (94%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/UnitEm.cc (97%) rename {extras/Hadrons => Hadrons}/Modules/MGauge/UnitEm.hpp (95%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadBinary.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadBinary.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadCoarseEigenPack.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadCoarseEigenPack.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadEigenPack.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadEigenPack.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadNersc.cc (98%) rename {extras/Hadrons => Hadrons}/Modules/MIO/LoadNersc.hpp (95%) rename {extras/Hadrons => Hadrons}/Modules/MLoop/NoiseLoop.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MLoop/NoiseLoop.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/ChargedProp.cc (99%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/ChargedProp.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/FreeProp.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/FreeProp.hpp (95%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/Scalar.hpp (100%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/ScalarVP.cc (99%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/ScalarVP.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/VPCounterTerms.cc (98%) rename {extras/Hadrons => Hadrons}/Modules/MScalar/VPCounterTerms.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/Div.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/Div.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/EMT.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/EMT.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/Grad.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/Grad.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/ShiftProbe.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/ShiftProbe.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/StochFreeField.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/StochFreeField.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TimeMomProbe.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TimeMomProbe.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TrKinetic.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TrKinetic.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TrMag.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TrMag.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TrPhi.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TrPhi.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TransProj.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TransProj.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TwoPoint.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TwoPoint.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TwoPointNPR.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/TwoPointNPR.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MScalarSUN/Utils.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MSink/Point.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSink/Point.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MSink/Smear.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSink/Smear.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MSolver/A2AVectors.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSolver/A2AVectors.hpp (96%) rename {extras/Hadrons => Hadrons}/Modules/MSolver/LocalCoherenceLanczos.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MSolver/LocalCoherenceLanczos.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MSolver/RBPrecCG.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSolver/RBPrecCG.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MSource/Point.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSource/Point.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MSource/SeqConserved.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MSource/SeqConserved.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MSource/SeqGamma.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSource/SeqGamma.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MSource/Wall.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSource/Wall.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MSource/Z2.cc (96%) rename {extras/Hadrons => Hadrons}/Modules/MSource/Z2.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MUtilities/RandomVectors.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MUtilities/RandomVectors.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/MUtilities/TestSeqConserved.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MUtilities/TestSeqConserved.hpp (98%) rename {extras/Hadrons => Hadrons}/Modules/MUtilities/TestSeqGamma.cc (95%) rename {extras/Hadrons => Hadrons}/Modules/MUtilities/TestSeqGamma.hpp (97%) rename {extras/Hadrons => Hadrons}/Modules/templates/Module_in_NS.cc.template (100%) rename {extras/Hadrons => Hadrons}/Modules/templates/Module_in_NS.hpp.template (100%) rename {extras/Hadrons => Hadrons}/Modules/templates/Module_tmp_in_NS.cc.template (100%) rename {extras/Hadrons => Hadrons}/Modules/templates/Module_tmp_in_NS.hpp.template (100%) rename {extras/Hadrons => Hadrons}/Solver.hpp (98%) rename {extras/Hadrons => Hadrons}/VirtualMachine.cc (99%) rename {extras/Hadrons => Hadrons}/VirtualMachine.hpp (98%) rename {extras/Hadrons => Hadrons}/add_module.sh (100%) rename {extras/Hadrons => Hadrons}/add_module_template.sh (100%) rename {extras/Hadrons => Hadrons}/make_module_inst.sh (100%) rename {extras/Hadrons => Hadrons}/make_module_list.sh (100%) rename {extras/Hadrons => Hadrons}/modules.inc (100%) delete mode 100644 extras/Hadrons/Modules.hpp delete mode 100644 extras/Makefile.am delete mode 100644 extras/qed-fvol/Global.cc delete mode 100644 extras/qed-fvol/Global.hpp delete mode 100644 extras/qed-fvol/Makefile.am delete mode 100644 extras/qed-fvol/WilsonLoops.h delete mode 100644 extras/qed-fvol/qed-fvol.cc delete mode 100644 lib/.dirstamp delete mode 120000 lib/Hadrons delete mode 100644 lib/qcd/hmc/.dirstamp delete mode 100644 lib/qcd/hmc/integrators/.dirstamp delete mode 100644 lib/simd/.dirstamp diff --git a/lib/DisableWarnings.h b/Grid/DisableWarnings.h similarity index 100% rename from lib/DisableWarnings.h rename to Grid/DisableWarnings.h diff --git a/lib/Grid.h b/Grid/Grid.h similarity index 100% rename from lib/Grid.h rename to Grid/Grid.h diff --git a/lib/GridCore.h b/Grid/GridCore.h similarity index 100% rename from lib/GridCore.h rename to Grid/GridCore.h diff --git a/lib/GridQCDcore.h b/Grid/GridQCDcore.h similarity index 100% rename from lib/GridQCDcore.h rename to Grid/GridQCDcore.h diff --git a/lib/GridStd.h b/Grid/GridStd.h similarity index 100% rename from lib/GridStd.h rename to Grid/GridStd.h diff --git a/lib/Grid_Eigen_Dense.h b/Grid/Grid_Eigen_Dense.h similarity index 100% rename from lib/Grid_Eigen_Dense.h rename to Grid/Grid_Eigen_Dense.h diff --git a/lib/Makefile.am b/Grid/Makefile.am similarity index 94% rename from lib/Makefile.am rename to Grid/Makefile.am index 6c94e2d6..5cd76b40 100644 --- a/lib/Makefile.am +++ b/Grid/Makefile.am @@ -33,5 +33,5 @@ CCFILES += $(extra_sources) HFILES += $(extra_headers) libGrid_a_SOURCES = $(CCFILES) -libGrid_adir = $(pkgincludedir) +libGrid_adir = $(includedir)/Grid nobase_dist_pkginclude_HEADERS = $(HFILES) $(eigen_files) $(eigen_unsupp_files) Config.h diff --git a/lib/algorithms/Algorithms.h b/Grid/algorithms/Algorithms.h similarity index 100% rename from lib/algorithms/Algorithms.h rename to Grid/algorithms/Algorithms.h diff --git a/lib/algorithms/CoarsenedMatrix.h b/Grid/algorithms/CoarsenedMatrix.h similarity index 100% rename from lib/algorithms/CoarsenedMatrix.h rename to Grid/algorithms/CoarsenedMatrix.h diff --git a/lib/algorithms/FFT.h b/Grid/algorithms/FFT.h similarity index 100% rename from lib/algorithms/FFT.h rename to Grid/algorithms/FFT.h diff --git a/lib/algorithms/LinearOperator.h b/Grid/algorithms/LinearOperator.h similarity index 100% rename from lib/algorithms/LinearOperator.h rename to Grid/algorithms/LinearOperator.h diff --git a/lib/algorithms/Preconditioner.h b/Grid/algorithms/Preconditioner.h similarity index 100% rename from lib/algorithms/Preconditioner.h rename to Grid/algorithms/Preconditioner.h diff --git a/lib/algorithms/SparseMatrix.h b/Grid/algorithms/SparseMatrix.h similarity index 100% rename from lib/algorithms/SparseMatrix.h rename to Grid/algorithms/SparseMatrix.h diff --git a/lib/algorithms/approx/Chebyshev.h b/Grid/algorithms/approx/Chebyshev.h similarity index 100% rename from lib/algorithms/approx/Chebyshev.h rename to Grid/algorithms/approx/Chebyshev.h diff --git a/lib/algorithms/approx/Forecast.h b/Grid/algorithms/approx/Forecast.h similarity index 100% rename from lib/algorithms/approx/Forecast.h rename to Grid/algorithms/approx/Forecast.h diff --git a/lib/algorithms/approx/LICENSE b/Grid/algorithms/approx/LICENSE similarity index 100% rename from lib/algorithms/approx/LICENSE rename to Grid/algorithms/approx/LICENSE diff --git a/lib/algorithms/approx/MultiShiftFunction.cc b/Grid/algorithms/approx/MultiShiftFunction.cc similarity index 100% rename from lib/algorithms/approx/MultiShiftFunction.cc rename to Grid/algorithms/approx/MultiShiftFunction.cc diff --git a/lib/algorithms/approx/MultiShiftFunction.h b/Grid/algorithms/approx/MultiShiftFunction.h similarity index 100% rename from lib/algorithms/approx/MultiShiftFunction.h rename to Grid/algorithms/approx/MultiShiftFunction.h diff --git a/lib/algorithms/approx/README b/Grid/algorithms/approx/README similarity index 100% rename from lib/algorithms/approx/README rename to Grid/algorithms/approx/README diff --git a/lib/algorithms/approx/Remez.cc b/Grid/algorithms/approx/Remez.cc similarity index 100% rename from lib/algorithms/approx/Remez.cc rename to Grid/algorithms/approx/Remez.cc diff --git a/lib/algorithms/approx/Remez.h b/Grid/algorithms/approx/Remez.h similarity index 100% rename from lib/algorithms/approx/Remez.h rename to Grid/algorithms/approx/Remez.h diff --git a/lib/algorithms/approx/Zolotarev.cc b/Grid/algorithms/approx/Zolotarev.cc similarity index 100% rename from lib/algorithms/approx/Zolotarev.cc rename to Grid/algorithms/approx/Zolotarev.cc diff --git a/lib/algorithms/approx/Zolotarev.h b/Grid/algorithms/approx/Zolotarev.h similarity index 100% rename from lib/algorithms/approx/Zolotarev.h rename to Grid/algorithms/approx/Zolotarev.h diff --git a/lib/algorithms/approx/bigfloat.h b/Grid/algorithms/approx/bigfloat.h similarity index 100% rename from lib/algorithms/approx/bigfloat.h rename to Grid/algorithms/approx/bigfloat.h diff --git a/lib/algorithms/approx/bigfloat_double.h b/Grid/algorithms/approx/bigfloat_double.h similarity index 100% rename from lib/algorithms/approx/bigfloat_double.h rename to Grid/algorithms/approx/bigfloat_double.h diff --git a/lib/algorithms/iterative/AdefGeneric.h b/Grid/algorithms/iterative/AdefGeneric.h similarity index 100% rename from lib/algorithms/iterative/AdefGeneric.h rename to Grid/algorithms/iterative/AdefGeneric.h diff --git a/lib/algorithms/iterative/BlockConjugateGradient.h b/Grid/algorithms/iterative/BlockConjugateGradient.h similarity index 100% rename from lib/algorithms/iterative/BlockConjugateGradient.h rename to Grid/algorithms/iterative/BlockConjugateGradient.h diff --git a/lib/algorithms/iterative/ConjugateGradient.h b/Grid/algorithms/iterative/ConjugateGradient.h similarity index 100% rename from lib/algorithms/iterative/ConjugateGradient.h rename to Grid/algorithms/iterative/ConjugateGradient.h diff --git a/lib/algorithms/iterative/ConjugateGradientMixedPrec.h b/Grid/algorithms/iterative/ConjugateGradientMixedPrec.h similarity index 100% rename from lib/algorithms/iterative/ConjugateGradientMixedPrec.h rename to Grid/algorithms/iterative/ConjugateGradientMixedPrec.h diff --git a/lib/algorithms/iterative/ConjugateGradientMultiShift.h b/Grid/algorithms/iterative/ConjugateGradientMultiShift.h similarity index 100% rename from lib/algorithms/iterative/ConjugateGradientMultiShift.h rename to Grid/algorithms/iterative/ConjugateGradientMultiShift.h diff --git a/lib/algorithms/iterative/ConjugateGradientReliableUpdate.h b/Grid/algorithms/iterative/ConjugateGradientReliableUpdate.h similarity index 100% rename from lib/algorithms/iterative/ConjugateGradientReliableUpdate.h rename to Grid/algorithms/iterative/ConjugateGradientReliableUpdate.h diff --git a/lib/algorithms/iterative/ConjugateResidual.h b/Grid/algorithms/iterative/ConjugateResidual.h similarity index 100% rename from lib/algorithms/iterative/ConjugateResidual.h rename to Grid/algorithms/iterative/ConjugateResidual.h diff --git a/lib/algorithms/iterative/Deflation.h b/Grid/algorithms/iterative/Deflation.h similarity index 100% rename from lib/algorithms/iterative/Deflation.h rename to Grid/algorithms/iterative/Deflation.h diff --git a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h b/Grid/algorithms/iterative/ImplicitlyRestartedLanczos.h similarity index 100% rename from lib/algorithms/iterative/ImplicitlyRestartedLanczos.h rename to Grid/algorithms/iterative/ImplicitlyRestartedLanczos.h diff --git a/lib/algorithms/iterative/LocalCoherenceLanczos.h b/Grid/algorithms/iterative/LocalCoherenceLanczos.h similarity index 100% rename from lib/algorithms/iterative/LocalCoherenceLanczos.h rename to Grid/algorithms/iterative/LocalCoherenceLanczos.h diff --git a/lib/algorithms/iterative/NormalEquations.h b/Grid/algorithms/iterative/NormalEquations.h similarity index 100% rename from lib/algorithms/iterative/NormalEquations.h rename to Grid/algorithms/iterative/NormalEquations.h diff --git a/lib/algorithms/iterative/PrecConjugateResidual.h b/Grid/algorithms/iterative/PrecConjugateResidual.h similarity index 100% rename from lib/algorithms/iterative/PrecConjugateResidual.h rename to Grid/algorithms/iterative/PrecConjugateResidual.h diff --git a/lib/algorithms/iterative/PrecGeneralisedConjugateResidual.h b/Grid/algorithms/iterative/PrecGeneralisedConjugateResidual.h similarity index 100% rename from lib/algorithms/iterative/PrecGeneralisedConjugateResidual.h rename to Grid/algorithms/iterative/PrecGeneralisedConjugateResidual.h diff --git a/lib/algorithms/iterative/SchurRedBlack.h b/Grid/algorithms/iterative/SchurRedBlack.h similarity index 100% rename from lib/algorithms/iterative/SchurRedBlack.h rename to Grid/algorithms/iterative/SchurRedBlack.h diff --git a/lib/allocator/AlignedAllocator.cc b/Grid/allocator/AlignedAllocator.cc similarity index 100% rename from lib/allocator/AlignedAllocator.cc rename to Grid/allocator/AlignedAllocator.cc diff --git a/lib/allocator/AlignedAllocator.h b/Grid/allocator/AlignedAllocator.h similarity index 100% rename from lib/allocator/AlignedAllocator.h rename to Grid/allocator/AlignedAllocator.h diff --git a/lib/cartesian/Cartesian.h b/Grid/cartesian/Cartesian.h similarity index 100% rename from lib/cartesian/Cartesian.h rename to Grid/cartesian/Cartesian.h diff --git a/lib/cartesian/Cartesian_base.h b/Grid/cartesian/Cartesian_base.h similarity index 100% rename from lib/cartesian/Cartesian_base.h rename to Grid/cartesian/Cartesian_base.h diff --git a/lib/cartesian/Cartesian_full.h b/Grid/cartesian/Cartesian_full.h similarity index 100% rename from lib/cartesian/Cartesian_full.h rename to Grid/cartesian/Cartesian_full.h diff --git a/lib/cartesian/Cartesian_red_black.h b/Grid/cartesian/Cartesian_red_black.h similarity index 100% rename from lib/cartesian/Cartesian_red_black.h rename to Grid/cartesian/Cartesian_red_black.h diff --git a/lib/communicator/Communicator.h b/Grid/communicator/Communicator.h similarity index 100% rename from lib/communicator/Communicator.h rename to Grid/communicator/Communicator.h diff --git a/lib/communicator/Communicator_base.cc b/Grid/communicator/Communicator_base.cc similarity index 100% rename from lib/communicator/Communicator_base.cc rename to Grid/communicator/Communicator_base.cc diff --git a/lib/communicator/Communicator_base.h b/Grid/communicator/Communicator_base.h similarity index 100% rename from lib/communicator/Communicator_base.h rename to Grid/communicator/Communicator_base.h diff --git a/lib/communicator/Communicator_mpi3.cc b/Grid/communicator/Communicator_mpi3.cc similarity index 100% rename from lib/communicator/Communicator_mpi3.cc rename to Grid/communicator/Communicator_mpi3.cc diff --git a/lib/communicator/Communicator_none.cc b/Grid/communicator/Communicator_none.cc similarity index 100% rename from lib/communicator/Communicator_none.cc rename to Grid/communicator/Communicator_none.cc diff --git a/lib/communicator/SharedMemory.cc b/Grid/communicator/SharedMemory.cc similarity index 100% rename from lib/communicator/SharedMemory.cc rename to Grid/communicator/SharedMemory.cc diff --git a/lib/communicator/SharedMemory.h b/Grid/communicator/SharedMemory.h similarity index 100% rename from lib/communicator/SharedMemory.h rename to Grid/communicator/SharedMemory.h diff --git a/lib/communicator/SharedMemoryMPI.cc b/Grid/communicator/SharedMemoryMPI.cc similarity index 100% rename from lib/communicator/SharedMemoryMPI.cc rename to Grid/communicator/SharedMemoryMPI.cc diff --git a/lib/communicator/SharedMemoryNone.cc b/Grid/communicator/SharedMemoryNone.cc similarity index 100% rename from lib/communicator/SharedMemoryNone.cc rename to Grid/communicator/SharedMemoryNone.cc diff --git a/lib/cshift/Cshift.h b/Grid/cshift/Cshift.h similarity index 100% rename from lib/cshift/Cshift.h rename to Grid/cshift/Cshift.h diff --git a/lib/cshift/Cshift_common.h b/Grid/cshift/Cshift_common.h similarity index 100% rename from lib/cshift/Cshift_common.h rename to Grid/cshift/Cshift_common.h diff --git a/lib/cshift/Cshift_mpi.h b/Grid/cshift/Cshift_mpi.h similarity index 100% rename from lib/cshift/Cshift_mpi.h rename to Grid/cshift/Cshift_mpi.h diff --git a/lib/cshift/Cshift_none.h b/Grid/cshift/Cshift_none.h similarity index 100% rename from lib/cshift/Cshift_none.h rename to Grid/cshift/Cshift_none.h diff --git a/lib/json/json.hpp b/Grid/json/json.hpp similarity index 100% rename from lib/json/json.hpp rename to Grid/json/json.hpp diff --git a/lib/lattice/Lattice.h b/Grid/lattice/Lattice.h similarity index 100% rename from lib/lattice/Lattice.h rename to Grid/lattice/Lattice.h diff --git a/lib/lattice/Lattice_ET.h b/Grid/lattice/Lattice_ET.h similarity index 100% rename from lib/lattice/Lattice_ET.h rename to Grid/lattice/Lattice_ET.h diff --git a/lib/lattice/Lattice_arith.h b/Grid/lattice/Lattice_arith.h similarity index 100% rename from lib/lattice/Lattice_arith.h rename to Grid/lattice/Lattice_arith.h diff --git a/lib/lattice/Lattice_base.h b/Grid/lattice/Lattice_base.h similarity index 100% rename from lib/lattice/Lattice_base.h rename to Grid/lattice/Lattice_base.h diff --git a/lib/lattice/Lattice_comparison.h b/Grid/lattice/Lattice_comparison.h similarity index 100% rename from lib/lattice/Lattice_comparison.h rename to Grid/lattice/Lattice_comparison.h diff --git a/lib/lattice/Lattice_comparison_utils.h b/Grid/lattice/Lattice_comparison_utils.h similarity index 100% rename from lib/lattice/Lattice_comparison_utils.h rename to Grid/lattice/Lattice_comparison_utils.h diff --git a/lib/lattice/Lattice_conformable.h b/Grid/lattice/Lattice_conformable.h similarity index 100% rename from lib/lattice/Lattice_conformable.h rename to Grid/lattice/Lattice_conformable.h diff --git a/lib/lattice/Lattice_coordinate.h b/Grid/lattice/Lattice_coordinate.h similarity index 100% rename from lib/lattice/Lattice_coordinate.h rename to Grid/lattice/Lattice_coordinate.h diff --git a/lib/lattice/Lattice_local.h b/Grid/lattice/Lattice_local.h similarity index 100% rename from lib/lattice/Lattice_local.h rename to Grid/lattice/Lattice_local.h diff --git a/lib/lattice/Lattice_overload.h b/Grid/lattice/Lattice_overload.h similarity index 100% rename from lib/lattice/Lattice_overload.h rename to Grid/lattice/Lattice_overload.h diff --git a/lib/lattice/Lattice_peekpoke.h b/Grid/lattice/Lattice_peekpoke.h similarity index 100% rename from lib/lattice/Lattice_peekpoke.h rename to Grid/lattice/Lattice_peekpoke.h diff --git a/lib/lattice/Lattice_reality.h b/Grid/lattice/Lattice_reality.h similarity index 100% rename from lib/lattice/Lattice_reality.h rename to Grid/lattice/Lattice_reality.h diff --git a/lib/lattice/Lattice_reduction.h b/Grid/lattice/Lattice_reduction.h similarity index 100% rename from lib/lattice/Lattice_reduction.h rename to Grid/lattice/Lattice_reduction.h diff --git a/lib/lattice/Lattice_rng.h b/Grid/lattice/Lattice_rng.h similarity index 100% rename from lib/lattice/Lattice_rng.h rename to Grid/lattice/Lattice_rng.h diff --git a/lib/lattice/Lattice_trace.h b/Grid/lattice/Lattice_trace.h similarity index 100% rename from lib/lattice/Lattice_trace.h rename to Grid/lattice/Lattice_trace.h diff --git a/lib/lattice/Lattice_transfer.h b/Grid/lattice/Lattice_transfer.h similarity index 100% rename from lib/lattice/Lattice_transfer.h rename to Grid/lattice/Lattice_transfer.h diff --git a/lib/lattice/Lattice_transpose.h b/Grid/lattice/Lattice_transpose.h similarity index 100% rename from lib/lattice/Lattice_transpose.h rename to Grid/lattice/Lattice_transpose.h diff --git a/lib/lattice/Lattice_unary.h b/Grid/lattice/Lattice_unary.h similarity index 100% rename from lib/lattice/Lattice_unary.h rename to Grid/lattice/Lattice_unary.h diff --git a/lib/lattice/Lattice_where.h b/Grid/lattice/Lattice_where.h similarity index 100% rename from lib/lattice/Lattice_where.h rename to Grid/lattice/Lattice_where.h diff --git a/lib/log/Log.cc b/Grid/log/Log.cc similarity index 100% rename from lib/log/Log.cc rename to Grid/log/Log.cc diff --git a/lib/log/Log.h b/Grid/log/Log.h similarity index 100% rename from lib/log/Log.h rename to Grid/log/Log.h diff --git a/lib/parallelIO/BinaryIO.h b/Grid/parallelIO/BinaryIO.h similarity index 100% rename from lib/parallelIO/BinaryIO.h rename to Grid/parallelIO/BinaryIO.h diff --git a/lib/parallelIO/IldgIO.h b/Grid/parallelIO/IldgIO.h similarity index 100% rename from lib/parallelIO/IldgIO.h rename to Grid/parallelIO/IldgIO.h diff --git a/lib/parallelIO/IldgIOtypes.h b/Grid/parallelIO/IldgIOtypes.h similarity index 100% rename from lib/parallelIO/IldgIOtypes.h rename to Grid/parallelIO/IldgIOtypes.h diff --git a/lib/parallelIO/MetaData.h b/Grid/parallelIO/MetaData.h similarity index 100% rename from lib/parallelIO/MetaData.h rename to Grid/parallelIO/MetaData.h diff --git a/lib/parallelIO/NerscIO.h b/Grid/parallelIO/NerscIO.h similarity index 100% rename from lib/parallelIO/NerscIO.h rename to Grid/parallelIO/NerscIO.h diff --git a/lib/perfmon/PerfCount.cc b/Grid/perfmon/PerfCount.cc similarity index 100% rename from lib/perfmon/PerfCount.cc rename to Grid/perfmon/PerfCount.cc diff --git a/lib/perfmon/PerfCount.h b/Grid/perfmon/PerfCount.h similarity index 100% rename from lib/perfmon/PerfCount.h rename to Grid/perfmon/PerfCount.h diff --git a/lib/perfmon/Stat.cc b/Grid/perfmon/Stat.cc similarity index 100% rename from lib/perfmon/Stat.cc rename to Grid/perfmon/Stat.cc diff --git a/lib/perfmon/Stat.h b/Grid/perfmon/Stat.h similarity index 100% rename from lib/perfmon/Stat.h rename to Grid/perfmon/Stat.h diff --git a/lib/perfmon/Timer.h b/Grid/perfmon/Timer.h similarity index 100% rename from lib/perfmon/Timer.h rename to Grid/perfmon/Timer.h diff --git a/lib/pugixml/pugiconfig.hpp b/Grid/pugixml/pugiconfig.hpp similarity index 100% rename from lib/pugixml/pugiconfig.hpp rename to Grid/pugixml/pugiconfig.hpp diff --git a/lib/pugixml/pugixml.cc b/Grid/pugixml/pugixml.cc similarity index 100% rename from lib/pugixml/pugixml.cc rename to Grid/pugixml/pugixml.cc diff --git a/lib/pugixml/pugixml.h b/Grid/pugixml/pugixml.h similarity index 100% rename from lib/pugixml/pugixml.h rename to Grid/pugixml/pugixml.h diff --git a/lib/pugixml/readme.txt b/Grid/pugixml/readme.txt similarity index 100% rename from lib/pugixml/readme.txt rename to Grid/pugixml/readme.txt diff --git a/lib/qcd/LatticeTheories.h b/Grid/qcd/LatticeTheories.h similarity index 100% rename from lib/qcd/LatticeTheories.h rename to Grid/qcd/LatticeTheories.h diff --git a/lib/qcd/QCD.h b/Grid/qcd/QCD.h similarity index 100% rename from lib/qcd/QCD.h rename to Grid/qcd/QCD.h diff --git a/lib/qcd/action/Action.h b/Grid/qcd/action/Action.h similarity index 100% rename from lib/qcd/action/Action.h rename to Grid/qcd/action/Action.h diff --git a/lib/qcd/action/ActionBase.h b/Grid/qcd/action/ActionBase.h similarity index 100% rename from lib/qcd/action/ActionBase.h rename to Grid/qcd/action/ActionBase.h diff --git a/lib/qcd/action/ActionCore.h b/Grid/qcd/action/ActionCore.h similarity index 100% rename from lib/qcd/action/ActionCore.h rename to Grid/qcd/action/ActionCore.h diff --git a/lib/qcd/action/ActionParams.h b/Grid/qcd/action/ActionParams.h similarity index 100% rename from lib/qcd/action/ActionParams.h rename to Grid/qcd/action/ActionParams.h diff --git a/lib/qcd/action/ActionSet.h b/Grid/qcd/action/ActionSet.h similarity index 100% rename from lib/qcd/action/ActionSet.h rename to Grid/qcd/action/ActionSet.h diff --git a/lib/qcd/action/fermion/AbstractEOFAFermion.h b/Grid/qcd/action/fermion/AbstractEOFAFermion.h similarity index 100% rename from lib/qcd/action/fermion/AbstractEOFAFermion.h rename to Grid/qcd/action/fermion/AbstractEOFAFermion.h diff --git a/lib/qcd/action/fermion/CayleyFermion5D.cc b/Grid/qcd/action/fermion/CayleyFermion5D.cc similarity index 100% rename from lib/qcd/action/fermion/CayleyFermion5D.cc rename to Grid/qcd/action/fermion/CayleyFermion5D.cc diff --git a/lib/qcd/action/fermion/CayleyFermion5D.h b/Grid/qcd/action/fermion/CayleyFermion5D.h similarity index 100% rename from lib/qcd/action/fermion/CayleyFermion5D.h rename to Grid/qcd/action/fermion/CayleyFermion5D.h diff --git a/lib/qcd/action/fermion/CayleyFermion5Dcache.cc b/Grid/qcd/action/fermion/CayleyFermion5Dcache.cc similarity index 100% rename from lib/qcd/action/fermion/CayleyFermion5Dcache.cc rename to Grid/qcd/action/fermion/CayleyFermion5Dcache.cc diff --git a/lib/qcd/action/fermion/CayleyFermion5Ddense.cc b/Grid/qcd/action/fermion/CayleyFermion5Ddense.cc similarity index 100% rename from lib/qcd/action/fermion/CayleyFermion5Ddense.cc rename to Grid/qcd/action/fermion/CayleyFermion5Ddense.cc diff --git a/lib/qcd/action/fermion/CayleyFermion5Dssp.cc b/Grid/qcd/action/fermion/CayleyFermion5Dssp.cc similarity index 100% rename from lib/qcd/action/fermion/CayleyFermion5Dssp.cc rename to Grid/qcd/action/fermion/CayleyFermion5Dssp.cc diff --git a/lib/qcd/action/fermion/CayleyFermion5Dvec.cc b/Grid/qcd/action/fermion/CayleyFermion5Dvec.cc similarity index 100% rename from lib/qcd/action/fermion/CayleyFermion5Dvec.cc rename to Grid/qcd/action/fermion/CayleyFermion5Dvec.cc diff --git a/lib/qcd/action/fermion/ContinuedFractionFermion5D.cc b/Grid/qcd/action/fermion/ContinuedFractionFermion5D.cc similarity index 100% rename from lib/qcd/action/fermion/ContinuedFractionFermion5D.cc rename to Grid/qcd/action/fermion/ContinuedFractionFermion5D.cc diff --git a/lib/qcd/action/fermion/ContinuedFractionFermion5D.h b/Grid/qcd/action/fermion/ContinuedFractionFermion5D.h similarity index 100% rename from lib/qcd/action/fermion/ContinuedFractionFermion5D.h rename to Grid/qcd/action/fermion/ContinuedFractionFermion5D.h diff --git a/lib/qcd/action/fermion/DomainWallEOFAFermion.cc b/Grid/qcd/action/fermion/DomainWallEOFAFermion.cc similarity index 100% rename from lib/qcd/action/fermion/DomainWallEOFAFermion.cc rename to Grid/qcd/action/fermion/DomainWallEOFAFermion.cc diff --git a/lib/qcd/action/fermion/DomainWallEOFAFermion.h b/Grid/qcd/action/fermion/DomainWallEOFAFermion.h similarity index 100% rename from lib/qcd/action/fermion/DomainWallEOFAFermion.h rename to Grid/qcd/action/fermion/DomainWallEOFAFermion.h diff --git a/lib/qcd/action/fermion/DomainWallEOFAFermioncache.cc b/Grid/qcd/action/fermion/DomainWallEOFAFermioncache.cc similarity index 100% rename from lib/qcd/action/fermion/DomainWallEOFAFermioncache.cc rename to Grid/qcd/action/fermion/DomainWallEOFAFermioncache.cc diff --git a/lib/qcd/action/fermion/DomainWallEOFAFermiondense.cc b/Grid/qcd/action/fermion/DomainWallEOFAFermiondense.cc similarity index 100% rename from lib/qcd/action/fermion/DomainWallEOFAFermiondense.cc rename to Grid/qcd/action/fermion/DomainWallEOFAFermiondense.cc diff --git a/lib/qcd/action/fermion/DomainWallEOFAFermionssp.cc b/Grid/qcd/action/fermion/DomainWallEOFAFermionssp.cc similarity index 100% rename from lib/qcd/action/fermion/DomainWallEOFAFermionssp.cc rename to Grid/qcd/action/fermion/DomainWallEOFAFermionssp.cc diff --git a/lib/qcd/action/fermion/DomainWallEOFAFermionvec.cc b/Grid/qcd/action/fermion/DomainWallEOFAFermionvec.cc similarity index 100% rename from lib/qcd/action/fermion/DomainWallEOFAFermionvec.cc rename to Grid/qcd/action/fermion/DomainWallEOFAFermionvec.cc diff --git a/lib/qcd/action/fermion/DomainWallFermion.h b/Grid/qcd/action/fermion/DomainWallFermion.h similarity index 100% rename from lib/qcd/action/fermion/DomainWallFermion.h rename to Grid/qcd/action/fermion/DomainWallFermion.h diff --git a/lib/qcd/action/fermion/Fermion.h b/Grid/qcd/action/fermion/Fermion.h similarity index 100% rename from lib/qcd/action/fermion/Fermion.h rename to Grid/qcd/action/fermion/Fermion.h diff --git a/lib/qcd/action/fermion/FermionCore.h b/Grid/qcd/action/fermion/FermionCore.h similarity index 100% rename from lib/qcd/action/fermion/FermionCore.h rename to Grid/qcd/action/fermion/FermionCore.h diff --git a/lib/qcd/action/fermion/FermionOperator.h b/Grid/qcd/action/fermion/FermionOperator.h similarity index 100% rename from lib/qcd/action/fermion/FermionOperator.h rename to Grid/qcd/action/fermion/FermionOperator.h diff --git a/lib/qcd/action/fermion/FermionOperatorImpl.h b/Grid/qcd/action/fermion/FermionOperatorImpl.h similarity index 100% rename from lib/qcd/action/fermion/FermionOperatorImpl.h rename to Grid/qcd/action/fermion/FermionOperatorImpl.h diff --git a/lib/qcd/action/fermion/ImprovedStaggeredFermion.cc b/Grid/qcd/action/fermion/ImprovedStaggeredFermion.cc similarity index 100% rename from lib/qcd/action/fermion/ImprovedStaggeredFermion.cc rename to Grid/qcd/action/fermion/ImprovedStaggeredFermion.cc diff --git a/lib/qcd/action/fermion/ImprovedStaggeredFermion.h b/Grid/qcd/action/fermion/ImprovedStaggeredFermion.h similarity index 100% rename from lib/qcd/action/fermion/ImprovedStaggeredFermion.h rename to Grid/qcd/action/fermion/ImprovedStaggeredFermion.h diff --git a/lib/qcd/action/fermion/ImprovedStaggeredFermion5D.cc b/Grid/qcd/action/fermion/ImprovedStaggeredFermion5D.cc similarity index 100% rename from lib/qcd/action/fermion/ImprovedStaggeredFermion5D.cc rename to Grid/qcd/action/fermion/ImprovedStaggeredFermion5D.cc diff --git a/lib/qcd/action/fermion/ImprovedStaggeredFermion5D.h b/Grid/qcd/action/fermion/ImprovedStaggeredFermion5D.h similarity index 100% rename from lib/qcd/action/fermion/ImprovedStaggeredFermion5D.h rename to Grid/qcd/action/fermion/ImprovedStaggeredFermion5D.h diff --git a/lib/qcd/action/fermion/MobiusEOFAFermion.cc b/Grid/qcd/action/fermion/MobiusEOFAFermion.cc similarity index 100% rename from lib/qcd/action/fermion/MobiusEOFAFermion.cc rename to Grid/qcd/action/fermion/MobiusEOFAFermion.cc diff --git a/lib/qcd/action/fermion/MobiusEOFAFermion.h b/Grid/qcd/action/fermion/MobiusEOFAFermion.h similarity index 100% rename from lib/qcd/action/fermion/MobiusEOFAFermion.h rename to Grid/qcd/action/fermion/MobiusEOFAFermion.h diff --git a/lib/qcd/action/fermion/MobiusEOFAFermioncache.cc b/Grid/qcd/action/fermion/MobiusEOFAFermioncache.cc similarity index 100% rename from lib/qcd/action/fermion/MobiusEOFAFermioncache.cc rename to Grid/qcd/action/fermion/MobiusEOFAFermioncache.cc diff --git a/lib/qcd/action/fermion/MobiusEOFAFermiondense.cc b/Grid/qcd/action/fermion/MobiusEOFAFermiondense.cc similarity index 100% rename from lib/qcd/action/fermion/MobiusEOFAFermiondense.cc rename to Grid/qcd/action/fermion/MobiusEOFAFermiondense.cc diff --git a/lib/qcd/action/fermion/MobiusEOFAFermionssp.cc b/Grid/qcd/action/fermion/MobiusEOFAFermionssp.cc similarity index 100% rename from lib/qcd/action/fermion/MobiusEOFAFermionssp.cc rename to Grid/qcd/action/fermion/MobiusEOFAFermionssp.cc diff --git a/lib/qcd/action/fermion/MobiusEOFAFermionvec.cc b/Grid/qcd/action/fermion/MobiusEOFAFermionvec.cc similarity index 100% rename from lib/qcd/action/fermion/MobiusEOFAFermionvec.cc rename to Grid/qcd/action/fermion/MobiusEOFAFermionvec.cc diff --git a/lib/qcd/action/fermion/MobiusFermion.h b/Grid/qcd/action/fermion/MobiusFermion.h similarity index 100% rename from lib/qcd/action/fermion/MobiusFermion.h rename to Grid/qcd/action/fermion/MobiusFermion.h diff --git a/lib/qcd/action/fermion/MobiusZolotarevFermion.h b/Grid/qcd/action/fermion/MobiusZolotarevFermion.h similarity index 100% rename from lib/qcd/action/fermion/MobiusZolotarevFermion.h rename to Grid/qcd/action/fermion/MobiusZolotarevFermion.h diff --git a/lib/qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h b/Grid/qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h similarity index 100% rename from lib/qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h rename to Grid/qcd/action/fermion/OverlapWilsonCayleyTanhFermion.h diff --git a/lib/qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h b/Grid/qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h similarity index 100% rename from lib/qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h rename to Grid/qcd/action/fermion/OverlapWilsonCayleyZolotarevFermion.h diff --git a/lib/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h b/Grid/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h similarity index 100% rename from lib/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h rename to Grid/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h diff --git a/lib/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h b/Grid/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h similarity index 100% rename from lib/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h rename to Grid/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h diff --git a/lib/qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h b/Grid/qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h similarity index 100% rename from lib/qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h rename to Grid/qcd/action/fermion/OverlapWilsonPartialFractionTanhFermion.h diff --git a/lib/qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h b/Grid/qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h similarity index 100% rename from lib/qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h rename to Grid/qcd/action/fermion/OverlapWilsonPartialFractionZolotarevFermion.h diff --git a/lib/qcd/action/fermion/PartialFractionFermion5D.cc b/Grid/qcd/action/fermion/PartialFractionFermion5D.cc similarity index 100% rename from lib/qcd/action/fermion/PartialFractionFermion5D.cc rename to Grid/qcd/action/fermion/PartialFractionFermion5D.cc diff --git a/lib/qcd/action/fermion/PartialFractionFermion5D.h b/Grid/qcd/action/fermion/PartialFractionFermion5D.h similarity index 100% rename from lib/qcd/action/fermion/PartialFractionFermion5D.h rename to Grid/qcd/action/fermion/PartialFractionFermion5D.h diff --git a/lib/qcd/action/fermion/ScaledShamirFermion.h b/Grid/qcd/action/fermion/ScaledShamirFermion.h similarity index 100% rename from lib/qcd/action/fermion/ScaledShamirFermion.h rename to Grid/qcd/action/fermion/ScaledShamirFermion.h diff --git a/lib/qcd/action/fermion/SchurDiagTwoKappa.h b/Grid/qcd/action/fermion/SchurDiagTwoKappa.h similarity index 100% rename from lib/qcd/action/fermion/SchurDiagTwoKappa.h rename to Grid/qcd/action/fermion/SchurDiagTwoKappa.h diff --git a/lib/qcd/action/fermion/ShamirZolotarevFermion.h b/Grid/qcd/action/fermion/ShamirZolotarevFermion.h similarity index 100% rename from lib/qcd/action/fermion/ShamirZolotarevFermion.h rename to Grid/qcd/action/fermion/ShamirZolotarevFermion.h diff --git a/lib/qcd/action/fermion/StaggeredKernels.cc b/Grid/qcd/action/fermion/StaggeredKernels.cc similarity index 100% rename from lib/qcd/action/fermion/StaggeredKernels.cc rename to Grid/qcd/action/fermion/StaggeredKernels.cc diff --git a/lib/qcd/action/fermion/StaggeredKernels.h b/Grid/qcd/action/fermion/StaggeredKernels.h similarity index 100% rename from lib/qcd/action/fermion/StaggeredKernels.h rename to Grid/qcd/action/fermion/StaggeredKernels.h diff --git a/lib/qcd/action/fermion/StaggeredKernelsAsm.cc b/Grid/qcd/action/fermion/StaggeredKernelsAsm.cc similarity index 100% rename from lib/qcd/action/fermion/StaggeredKernelsAsm.cc rename to Grid/qcd/action/fermion/StaggeredKernelsAsm.cc diff --git a/lib/qcd/action/fermion/StaggeredKernelsHand.cc b/Grid/qcd/action/fermion/StaggeredKernelsHand.cc similarity index 100% rename from lib/qcd/action/fermion/StaggeredKernelsHand.cc rename to Grid/qcd/action/fermion/StaggeredKernelsHand.cc diff --git a/lib/qcd/action/fermion/WilsonCloverFermion.cc b/Grid/qcd/action/fermion/WilsonCloverFermion.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonCloverFermion.cc rename to Grid/qcd/action/fermion/WilsonCloverFermion.cc diff --git a/lib/qcd/action/fermion/WilsonCloverFermion.h b/Grid/qcd/action/fermion/WilsonCloverFermion.h similarity index 100% rename from lib/qcd/action/fermion/WilsonCloverFermion.h rename to Grid/qcd/action/fermion/WilsonCloverFermion.h diff --git a/lib/qcd/action/fermion/WilsonCompressor.h b/Grid/qcd/action/fermion/WilsonCompressor.h similarity index 100% rename from lib/qcd/action/fermion/WilsonCompressor.h rename to Grid/qcd/action/fermion/WilsonCompressor.h diff --git a/lib/qcd/action/fermion/WilsonFermion.cc b/Grid/qcd/action/fermion/WilsonFermion.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonFermion.cc rename to Grid/qcd/action/fermion/WilsonFermion.cc diff --git a/lib/qcd/action/fermion/WilsonFermion.h b/Grid/qcd/action/fermion/WilsonFermion.h similarity index 100% rename from lib/qcd/action/fermion/WilsonFermion.h rename to Grid/qcd/action/fermion/WilsonFermion.h diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/Grid/qcd/action/fermion/WilsonFermion5D.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonFermion5D.cc rename to Grid/qcd/action/fermion/WilsonFermion5D.cc diff --git a/lib/qcd/action/fermion/WilsonFermion5D.h b/Grid/qcd/action/fermion/WilsonFermion5D.h similarity index 100% rename from lib/qcd/action/fermion/WilsonFermion5D.h rename to Grid/qcd/action/fermion/WilsonFermion5D.h diff --git a/lib/qcd/action/fermion/WilsonKernels.cc b/Grid/qcd/action/fermion/WilsonKernels.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonKernels.cc rename to Grid/qcd/action/fermion/WilsonKernels.cc diff --git a/lib/qcd/action/fermion/WilsonKernels.h b/Grid/qcd/action/fermion/WilsonKernels.h similarity index 100% rename from lib/qcd/action/fermion/WilsonKernels.h rename to Grid/qcd/action/fermion/WilsonKernels.h diff --git a/lib/qcd/action/fermion/WilsonKernelsAsm.cc b/Grid/qcd/action/fermion/WilsonKernelsAsm.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsAsm.cc rename to Grid/qcd/action/fermion/WilsonKernelsAsm.cc diff --git a/lib/qcd/action/fermion/WilsonKernelsAsmAvx512.h b/Grid/qcd/action/fermion/WilsonKernelsAsmAvx512.h similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsAsmAvx512.h rename to Grid/qcd/action/fermion/WilsonKernelsAsmAvx512.h diff --git a/lib/qcd/action/fermion/WilsonKernelsAsmBody.h b/Grid/qcd/action/fermion/WilsonKernelsAsmBody.h similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsAsmBody.h rename to Grid/qcd/action/fermion/WilsonKernelsAsmBody.h diff --git a/lib/qcd/action/fermion/WilsonKernelsAsmBody.h.ab b/Grid/qcd/action/fermion/WilsonKernelsAsmBody.h.ab similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsAsmBody.h.ab rename to Grid/qcd/action/fermion/WilsonKernelsAsmBody.h.ab diff --git a/lib/qcd/action/fermion/WilsonKernelsAsmBody.h.abc b/Grid/qcd/action/fermion/WilsonKernelsAsmBody.h.abc similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsAsmBody.h.abc rename to Grid/qcd/action/fermion/WilsonKernelsAsmBody.h.abc diff --git a/lib/qcd/action/fermion/WilsonKernelsAsmQPX.h b/Grid/qcd/action/fermion/WilsonKernelsAsmQPX.h similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsAsmQPX.h rename to Grid/qcd/action/fermion/WilsonKernelsAsmQPX.h diff --git a/lib/qcd/action/fermion/WilsonKernelsHand.cc b/Grid/qcd/action/fermion/WilsonKernelsHand.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsHand.cc rename to Grid/qcd/action/fermion/WilsonKernelsHand.cc diff --git a/lib/qcd/action/fermion/WilsonKernelsHandGparity.cc b/Grid/qcd/action/fermion/WilsonKernelsHandGparity.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonKernelsHandGparity.cc rename to Grid/qcd/action/fermion/WilsonKernelsHandGparity.cc diff --git a/lib/qcd/action/fermion/WilsonTMFermion.cc b/Grid/qcd/action/fermion/WilsonTMFermion.cc similarity index 100% rename from lib/qcd/action/fermion/WilsonTMFermion.cc rename to Grid/qcd/action/fermion/WilsonTMFermion.cc diff --git a/lib/qcd/action/fermion/WilsonTMFermion.h b/Grid/qcd/action/fermion/WilsonTMFermion.h similarity index 100% rename from lib/qcd/action/fermion/WilsonTMFermion.h rename to Grid/qcd/action/fermion/WilsonTMFermion.h diff --git a/lib/qcd/action/fermion/ZMobiusFermion.h b/Grid/qcd/action/fermion/ZMobiusFermion.h similarity index 100% rename from lib/qcd/action/fermion/ZMobiusFermion.h rename to Grid/qcd/action/fermion/ZMobiusFermion.h diff --git a/lib/qcd/action/fermion/g5HermitianLinop.h b/Grid/qcd/action/fermion/g5HermitianLinop.h similarity index 100% rename from lib/qcd/action/fermion/g5HermitianLinop.h rename to Grid/qcd/action/fermion/g5HermitianLinop.h diff --git a/lib/qcd/action/gauge/Gauge.h b/Grid/qcd/action/gauge/Gauge.h similarity index 100% rename from lib/qcd/action/gauge/Gauge.h rename to Grid/qcd/action/gauge/Gauge.h diff --git a/lib/qcd/action/gauge/GaugeImplTypes.h b/Grid/qcd/action/gauge/GaugeImplTypes.h similarity index 100% rename from lib/qcd/action/gauge/GaugeImplTypes.h rename to Grid/qcd/action/gauge/GaugeImplTypes.h diff --git a/lib/qcd/action/gauge/GaugeImplementations.h b/Grid/qcd/action/gauge/GaugeImplementations.h similarity index 100% rename from lib/qcd/action/gauge/GaugeImplementations.h rename to Grid/qcd/action/gauge/GaugeImplementations.h diff --git a/lib/qcd/action/gauge/Photon.h b/Grid/qcd/action/gauge/Photon.h similarity index 100% rename from lib/qcd/action/gauge/Photon.h rename to Grid/qcd/action/gauge/Photon.h diff --git a/lib/qcd/action/gauge/PlaqPlusRectangleAction.h b/Grid/qcd/action/gauge/PlaqPlusRectangleAction.h similarity index 100% rename from lib/qcd/action/gauge/PlaqPlusRectangleAction.h rename to Grid/qcd/action/gauge/PlaqPlusRectangleAction.h diff --git a/lib/qcd/action/gauge/WilsonGaugeAction.h b/Grid/qcd/action/gauge/WilsonGaugeAction.h similarity index 100% rename from lib/qcd/action/gauge/WilsonGaugeAction.h rename to Grid/qcd/action/gauge/WilsonGaugeAction.h diff --git a/lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h b/Grid/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h similarity index 100% rename from lib/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h rename to Grid/qcd/action/pseudofermion/EvenOddSchurDifferentiable.h diff --git a/lib/qcd/action/pseudofermion/ExactOneFlavourRatio.h b/Grid/qcd/action/pseudofermion/ExactOneFlavourRatio.h similarity index 100% rename from lib/qcd/action/pseudofermion/ExactOneFlavourRatio.h rename to Grid/qcd/action/pseudofermion/ExactOneFlavourRatio.h diff --git a/lib/qcd/action/pseudofermion/OneFlavourEvenOddRational.h b/Grid/qcd/action/pseudofermion/OneFlavourEvenOddRational.h similarity index 100% rename from lib/qcd/action/pseudofermion/OneFlavourEvenOddRational.h rename to Grid/qcd/action/pseudofermion/OneFlavourEvenOddRational.h diff --git a/lib/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h b/Grid/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h similarity index 100% rename from lib/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h rename to Grid/qcd/action/pseudofermion/OneFlavourEvenOddRationalRatio.h diff --git a/lib/qcd/action/pseudofermion/OneFlavourRational.h b/Grid/qcd/action/pseudofermion/OneFlavourRational.h similarity index 100% rename from lib/qcd/action/pseudofermion/OneFlavourRational.h rename to Grid/qcd/action/pseudofermion/OneFlavourRational.h diff --git a/lib/qcd/action/pseudofermion/OneFlavourRationalRatio.h b/Grid/qcd/action/pseudofermion/OneFlavourRationalRatio.h similarity index 100% rename from lib/qcd/action/pseudofermion/OneFlavourRationalRatio.h rename to Grid/qcd/action/pseudofermion/OneFlavourRationalRatio.h diff --git a/lib/qcd/action/pseudofermion/PseudoFermion.h b/Grid/qcd/action/pseudofermion/PseudoFermion.h similarity index 100% rename from lib/qcd/action/pseudofermion/PseudoFermion.h rename to Grid/qcd/action/pseudofermion/PseudoFermion.h diff --git a/lib/qcd/action/pseudofermion/TwoFlavour.h b/Grid/qcd/action/pseudofermion/TwoFlavour.h similarity index 100% rename from lib/qcd/action/pseudofermion/TwoFlavour.h rename to Grid/qcd/action/pseudofermion/TwoFlavour.h diff --git a/lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h b/Grid/qcd/action/pseudofermion/TwoFlavourEvenOdd.h similarity index 100% rename from lib/qcd/action/pseudofermion/TwoFlavourEvenOdd.h rename to Grid/qcd/action/pseudofermion/TwoFlavourEvenOdd.h diff --git a/lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h b/Grid/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h similarity index 100% rename from lib/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h rename to Grid/qcd/action/pseudofermion/TwoFlavourEvenOddRatio.h diff --git a/lib/qcd/action/pseudofermion/TwoFlavourRatio.h b/Grid/qcd/action/pseudofermion/TwoFlavourRatio.h similarity index 100% rename from lib/qcd/action/pseudofermion/TwoFlavourRatio.h rename to Grid/qcd/action/pseudofermion/TwoFlavourRatio.h diff --git a/lib/qcd/action/scalar/Scalar.h b/Grid/qcd/action/scalar/Scalar.h similarity index 100% rename from lib/qcd/action/scalar/Scalar.h rename to Grid/qcd/action/scalar/Scalar.h diff --git a/lib/qcd/action/scalar/ScalarAction.h b/Grid/qcd/action/scalar/ScalarAction.h similarity index 100% rename from lib/qcd/action/scalar/ScalarAction.h rename to Grid/qcd/action/scalar/ScalarAction.h diff --git a/lib/qcd/action/scalar/ScalarImpl.h b/Grid/qcd/action/scalar/ScalarImpl.h similarity index 100% rename from lib/qcd/action/scalar/ScalarImpl.h rename to Grid/qcd/action/scalar/ScalarImpl.h diff --git a/lib/qcd/action/scalar/ScalarInteractionAction.h b/Grid/qcd/action/scalar/ScalarInteractionAction.h similarity index 100% rename from lib/qcd/action/scalar/ScalarInteractionAction.h rename to Grid/qcd/action/scalar/ScalarInteractionAction.h diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/Grid/qcd/hmc/GenericHMCrunner.h similarity index 100% rename from lib/qcd/hmc/GenericHMCrunner.h rename to Grid/qcd/hmc/GenericHMCrunner.h diff --git a/lib/qcd/hmc/HMC.h b/Grid/qcd/hmc/HMC.h similarity index 100% rename from lib/qcd/hmc/HMC.h rename to Grid/qcd/hmc/HMC.h diff --git a/lib/qcd/hmc/HMCModules.h b/Grid/qcd/hmc/HMCModules.h similarity index 100% rename from lib/qcd/hmc/HMCModules.h rename to Grid/qcd/hmc/HMCModules.h diff --git a/lib/qcd/hmc/HMCResourceManager.h b/Grid/qcd/hmc/HMCResourceManager.h similarity index 100% rename from lib/qcd/hmc/HMCResourceManager.h rename to Grid/qcd/hmc/HMCResourceManager.h diff --git a/lib/qcd/hmc/HMCRunnerModule.h b/Grid/qcd/hmc/HMCRunnerModule.h similarity index 100% rename from lib/qcd/hmc/HMCRunnerModule.h rename to Grid/qcd/hmc/HMCRunnerModule.h diff --git a/lib/qcd/hmc/HMC_GridModules.h b/Grid/qcd/hmc/HMC_GridModules.h similarity index 100% rename from lib/qcd/hmc/HMC_GridModules.h rename to Grid/qcd/hmc/HMC_GridModules.h diff --git a/lib/qcd/hmc/HMC_aggregate.h b/Grid/qcd/hmc/HMC_aggregate.h similarity index 100% rename from lib/qcd/hmc/HMC_aggregate.h rename to Grid/qcd/hmc/HMC_aggregate.h diff --git a/lib/qcd/hmc/UsingHMC.md b/Grid/qcd/hmc/UsingHMC.md similarity index 100% rename from lib/qcd/hmc/UsingHMC.md rename to Grid/qcd/hmc/UsingHMC.md diff --git a/lib/qcd/hmc/checkpointers/BaseCheckpointer.h b/Grid/qcd/hmc/checkpointers/BaseCheckpointer.h similarity index 100% rename from lib/qcd/hmc/checkpointers/BaseCheckpointer.h rename to Grid/qcd/hmc/checkpointers/BaseCheckpointer.h diff --git a/lib/qcd/hmc/checkpointers/BinaryCheckpointer.h b/Grid/qcd/hmc/checkpointers/BinaryCheckpointer.h similarity index 100% rename from lib/qcd/hmc/checkpointers/BinaryCheckpointer.h rename to Grid/qcd/hmc/checkpointers/BinaryCheckpointer.h diff --git a/lib/qcd/hmc/checkpointers/CheckPointerModules.h b/Grid/qcd/hmc/checkpointers/CheckPointerModules.h similarity index 100% rename from lib/qcd/hmc/checkpointers/CheckPointerModules.h rename to Grid/qcd/hmc/checkpointers/CheckPointerModules.h diff --git a/lib/qcd/hmc/checkpointers/CheckPointers.h b/Grid/qcd/hmc/checkpointers/CheckPointers.h similarity index 100% rename from lib/qcd/hmc/checkpointers/CheckPointers.h rename to Grid/qcd/hmc/checkpointers/CheckPointers.h diff --git a/lib/qcd/hmc/checkpointers/ILDGCheckpointer.h b/Grid/qcd/hmc/checkpointers/ILDGCheckpointer.h similarity index 100% rename from lib/qcd/hmc/checkpointers/ILDGCheckpointer.h rename to Grid/qcd/hmc/checkpointers/ILDGCheckpointer.h diff --git a/lib/qcd/hmc/checkpointers/NerscCheckpointer.h b/Grid/qcd/hmc/checkpointers/NerscCheckpointer.h similarity index 100% rename from lib/qcd/hmc/checkpointers/NerscCheckpointer.h rename to Grid/qcd/hmc/checkpointers/NerscCheckpointer.h diff --git a/lib/qcd/hmc/checkpointers/ScidacCheckpointer.h b/Grid/qcd/hmc/checkpointers/ScidacCheckpointer.h similarity index 100% rename from lib/qcd/hmc/checkpointers/ScidacCheckpointer.h rename to Grid/qcd/hmc/checkpointers/ScidacCheckpointer.h diff --git a/lib/qcd/hmc/integrators/Integrator.h b/Grid/qcd/hmc/integrators/Integrator.h similarity index 100% rename from lib/qcd/hmc/integrators/Integrator.h rename to Grid/qcd/hmc/integrators/Integrator.h diff --git a/lib/qcd/hmc/integrators/Integrator_algorithm.h b/Grid/qcd/hmc/integrators/Integrator_algorithm.h similarity index 100% rename from lib/qcd/hmc/integrators/Integrator_algorithm.h rename to Grid/qcd/hmc/integrators/Integrator_algorithm.h diff --git a/lib/qcd/modules/ActionModules.h b/Grid/qcd/modules/ActionModules.h similarity index 100% rename from lib/qcd/modules/ActionModules.h rename to Grid/qcd/modules/ActionModules.h diff --git a/lib/qcd/modules/Factory.h b/Grid/qcd/modules/Factory.h similarity index 100% rename from lib/qcd/modules/Factory.h rename to Grid/qcd/modules/Factory.h diff --git a/lib/qcd/modules/FermionOperatorModules.h b/Grid/qcd/modules/FermionOperatorModules.h similarity index 100% rename from lib/qcd/modules/FermionOperatorModules.h rename to Grid/qcd/modules/FermionOperatorModules.h diff --git a/lib/qcd/modules/Modules.cc b/Grid/qcd/modules/Modules.cc similarity index 100% rename from lib/qcd/modules/Modules.cc rename to Grid/qcd/modules/Modules.cc diff --git a/lib/qcd/modules/Modules.h b/Grid/qcd/modules/Modules.h similarity index 100% rename from lib/qcd/modules/Modules.h rename to Grid/qcd/modules/Modules.h diff --git a/lib/qcd/modules/ObservableModules.h b/Grid/qcd/modules/ObservableModules.h similarity index 100% rename from lib/qcd/modules/ObservableModules.h rename to Grid/qcd/modules/ObservableModules.h diff --git a/lib/qcd/modules/Registration.h b/Grid/qcd/modules/Registration.h similarity index 100% rename from lib/qcd/modules/Registration.h rename to Grid/qcd/modules/Registration.h diff --git a/lib/qcd/modules/SolverModules.h b/Grid/qcd/modules/SolverModules.h similarity index 100% rename from lib/qcd/modules/SolverModules.h rename to Grid/qcd/modules/SolverModules.h diff --git a/lib/qcd/modules/mods.h b/Grid/qcd/modules/mods.h similarity index 100% rename from lib/qcd/modules/mods.h rename to Grid/qcd/modules/mods.h diff --git a/lib/qcd/observables/hmc_observable.h b/Grid/qcd/observables/hmc_observable.h similarity index 100% rename from lib/qcd/observables/hmc_observable.h rename to Grid/qcd/observables/hmc_observable.h diff --git a/lib/qcd/observables/plaquette.h b/Grid/qcd/observables/plaquette.h similarity index 100% rename from lib/qcd/observables/plaquette.h rename to Grid/qcd/observables/plaquette.h diff --git a/lib/qcd/observables/polyakov_loop.h b/Grid/qcd/observables/polyakov_loop.h similarity index 100% rename from lib/qcd/observables/polyakov_loop.h rename to Grid/qcd/observables/polyakov_loop.h diff --git a/lib/qcd/observables/topological_charge.h b/Grid/qcd/observables/topological_charge.h similarity index 100% rename from lib/qcd/observables/topological_charge.h rename to Grid/qcd/observables/topological_charge.h diff --git a/lib/qcd/representations/Representations.h b/Grid/qcd/representations/Representations.h similarity index 100% rename from lib/qcd/representations/Representations.h rename to Grid/qcd/representations/Representations.h diff --git a/lib/qcd/representations/adjoint.h b/Grid/qcd/representations/adjoint.h similarity index 100% rename from lib/qcd/representations/adjoint.h rename to Grid/qcd/representations/adjoint.h diff --git a/lib/qcd/representations/fundamental.h b/Grid/qcd/representations/fundamental.h similarity index 100% rename from lib/qcd/representations/fundamental.h rename to Grid/qcd/representations/fundamental.h diff --git a/lib/qcd/representations/hmc_types.h b/Grid/qcd/representations/hmc_types.h similarity index 100% rename from lib/qcd/representations/hmc_types.h rename to Grid/qcd/representations/hmc_types.h diff --git a/lib/qcd/representations/two_index.h b/Grid/qcd/representations/two_index.h similarity index 100% rename from lib/qcd/representations/two_index.h rename to Grid/qcd/representations/two_index.h diff --git a/lib/qcd/smearing/APEsmearing.h b/Grid/qcd/smearing/APEsmearing.h similarity index 100% rename from lib/qcd/smearing/APEsmearing.h rename to Grid/qcd/smearing/APEsmearing.h diff --git a/lib/qcd/smearing/BaseSmearing.h b/Grid/qcd/smearing/BaseSmearing.h similarity index 100% rename from lib/qcd/smearing/BaseSmearing.h rename to Grid/qcd/smearing/BaseSmearing.h diff --git a/lib/qcd/smearing/GaugeConfiguration.h b/Grid/qcd/smearing/GaugeConfiguration.h similarity index 100% rename from lib/qcd/smearing/GaugeConfiguration.h rename to Grid/qcd/smearing/GaugeConfiguration.h diff --git a/lib/qcd/smearing/Smearing.h b/Grid/qcd/smearing/Smearing.h similarity index 100% rename from lib/qcd/smearing/Smearing.h rename to Grid/qcd/smearing/Smearing.h diff --git a/lib/qcd/smearing/StoutSmearing.h b/Grid/qcd/smearing/StoutSmearing.h similarity index 100% rename from lib/qcd/smearing/StoutSmearing.h rename to Grid/qcd/smearing/StoutSmearing.h diff --git a/lib/qcd/smearing/WilsonFlow.h b/Grid/qcd/smearing/WilsonFlow.h similarity index 100% rename from lib/qcd/smearing/WilsonFlow.h rename to Grid/qcd/smearing/WilsonFlow.h diff --git a/lib/qcd/spin/Dirac.h b/Grid/qcd/spin/Dirac.h similarity index 100% rename from lib/qcd/spin/Dirac.h rename to Grid/qcd/spin/Dirac.h diff --git a/lib/qcd/spin/Gamma.cc b/Grid/qcd/spin/Gamma.cc similarity index 100% rename from lib/qcd/spin/Gamma.cc rename to Grid/qcd/spin/Gamma.cc diff --git a/lib/qcd/spin/Gamma.h b/Grid/qcd/spin/Gamma.h similarity index 100% rename from lib/qcd/spin/Gamma.h rename to Grid/qcd/spin/Gamma.h diff --git a/lib/qcd/spin/Spin.h b/Grid/qcd/spin/Spin.h similarity index 100% rename from lib/qcd/spin/Spin.h rename to Grid/qcd/spin/Spin.h diff --git a/lib/qcd/spin/TwoSpinor.h b/Grid/qcd/spin/TwoSpinor.h similarity index 100% rename from lib/qcd/spin/TwoSpinor.h rename to Grid/qcd/spin/TwoSpinor.h diff --git a/lib/qcd/spin/gamma-gen/gamma-gen.nb b/Grid/qcd/spin/gamma-gen/gamma-gen.nb similarity index 100% rename from lib/qcd/spin/gamma-gen/gamma-gen.nb rename to Grid/qcd/spin/gamma-gen/gamma-gen.nb diff --git a/lib/qcd/utils/CovariantCshift.h b/Grid/qcd/utils/CovariantCshift.h similarity index 100% rename from lib/qcd/utils/CovariantCshift.h rename to Grid/qcd/utils/CovariantCshift.h diff --git a/lib/qcd/utils/CovariantLaplacian.h b/Grid/qcd/utils/CovariantLaplacian.h similarity index 100% rename from lib/qcd/utils/CovariantLaplacian.h rename to Grid/qcd/utils/CovariantLaplacian.h diff --git a/lib/qcd/utils/GaugeFix.h b/Grid/qcd/utils/GaugeFix.h similarity index 100% rename from lib/qcd/utils/GaugeFix.h rename to Grid/qcd/utils/GaugeFix.h diff --git a/lib/qcd/utils/LinalgUtils.h b/Grid/qcd/utils/LinalgUtils.h similarity index 100% rename from lib/qcd/utils/LinalgUtils.h rename to Grid/qcd/utils/LinalgUtils.h diff --git a/lib/qcd/utils/Metric.h b/Grid/qcd/utils/Metric.h similarity index 100% rename from lib/qcd/utils/Metric.h rename to Grid/qcd/utils/Metric.h diff --git a/lib/qcd/utils/SUn.h b/Grid/qcd/utils/SUn.h similarity index 100% rename from lib/qcd/utils/SUn.h rename to Grid/qcd/utils/SUn.h diff --git a/lib/qcd/utils/SUnAdjoint.h b/Grid/qcd/utils/SUnAdjoint.h similarity index 100% rename from lib/qcd/utils/SUnAdjoint.h rename to Grid/qcd/utils/SUnAdjoint.h diff --git a/lib/qcd/utils/SUnTwoIndex.h b/Grid/qcd/utils/SUnTwoIndex.h similarity index 100% rename from lib/qcd/utils/SUnTwoIndex.h rename to Grid/qcd/utils/SUnTwoIndex.h diff --git a/lib/qcd/utils/ScalarObjs.h b/Grid/qcd/utils/ScalarObjs.h similarity index 100% rename from lib/qcd/utils/ScalarObjs.h rename to Grid/qcd/utils/ScalarObjs.h diff --git a/lib/qcd/utils/SpaceTimeGrid.cc b/Grid/qcd/utils/SpaceTimeGrid.cc similarity index 100% rename from lib/qcd/utils/SpaceTimeGrid.cc rename to Grid/qcd/utils/SpaceTimeGrid.cc diff --git a/lib/qcd/utils/SpaceTimeGrid.h b/Grid/qcd/utils/SpaceTimeGrid.h similarity index 100% rename from lib/qcd/utils/SpaceTimeGrid.h rename to Grid/qcd/utils/SpaceTimeGrid.h diff --git a/lib/qcd/utils/Utils.h b/Grid/qcd/utils/Utils.h similarity index 100% rename from lib/qcd/utils/Utils.h rename to Grid/qcd/utils/Utils.h diff --git a/lib/qcd/utils/WilsonLoops.h b/Grid/qcd/utils/WilsonLoops.h similarity index 100% rename from lib/qcd/utils/WilsonLoops.h rename to Grid/qcd/utils/WilsonLoops.h diff --git a/lib/serialisation/BaseIO.h b/Grid/serialisation/BaseIO.h similarity index 100% rename from lib/serialisation/BaseIO.h rename to Grid/serialisation/BaseIO.h diff --git a/lib/serialisation/BinaryIO.cc b/Grid/serialisation/BinaryIO.cc similarity index 100% rename from lib/serialisation/BinaryIO.cc rename to Grid/serialisation/BinaryIO.cc diff --git a/lib/serialisation/BinaryIO.h b/Grid/serialisation/BinaryIO.h similarity index 100% rename from lib/serialisation/BinaryIO.h rename to Grid/serialisation/BinaryIO.h diff --git a/lib/serialisation/Hdf5IO.cc b/Grid/serialisation/Hdf5IO.cc similarity index 100% rename from lib/serialisation/Hdf5IO.cc rename to Grid/serialisation/Hdf5IO.cc diff --git a/lib/serialisation/Hdf5IO.h b/Grid/serialisation/Hdf5IO.h similarity index 100% rename from lib/serialisation/Hdf5IO.h rename to Grid/serialisation/Hdf5IO.h diff --git a/lib/serialisation/Hdf5Type.h b/Grid/serialisation/Hdf5Type.h similarity index 100% rename from lib/serialisation/Hdf5Type.h rename to Grid/serialisation/Hdf5Type.h diff --git a/lib/serialisation/JSON_IO.cc b/Grid/serialisation/JSON_IO.cc similarity index 100% rename from lib/serialisation/JSON_IO.cc rename to Grid/serialisation/JSON_IO.cc diff --git a/lib/serialisation/JSON_IO.h b/Grid/serialisation/JSON_IO.h similarity index 100% rename from lib/serialisation/JSON_IO.h rename to Grid/serialisation/JSON_IO.h diff --git a/lib/serialisation/MacroMagic.h b/Grid/serialisation/MacroMagic.h similarity index 100% rename from lib/serialisation/MacroMagic.h rename to Grid/serialisation/MacroMagic.h diff --git a/lib/serialisation/Serialisation.h b/Grid/serialisation/Serialisation.h similarity index 100% rename from lib/serialisation/Serialisation.h rename to Grid/serialisation/Serialisation.h diff --git a/lib/serialisation/TextIO.cc b/Grid/serialisation/TextIO.cc similarity index 100% rename from lib/serialisation/TextIO.cc rename to Grid/serialisation/TextIO.cc diff --git a/lib/serialisation/TextIO.h b/Grid/serialisation/TextIO.h similarity index 100% rename from lib/serialisation/TextIO.h rename to Grid/serialisation/TextIO.h diff --git a/lib/serialisation/VectorUtils.h b/Grid/serialisation/VectorUtils.h similarity index 100% rename from lib/serialisation/VectorUtils.h rename to Grid/serialisation/VectorUtils.h diff --git a/lib/serialisation/XmlIO.cc b/Grid/serialisation/XmlIO.cc similarity index 100% rename from lib/serialisation/XmlIO.cc rename to Grid/serialisation/XmlIO.cc diff --git a/lib/serialisation/XmlIO.h b/Grid/serialisation/XmlIO.h similarity index 100% rename from lib/serialisation/XmlIO.h rename to Grid/serialisation/XmlIO.h diff --git a/lib/simd/BGQQPX.h b/Grid/simd/BGQQPX.h similarity index 100% rename from lib/simd/BGQQPX.h rename to Grid/simd/BGQQPX.h diff --git a/lib/simd/Grid_avx.h b/Grid/simd/Grid_avx.h similarity index 100% rename from lib/simd/Grid_avx.h rename to Grid/simd/Grid_avx.h diff --git a/lib/simd/Grid_avx512.h b/Grid/simd/Grid_avx512.h similarity index 100% rename from lib/simd/Grid_avx512.h rename to Grid/simd/Grid_avx512.h diff --git a/lib/simd/Grid_generic.h b/Grid/simd/Grid_generic.h similarity index 100% rename from lib/simd/Grid_generic.h rename to Grid/simd/Grid_generic.h diff --git a/lib/simd/Grid_generic_types.h b/Grid/simd/Grid_generic_types.h similarity index 100% rename from lib/simd/Grid_generic_types.h rename to Grid/simd/Grid_generic_types.h diff --git a/lib/simd/Grid_imci.h b/Grid/simd/Grid_imci.h similarity index 100% rename from lib/simd/Grid_imci.h rename to Grid/simd/Grid_imci.h diff --git a/lib/simd/Grid_neon.h b/Grid/simd/Grid_neon.h similarity index 100% rename from lib/simd/Grid_neon.h rename to Grid/simd/Grid_neon.h diff --git a/lib/simd/Grid_qpx.h b/Grid/simd/Grid_qpx.h similarity index 100% rename from lib/simd/Grid_qpx.h rename to Grid/simd/Grid_qpx.h diff --git a/lib/simd/Grid_sse4.h b/Grid/simd/Grid_sse4.h similarity index 100% rename from lib/simd/Grid_sse4.h rename to Grid/simd/Grid_sse4.h diff --git a/lib/simd/Grid_vector_types.h b/Grid/simd/Grid_vector_types.h similarity index 100% rename from lib/simd/Grid_vector_types.h rename to Grid/simd/Grid_vector_types.h diff --git a/lib/simd/Grid_vector_unops.h b/Grid/simd/Grid_vector_unops.h similarity index 100% rename from lib/simd/Grid_vector_unops.h rename to Grid/simd/Grid_vector_unops.h diff --git a/lib/simd/IBM_qpx.h b/Grid/simd/IBM_qpx.h similarity index 100% rename from lib/simd/IBM_qpx.h rename to Grid/simd/IBM_qpx.h diff --git a/lib/simd/IBM_qpx_double.h b/Grid/simd/IBM_qpx_double.h similarity index 100% rename from lib/simd/IBM_qpx_double.h rename to Grid/simd/IBM_qpx_double.h diff --git a/lib/simd/IBM_qpx_single.h b/Grid/simd/IBM_qpx_single.h similarity index 100% rename from lib/simd/IBM_qpx_single.h rename to Grid/simd/IBM_qpx_single.h diff --git a/lib/simd/Intel512avx.h b/Grid/simd/Intel512avx.h similarity index 100% rename from lib/simd/Intel512avx.h rename to Grid/simd/Intel512avx.h diff --git a/lib/simd/Intel512common.h b/Grid/simd/Intel512common.h similarity index 100% rename from lib/simd/Intel512common.h rename to Grid/simd/Intel512common.h diff --git a/lib/simd/Intel512double.h b/Grid/simd/Intel512double.h similarity index 100% rename from lib/simd/Intel512double.h rename to Grid/simd/Intel512double.h diff --git a/lib/simd/Intel512imci.h b/Grid/simd/Intel512imci.h similarity index 100% rename from lib/simd/Intel512imci.h rename to Grid/simd/Intel512imci.h diff --git a/lib/simd/Intel512single.h b/Grid/simd/Intel512single.h similarity index 100% rename from lib/simd/Intel512single.h rename to Grid/simd/Intel512single.h diff --git a/lib/simd/Intel512wilson.h b/Grid/simd/Intel512wilson.h similarity index 100% rename from lib/simd/Intel512wilson.h rename to Grid/simd/Intel512wilson.h diff --git a/lib/simd/Simd.h b/Grid/simd/Simd.h similarity index 100% rename from lib/simd/Simd.h rename to Grid/simd/Simd.h diff --git a/lib/simd/l1p.h b/Grid/simd/l1p.h similarity index 100% rename from lib/simd/l1p.h rename to Grid/simd/l1p.h diff --git a/lib/sitmo_rng/README b/Grid/sitmo_rng/README similarity index 100% rename from lib/sitmo_rng/README rename to Grid/sitmo_rng/README diff --git a/lib/sitmo_rng/sitmo_prng_engine.hpp b/Grid/sitmo_rng/sitmo_prng_engine.hpp similarity index 100% rename from lib/sitmo_rng/sitmo_prng_engine.hpp rename to Grid/sitmo_rng/sitmo_prng_engine.hpp diff --git a/lib/stencil/Lebesgue.cc b/Grid/stencil/Lebesgue.cc similarity index 100% rename from lib/stencil/Lebesgue.cc rename to Grid/stencil/Lebesgue.cc diff --git a/lib/stencil/Lebesgue.h b/Grid/stencil/Lebesgue.h similarity index 100% rename from lib/stencil/Lebesgue.h rename to Grid/stencil/Lebesgue.h diff --git a/lib/stencil/SimpleCompressor.h b/Grid/stencil/SimpleCompressor.h similarity index 100% rename from lib/stencil/SimpleCompressor.h rename to Grid/stencil/SimpleCompressor.h diff --git a/lib/stencil/Stencil.cc b/Grid/stencil/Stencil.cc similarity index 100% rename from lib/stencil/Stencil.cc rename to Grid/stencil/Stencil.cc diff --git a/lib/stencil/Stencil.h b/Grid/stencil/Stencil.h similarity index 100% rename from lib/stencil/Stencil.h rename to Grid/stencil/Stencil.h diff --git a/lib/tensors/Tensor_Ta.h b/Grid/tensors/Tensor_Ta.h similarity index 100% rename from lib/tensors/Tensor_Ta.h rename to Grid/tensors/Tensor_Ta.h diff --git a/lib/tensors/Tensor_arith.h b/Grid/tensors/Tensor_arith.h similarity index 100% rename from lib/tensors/Tensor_arith.h rename to Grid/tensors/Tensor_arith.h diff --git a/lib/tensors/Tensor_arith_add.h b/Grid/tensors/Tensor_arith_add.h similarity index 100% rename from lib/tensors/Tensor_arith_add.h rename to Grid/tensors/Tensor_arith_add.h diff --git a/lib/tensors/Tensor_arith_mac.h b/Grid/tensors/Tensor_arith_mac.h similarity index 100% rename from lib/tensors/Tensor_arith_mac.h rename to Grid/tensors/Tensor_arith_mac.h diff --git a/lib/tensors/Tensor_arith_mul.h b/Grid/tensors/Tensor_arith_mul.h similarity index 100% rename from lib/tensors/Tensor_arith_mul.h rename to Grid/tensors/Tensor_arith_mul.h diff --git a/lib/tensors/Tensor_arith_scalar.h b/Grid/tensors/Tensor_arith_scalar.h similarity index 100% rename from lib/tensors/Tensor_arith_scalar.h rename to Grid/tensors/Tensor_arith_scalar.h diff --git a/lib/tensors/Tensor_arith_sub.h b/Grid/tensors/Tensor_arith_sub.h similarity index 100% rename from lib/tensors/Tensor_arith_sub.h rename to Grid/tensors/Tensor_arith_sub.h diff --git a/lib/tensors/Tensor_class.h b/Grid/tensors/Tensor_class.h similarity index 100% rename from lib/tensors/Tensor_class.h rename to Grid/tensors/Tensor_class.h diff --git a/lib/tensors/Tensor_determinant.h b/Grid/tensors/Tensor_determinant.h similarity index 100% rename from lib/tensors/Tensor_determinant.h rename to Grid/tensors/Tensor_determinant.h diff --git a/lib/tensors/Tensor_exp.h b/Grid/tensors/Tensor_exp.h similarity index 100% rename from lib/tensors/Tensor_exp.h rename to Grid/tensors/Tensor_exp.h diff --git a/lib/tensors/Tensor_extract_merge.h b/Grid/tensors/Tensor_extract_merge.h similarity index 100% rename from lib/tensors/Tensor_extract_merge.h rename to Grid/tensors/Tensor_extract_merge.h diff --git a/lib/tensors/Tensor_index.h b/Grid/tensors/Tensor_index.h similarity index 100% rename from lib/tensors/Tensor_index.h rename to Grid/tensors/Tensor_index.h diff --git a/lib/tensors/Tensor_inner.h b/Grid/tensors/Tensor_inner.h similarity index 100% rename from lib/tensors/Tensor_inner.h rename to Grid/tensors/Tensor_inner.h diff --git a/lib/tensors/Tensor_logical.h b/Grid/tensors/Tensor_logical.h similarity index 100% rename from lib/tensors/Tensor_logical.h rename to Grid/tensors/Tensor_logical.h diff --git a/lib/tensors/Tensor_outer.h b/Grid/tensors/Tensor_outer.h similarity index 100% rename from lib/tensors/Tensor_outer.h rename to Grid/tensors/Tensor_outer.h diff --git a/lib/tensors/Tensor_reality.h b/Grid/tensors/Tensor_reality.h similarity index 100% rename from lib/tensors/Tensor_reality.h rename to Grid/tensors/Tensor_reality.h diff --git a/lib/tensors/Tensor_trace.h b/Grid/tensors/Tensor_trace.h similarity index 100% rename from lib/tensors/Tensor_trace.h rename to Grid/tensors/Tensor_trace.h diff --git a/lib/tensors/Tensor_traits.h b/Grid/tensors/Tensor_traits.h similarity index 100% rename from lib/tensors/Tensor_traits.h rename to Grid/tensors/Tensor_traits.h diff --git a/lib/tensors/Tensor_transpose.h b/Grid/tensors/Tensor_transpose.h similarity index 100% rename from lib/tensors/Tensor_transpose.h rename to Grid/tensors/Tensor_transpose.h diff --git a/lib/tensors/Tensor_unary.h b/Grid/tensors/Tensor_unary.h similarity index 100% rename from lib/tensors/Tensor_unary.h rename to Grid/tensors/Tensor_unary.h diff --git a/lib/tensors/Tensors.h b/Grid/tensors/Tensors.h similarity index 100% rename from lib/tensors/Tensors.h rename to Grid/tensors/Tensors.h diff --git a/lib/threads/Threads.h b/Grid/threads/Threads.h similarity index 100% rename from lib/threads/Threads.h rename to Grid/threads/Threads.h diff --git a/lib/util/CompilerCompatible.h b/Grid/util/CompilerCompatible.h similarity index 100% rename from lib/util/CompilerCompatible.h rename to Grid/util/CompilerCompatible.h diff --git a/lib/util/Init.cc b/Grid/util/Init.cc similarity index 100% rename from lib/util/Init.cc rename to Grid/util/Init.cc diff --git a/lib/util/Init.h b/Grid/util/Init.h similarity index 100% rename from lib/util/Init.h rename to Grid/util/Init.h diff --git a/lib/util/Lexicographic.h b/Grid/util/Lexicographic.h similarity index 100% rename from lib/util/Lexicographic.h rename to Grid/util/Lexicographic.h diff --git a/lib/util/Profiling.h b/Grid/util/Profiling.h similarity index 100% rename from lib/util/Profiling.h rename to Grid/util/Profiling.h diff --git a/lib/util/Sha.h b/Grid/util/Sha.h similarity index 100% rename from lib/util/Sha.h rename to Grid/util/Sha.h diff --git a/lib/util/Util.h b/Grid/util/Util.h similarity index 100% rename from lib/util/Util.h rename to Grid/util/Util.h diff --git a/lib/util/version.cc b/Grid/util/version.cc similarity index 100% rename from lib/util/version.cc rename to Grid/util/version.cc diff --git a/Grid/version.h b/Grid/version.h new file mode 100644 index 00000000..ca8d9007 --- /dev/null +++ b/Grid/version.h @@ -0,0 +1 @@ +#define GITHASH "5f206df775c54dc2b863bacb5ade177ee58032a8: (HEAD -> feature/hadrons, gh/feature/hadrons, cliath/feature/hadrons) uncommited changes" diff --git a/extras/Hadrons/A2AVectors.hpp b/Hadrons/A2AVectors.hpp similarity index 98% rename from extras/Hadrons/A2AVectors.hpp rename to Hadrons/A2AVectors.hpp index 6e865203..002cd271 100644 --- a/extras/Hadrons/A2AVectors.hpp +++ b/Hadrons/A2AVectors.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef A2A_Vectors_hpp_ #define A2A_Vectors_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Application.cc b/Hadrons/Application.cc similarity index 98% rename from extras/Hadrons/Application.cc rename to Hadrons/Application.cc index 17e833dd..12fae13e 100644 --- a/extras/Hadrons/Application.cc +++ b/Hadrons/Application.cc @@ -26,9 +26,9 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include -#include -#include +#include +#include +#include using namespace Grid; using namespace QCD; diff --git a/extras/Hadrons/Application.hpp b/Hadrons/Application.hpp similarity index 97% rename from extras/Hadrons/Application.hpp rename to Hadrons/Application.hpp index 82307d62..e942c21c 100644 --- a/extras/Hadrons/Application.hpp +++ b/Hadrons/Application.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_Application_hpp_ #define Hadrons_Application_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/DilutedNoise.hpp b/Hadrons/DilutedNoise.hpp similarity index 99% rename from extras/Hadrons/DilutedNoise.hpp rename to Hadrons/DilutedNoise.hpp index 250f8445..c6ab71bc 100644 --- a/extras/Hadrons/DilutedNoise.hpp +++ b/Hadrons/DilutedNoise.hpp @@ -28,7 +28,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_DilutedNoise_hpp_ #define Hadrons_DilutedNoise_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/EigenPack.hpp b/Hadrons/EigenPack.hpp similarity index 99% rename from extras/Hadrons/EigenPack.hpp rename to Hadrons/EigenPack.hpp index d19e7728..a6d4bcf6 100644 --- a/extras/Hadrons/EigenPack.hpp +++ b/Hadrons/EigenPack.hpp @@ -28,7 +28,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_EigenPack_hpp_ #define Hadrons_EigenPack_hpp_ -#include +#include #include #include diff --git a/extras/Hadrons/Environment.cc b/Hadrons/Environment.cc similarity index 98% rename from extras/Hadrons/Environment.cc rename to Hadrons/Environment.cc index ced61ce4..b2d8cf1a 100644 --- a/extras/Hadrons/Environment.cc +++ b/Hadrons/Environment.cc @@ -26,9 +26,9 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include -#include -#include +#include +#include +#include using namespace Grid; using namespace QCD; diff --git a/extras/Hadrons/Environment.hpp b/Hadrons/Environment.hpp similarity index 99% rename from extras/Hadrons/Environment.hpp rename to Hadrons/Environment.hpp index c277b3db..32e6f05a 100644 --- a/extras/Hadrons/Environment.hpp +++ b/Hadrons/Environment.hpp @@ -29,7 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_Environment_hpp_ #define Hadrons_Environment_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Exceptions.cc b/Hadrons/Exceptions.cc similarity index 96% rename from extras/Hadrons/Exceptions.cc rename to Hadrons/Exceptions.cc index c44f4cd0..1ba6e7d1 100644 --- a/extras/Hadrons/Exceptions.cc +++ b/Hadrons/Exceptions.cc @@ -26,9 +26,9 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include -#include -#include +#include +#include +#include #ifndef ERR_SUFF #define ERR_SUFF " (" + loc + ")" diff --git a/extras/Hadrons/Exceptions.hpp b/Hadrons/Exceptions.hpp similarity index 99% rename from extras/Hadrons/Exceptions.hpp rename to Hadrons/Exceptions.hpp index e6a7aea8..897997cb 100644 --- a/extras/Hadrons/Exceptions.hpp +++ b/Hadrons/Exceptions.hpp @@ -32,7 +32,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #include #include #ifndef Hadrons_Global_hpp_ -#include +#include #endif #define HADRONS_SRC_LOC std::string(__FUNCTION__) + " at " \ diff --git a/extras/Hadrons/Factory.hpp b/Hadrons/Factory.hpp similarity index 98% rename from extras/Hadrons/Factory.hpp rename to Hadrons/Factory.hpp index 07516640..08617402 100644 --- a/extras/Hadrons/Factory.hpp +++ b/Hadrons/Factory.hpp @@ -29,7 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_Factory_hpp_ #define Hadrons_Factory_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/GeneticScheduler.hpp b/Hadrons/GeneticScheduler.hpp similarity index 99% rename from extras/Hadrons/GeneticScheduler.hpp rename to Hadrons/GeneticScheduler.hpp index 83666402..b58648f9 100644 --- a/extras/Hadrons/GeneticScheduler.hpp +++ b/Hadrons/GeneticScheduler.hpp @@ -29,8 +29,8 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_GeneticScheduler_hpp_ #define Hadrons_GeneticScheduler_hpp_ -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Global.cc b/Hadrons/Global.cc similarity index 99% rename from extras/Hadrons/Global.cc rename to Hadrons/Global.cc index 1e747cda..df3b1a31 100644 --- a/extras/Hadrons/Global.cc +++ b/Hadrons/Global.cc @@ -26,7 +26,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace QCD; diff --git a/extras/Hadrons/Global.hpp b/Hadrons/Global.hpp similarity index 99% rename from extras/Hadrons/Global.hpp rename to Hadrons/Global.hpp index e1e29e43..7a5df1ba 100644 --- a/extras/Hadrons/Global.hpp +++ b/Hadrons/Global.hpp @@ -219,6 +219,6 @@ void printTimeProfile(const std::map &timing, GridTime to END_HADRONS_NAMESPACE -#include +#include #endif // Hadrons_Global_hpp_ diff --git a/extras/Hadrons/Graph.hpp b/Hadrons/Graph.hpp similarity index 99% rename from extras/Hadrons/Graph.hpp rename to Hadrons/Graph.hpp index ad84e7e0..6f4a9e4a 100644 --- a/extras/Hadrons/Graph.hpp +++ b/Hadrons/Graph.hpp @@ -29,7 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_Graph_hpp_ #define Hadrons_Graph_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/HadronsXmlRun.cc b/Hadrons/HadronsXmlRun.cc similarity index 98% rename from extras/Hadrons/HadronsXmlRun.cc rename to Hadrons/HadronsXmlRun.cc index 6b613bb4..0b62bdd1 100644 --- a/extras/Hadrons/HadronsXmlRun.cc +++ b/Hadrons/HadronsXmlRun.cc @@ -26,7 +26,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace QCD; diff --git a/extras/Hadrons/Makefile.am b/Hadrons/Makefile.am similarity index 94% rename from extras/Hadrons/Makefile.am rename to Hadrons/Makefile.am index 840c6fb5..93251dca 100644 --- a/extras/Hadrons/Makefile.am +++ b/Hadrons/Makefile.am @@ -11,7 +11,7 @@ libHadrons_a_SOURCES = \ Global.cc \ Module.cc \ VirtualMachine.cc -libHadrons_adir = $(pkgincludedir)/Hadrons +libHadrons_adir = $(includedir)/Hadrons nobase_libHadrons_a_HEADERS = \ $(modules_hpp) \ A2AVectors.hpp \ diff --git a/extras/Hadrons/Module.cc b/Hadrons/Module.cc similarity index 99% rename from extras/Hadrons/Module.cc rename to Hadrons/Module.cc index 8e915f6b..7bb0e862 100644 --- a/extras/Hadrons/Module.cc +++ b/Hadrons/Module.cc @@ -26,7 +26,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace QCD; diff --git a/extras/Hadrons/Module.hpp b/Hadrons/Module.hpp similarity index 99% rename from extras/Hadrons/Module.hpp rename to Hadrons/Module.hpp index 02a20e5f..f374d231 100644 --- a/extras/Hadrons/Module.hpp +++ b/Hadrons/Module.hpp @@ -29,8 +29,8 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_Module_hpp_ #define Hadrons_Module_hpp_ -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/ModuleFactory.hpp b/Hadrons/ModuleFactory.hpp similarity index 93% rename from extras/Hadrons/ModuleFactory.hpp rename to Hadrons/ModuleFactory.hpp index d5c703fa..8fca06c3 100644 --- a/extras/Hadrons/ModuleFactory.hpp +++ b/Hadrons/ModuleFactory.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_ModuleFactory_hpp_ #define Hadrons_ModuleFactory_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/Hadrons/Modules.hpp b/Hadrons/Modules.hpp new file mode 100644 index 00000000..7725e8c2 --- /dev/null +++ b/Hadrons/Modules.hpp @@ -0,0 +1,96 @@ +/************************************************************************************* + +Grid physics library, www.github.com/paboyle/Grid + +Source file: extras/Hadrons/Modules.hpp + +Copyright (C) 2015-2018 + +Author: Antonin Portelli +Author: Guido Cossu +Author: James Harrison +Author: Lanny91 +Author: Peter Boyle +Author: Vera Guelpers +Author: fionnoh +Author: pretidav + +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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#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/MAction/DWF.cc b/Hadrons/Modules/MAction/DWF.cc similarity index 96% rename from extras/Hadrons/Modules/MAction/DWF.cc rename to Hadrons/Modules/MAction/DWF.cc index ae518018..df720013 100644 --- a/extras/Hadrons/Modules/MAction/DWF.cc +++ b/Hadrons/Modules/MAction/DWF.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MAction/DWF.hpp b/Hadrons/Modules/MAction/DWF.hpp similarity index 97% rename from extras/Hadrons/Modules/MAction/DWF.hpp rename to Hadrons/Modules/MAction/DWF.hpp index 94a05cc8..093dd1a6 100644 --- a/extras/Hadrons/Modules/MAction/DWF.hpp +++ b/Hadrons/Modules/MAction/DWF.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MAction_DWF_hpp_ #define Hadrons_MAction_DWF_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MAction/MobiusDWF.cc b/Hadrons/Modules/MAction/MobiusDWF.cc similarity index 95% rename from extras/Hadrons/Modules/MAction/MobiusDWF.cc rename to Hadrons/Modules/MAction/MobiusDWF.cc index 9cc4755a..6efbfdb2 100644 --- a/extras/Hadrons/Modules/MAction/MobiusDWF.cc +++ b/Hadrons/Modules/MAction/MobiusDWF.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MAction/MobiusDWF.hpp b/Hadrons/Modules/MAction/MobiusDWF.hpp similarity index 97% rename from extras/Hadrons/Modules/MAction/MobiusDWF.hpp rename to Hadrons/Modules/MAction/MobiusDWF.hpp index 9cead7bd..7f96b9ca 100644 --- a/extras/Hadrons/Modules/MAction/MobiusDWF.hpp +++ b/Hadrons/Modules/MAction/MobiusDWF.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MAction_MobiusDWF_hpp_ #define Hadrons_MAction_MobiusDWF_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MAction/ScaledDWF.cc b/Hadrons/Modules/MAction/ScaledDWF.cc similarity index 95% rename from extras/Hadrons/Modules/MAction/ScaledDWF.cc rename to Hadrons/Modules/MAction/ScaledDWF.cc index 40eed326..437db78b 100644 --- a/extras/Hadrons/Modules/MAction/ScaledDWF.cc +++ b/Hadrons/Modules/MAction/ScaledDWF.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MAction/ScaledDWF.hpp b/Hadrons/Modules/MAction/ScaledDWF.hpp similarity index 97% rename from extras/Hadrons/Modules/MAction/ScaledDWF.hpp rename to Hadrons/Modules/MAction/ScaledDWF.hpp index b75ff31d..18993370 100644 --- a/extras/Hadrons/Modules/MAction/ScaledDWF.hpp +++ b/Hadrons/Modules/MAction/ScaledDWF.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MAction_ScaledDWF_hpp_ #define Hadrons_MAction_ScaledDWF_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MAction/Wilson.cc b/Hadrons/Modules/MAction/Wilson.cc similarity index 96% rename from extras/Hadrons/Modules/MAction/Wilson.cc rename to Hadrons/Modules/MAction/Wilson.cc index 11924d5a..db99f977 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.cc +++ b/Hadrons/Modules/MAction/Wilson.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MAction/Wilson.hpp b/Hadrons/Modules/MAction/Wilson.hpp similarity index 97% rename from extras/Hadrons/Modules/MAction/Wilson.hpp rename to Hadrons/Modules/MAction/Wilson.hpp index 70e0acf1..ab604932 100644 --- a/extras/Hadrons/Modules/MAction/Wilson.hpp +++ b/Hadrons/Modules/MAction/Wilson.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MAction_Wilson_hpp_ #define Hadrons_MAction_Wilson_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MAction/WilsonClover.cc b/Hadrons/Modules/MAction/WilsonClover.cc similarity index 95% rename from extras/Hadrons/Modules/MAction/WilsonClover.cc rename to Hadrons/Modules/MAction/WilsonClover.cc index 77099044..8fe83a72 100644 --- a/extras/Hadrons/Modules/MAction/WilsonClover.cc +++ b/Hadrons/Modules/MAction/WilsonClover.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MAction/WilsonClover.hpp b/Hadrons/Modules/MAction/WilsonClover.hpp similarity index 97% rename from extras/Hadrons/Modules/MAction/WilsonClover.hpp rename to Hadrons/Modules/MAction/WilsonClover.hpp index 0fb3b442..31bb3d41 100644 --- a/extras/Hadrons/Modules/MAction/WilsonClover.hpp +++ b/Hadrons/Modules/MAction/WilsonClover.hpp @@ -31,9 +31,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MAction_WilsonClover_hpp_ #define Hadrons_MAction_WilsonClover_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MAction/ZMobiusDWF.cc b/Hadrons/Modules/MAction/ZMobiusDWF.cc similarity index 95% rename from extras/Hadrons/Modules/MAction/ZMobiusDWF.cc rename to Hadrons/Modules/MAction/ZMobiusDWF.cc index 7a49c120..5a1a0a6e 100644 --- a/extras/Hadrons/Modules/MAction/ZMobiusDWF.cc +++ b/Hadrons/Modules/MAction/ZMobiusDWF.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MAction/ZMobiusDWF.hpp b/Hadrons/Modules/MAction/ZMobiusDWF.hpp similarity index 97% rename from extras/Hadrons/Modules/MAction/ZMobiusDWF.hpp rename to Hadrons/Modules/MAction/ZMobiusDWF.hpp index 4a275dd0..3a00ec51 100644 --- a/extras/Hadrons/Modules/MAction/ZMobiusDWF.hpp +++ b/Hadrons/Modules/MAction/ZMobiusDWF.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MAction_ZMobiusDWF_hpp_ #define Hadrons_MAction_ZMobiusDWF_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/A2AMesonField.cc b/Hadrons/Modules/MContraction/A2AMesonField.cc similarity index 95% rename from extras/Hadrons/Modules/MContraction/A2AMesonField.cc rename to Hadrons/Modules/MContraction/A2AMesonField.cc index 3d85acb5..d8fa8bf7 100644 --- a/extras/Hadrons/Modules/MContraction/A2AMesonField.cc +++ b/Hadrons/Modules/MContraction/A2AMesonField.cc @@ -26,7 +26,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/A2AMesonField.hpp b/Hadrons/Modules/MContraction/A2AMesonField.hpp similarity index 98% rename from extras/Hadrons/Modules/MContraction/A2AMesonField.hpp rename to Hadrons/Modules/MContraction/A2AMesonField.hpp index 27c599f0..797707b9 100644 --- a/extras/Hadrons/Modules/MContraction/A2AMesonField.hpp +++ b/Hadrons/Modules/MContraction/A2AMesonField.hpp @@ -30,12 +30,12 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_A2AMesonField_hpp_ #define Hadrons_MContraction_A2AMesonField_hpp_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define MF_PARALLEL_IO #ifndef MF_IO_TYPE diff --git a/extras/Hadrons/Modules/MContraction/A2AMesonFieldKernels.hpp b/Hadrons/Modules/MContraction/A2AMesonFieldKernels.hpp similarity index 99% rename from extras/Hadrons/Modules/MContraction/A2AMesonFieldKernels.hpp rename to Hadrons/Modules/MContraction/A2AMesonFieldKernels.hpp index 649f9fdf..ed078130 100644 --- a/extras/Hadrons/Modules/MContraction/A2AMesonFieldKernels.hpp +++ b/Hadrons/Modules/MContraction/A2AMesonFieldKernels.hpp @@ -29,8 +29,8 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_A2AMesonFieldKernels_hpp_ #define Hadrons_MContraction_A2AMesonFieldKernels_hpp_ -#include -#include +#include +#include #include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/Baryon.cc b/Hadrons/Modules/MContraction/Baryon.cc similarity index 95% rename from extras/Hadrons/Modules/MContraction/Baryon.cc rename to Hadrons/Modules/MContraction/Baryon.cc index 7daf5008..d397cd72 100644 --- a/extras/Hadrons/Modules/MContraction/Baryon.cc +++ b/Hadrons/Modules/MContraction/Baryon.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/Baryon.hpp b/Hadrons/Modules/MContraction/Baryon.hpp similarity index 97% rename from extras/Hadrons/Modules/MContraction/Baryon.hpp rename to Hadrons/Modules/MContraction/Baryon.hpp index 654706c6..927a299e 100644 --- a/extras/Hadrons/Modules/MContraction/Baryon.hpp +++ b/Hadrons/Modules/MContraction/Baryon.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_Baryon_hpp_ #define Hadrons_MContraction_Baryon_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/DiscLoop.cc b/Hadrons/Modules/MContraction/DiscLoop.cc similarity index 95% rename from extras/Hadrons/Modules/MContraction/DiscLoop.cc rename to Hadrons/Modules/MContraction/DiscLoop.cc index 8c7a72ee..683e4e74 100644 --- a/extras/Hadrons/Modules/MContraction/DiscLoop.cc +++ b/Hadrons/Modules/MContraction/DiscLoop.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/DiscLoop.hpp b/Hadrons/Modules/MContraction/DiscLoop.hpp similarity index 97% rename from extras/Hadrons/Modules/MContraction/DiscLoop.hpp rename to Hadrons/Modules/MContraction/DiscLoop.hpp index ea3d3d2f..c88df7d9 100644 --- a/extras/Hadrons/Modules/MContraction/DiscLoop.hpp +++ b/Hadrons/Modules/MContraction/DiscLoop.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_DiscLoop_hpp_ #define Hadrons_MContraction_DiscLoop_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/Gamma3pt.cc b/Hadrons/Modules/MContraction/Gamma3pt.cc similarity index 95% rename from extras/Hadrons/Modules/MContraction/Gamma3pt.cc rename to Hadrons/Modules/MContraction/Gamma3pt.cc index 13e911bb..fb6fe896 100644 --- a/extras/Hadrons/Modules/MContraction/Gamma3pt.cc +++ b/Hadrons/Modules/MContraction/Gamma3pt.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/Gamma3pt.hpp b/Hadrons/Modules/MContraction/Gamma3pt.hpp similarity index 98% rename from extras/Hadrons/Modules/MContraction/Gamma3pt.hpp rename to Hadrons/Modules/MContraction/Gamma3pt.hpp index e30845bc..2abdaf5f 100644 --- a/extras/Hadrons/Modules/MContraction/Gamma3pt.hpp +++ b/Hadrons/Modules/MContraction/Gamma3pt.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_Gamma3pt_hpp_ #define Hadrons_MContraction_Gamma3pt_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/Meson.cc b/Hadrons/Modules/MContraction/Meson.cc similarity index 95% rename from extras/Hadrons/Modules/MContraction/Meson.cc rename to Hadrons/Modules/MContraction/Meson.cc index 3b880705..e4c83331 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.cc +++ b/Hadrons/Modules/MContraction/Meson.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/Hadrons/Modules/MContraction/Meson.hpp similarity index 98% rename from extras/Hadrons/Modules/MContraction/Meson.hpp rename to Hadrons/Modules/MContraction/Meson.hpp index 66a19214..077110a4 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/Hadrons/Modules/MContraction/Meson.hpp @@ -31,9 +31,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_Meson_hpp_ #define Hadrons_MContraction_Meson_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/WardIdentity.cc b/Hadrons/Modules/MContraction/WardIdentity.cc similarity index 95% rename from extras/Hadrons/Modules/MContraction/WardIdentity.cc rename to Hadrons/Modules/MContraction/WardIdentity.cc index 8b5cc2e3..ad2a46f1 100644 --- a/extras/Hadrons/Modules/MContraction/WardIdentity.cc +++ b/Hadrons/Modules/MContraction/WardIdentity.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/WardIdentity.hpp b/Hadrons/Modules/MContraction/WardIdentity.hpp similarity index 98% rename from extras/Hadrons/Modules/MContraction/WardIdentity.hpp rename to Hadrons/Modules/MContraction/WardIdentity.hpp index e529d7a2..b755015b 100644 --- a/extras/Hadrons/Modules/MContraction/WardIdentity.hpp +++ b/Hadrons/Modules/MContraction/WardIdentity.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_WardIdentity_hpp_ #define Hadrons_MContraction_WardIdentity_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp b/Hadrons/Modules/MContraction/WeakHamiltonian.hpp similarity index 97% rename from extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp rename to Hadrons/Modules/MContraction/WeakHamiltonian.hpp index 507e8cdb..83c3b772 100644 --- a/extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp +++ b/Hadrons/Modules/MContraction/WeakHamiltonian.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_WeakHamiltonian_hpp_ #define Hadrons_MContraction_WeakHamiltonian_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/WeakHamiltonianEye.cc b/Hadrons/Modules/MContraction/WeakHamiltonianEye.cc similarity index 98% rename from extras/Hadrons/Modules/MContraction/WeakHamiltonianEye.cc rename to Hadrons/Modules/MContraction/WeakHamiltonianEye.cc index da1c877e..16cee0bc 100644 --- a/extras/Hadrons/Modules/MContraction/WeakHamiltonianEye.cc +++ b/Hadrons/Modules/MContraction/WeakHamiltonianEye.cc @@ -27,7 +27,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/WeakHamiltonianEye.hpp b/Hadrons/Modules/MContraction/WeakHamiltonianEye.hpp similarity index 96% rename from extras/Hadrons/Modules/MContraction/WeakHamiltonianEye.hpp rename to Hadrons/Modules/MContraction/WeakHamiltonianEye.hpp index 24f39f6c..826547b4 100644 --- a/extras/Hadrons/Modules/MContraction/WeakHamiltonianEye.hpp +++ b/Hadrons/Modules/MContraction/WeakHamiltonianEye.hpp @@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_WeakHamiltonianEye_hpp_ #define Hadrons_MContraction_WeakHamiltonianEye_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.cc b/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.cc similarity index 98% rename from extras/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.cc rename to Hadrons/Modules/MContraction/WeakHamiltonianNonEye.cc index e7824d33..6ff22152 100644 --- a/extras/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.cc +++ b/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.cc @@ -27,7 +27,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.hpp b/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.hpp similarity index 96% rename from extras/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.hpp rename to Hadrons/Modules/MContraction/WeakHamiltonianNonEye.hpp index c4cd66f1..93830421 100644 --- a/extras/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.hpp +++ b/Hadrons/Modules/MContraction/WeakHamiltonianNonEye.hpp @@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_WeakHamiltonianNonEye_hpp_ #define Hadrons_MContraction_WeakHamiltonianNonEye_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.cc b/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.cc similarity index 98% rename from extras/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.cc rename to Hadrons/Modules/MContraction/WeakNeutral4ptDisc.cc index 0b7a2cde..89e8a79b 100644 --- a/extras/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.cc +++ b/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.cc @@ -27,7 +27,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.hpp b/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.hpp similarity index 96% rename from extras/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.hpp rename to Hadrons/Modules/MContraction/WeakNeutral4ptDisc.hpp index 5de2a751..c0b3ee53 100644 --- a/extras/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.hpp +++ b/Hadrons/Modules/MContraction/WeakNeutral4ptDisc.hpp @@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MContraction_WeakNeutral4ptDisc_hpp_ #define Hadrons_MContraction_WeakNeutral4ptDisc_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MFermion/FreeProp.cc b/Hadrons/Modules/MFermion/FreeProp.cc similarity index 96% rename from extras/Hadrons/Modules/MFermion/FreeProp.cc rename to Hadrons/Modules/MFermion/FreeProp.cc index 0ff07887..5184ed78 100644 --- a/extras/Hadrons/Modules/MFermion/FreeProp.cc +++ b/Hadrons/Modules/MFermion/FreeProp.cc @@ -26,7 +26,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MFermion/FreeProp.hpp b/Hadrons/Modules/MFermion/FreeProp.hpp similarity index 98% rename from extras/Hadrons/Modules/MFermion/FreeProp.hpp rename to Hadrons/Modules/MFermion/FreeProp.hpp index 1b7ddb9a..c06240de 100644 --- a/extras/Hadrons/Modules/MFermion/FreeProp.hpp +++ b/Hadrons/Modules/MFermion/FreeProp.hpp @@ -31,9 +31,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MFermion_FreeProp_hpp_ #define Hadrons_MFermion_FreeProp_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MFermion/GaugeProp.cc b/Hadrons/Modules/MFermion/GaugeProp.cc similarity index 96% rename from extras/Hadrons/Modules/MFermion/GaugeProp.cc rename to Hadrons/Modules/MFermion/GaugeProp.cc index f03bf2be..027e4cfc 100644 --- a/extras/Hadrons/Modules/MFermion/GaugeProp.cc +++ b/Hadrons/Modules/MFermion/GaugeProp.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MFermion/GaugeProp.hpp b/Hadrons/Modules/MFermion/GaugeProp.hpp similarity index 97% rename from extras/Hadrons/Modules/MFermion/GaugeProp.hpp rename to Hadrons/Modules/MFermion/GaugeProp.hpp index d2c9df05..24a6446a 100644 --- a/extras/Hadrons/Modules/MFermion/GaugeProp.hpp +++ b/Hadrons/Modules/MFermion/GaugeProp.hpp @@ -32,10 +32,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MFermion_GaugeProp_hpp_ #define Hadrons_MFermion_GaugeProp_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/FundtoHirep.cc b/Hadrons/Modules/MGauge/FundtoHirep.cc similarity index 97% rename from extras/Hadrons/Modules/MGauge/FundtoHirep.cc rename to Hadrons/Modules/MGauge/FundtoHirep.cc index 824ee8c8..4a880134 100644 --- a/extras/Hadrons/Modules/MGauge/FundtoHirep.cc +++ b/Hadrons/Modules/MGauge/FundtoHirep.cc @@ -28,7 +28,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MGauge/FundtoHirep.hpp b/Hadrons/Modules/MGauge/FundtoHirep.hpp similarity index 95% rename from extras/Hadrons/Modules/MGauge/FundtoHirep.hpp rename to Hadrons/Modules/MGauge/FundtoHirep.hpp index 3a3a83e5..b2f90089 100644 --- a/extras/Hadrons/Modules/MGauge/FundtoHirep.hpp +++ b/Hadrons/Modules/MGauge/FundtoHirep.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MGauge_FundtoHirep_hpp_ #define Hadrons_MGauge_FundtoHirep_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/Random.cc b/Hadrons/Modules/MGauge/Random.cc similarity index 97% rename from extras/Hadrons/Modules/MGauge/Random.cc rename to Hadrons/Modules/MGauge/Random.cc index 59b43331..b33c9a56 100644 --- a/extras/Hadrons/Modules/MGauge/Random.cc +++ b/Hadrons/Modules/MGauge/Random.cc @@ -26,7 +26,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MGauge/Random.hpp b/Hadrons/Modules/MGauge/Random.hpp similarity index 94% rename from extras/Hadrons/Modules/MGauge/Random.hpp rename to Hadrons/Modules/MGauge/Random.hpp index 13d0e478..a445aa5f 100644 --- a/extras/Hadrons/Modules/MGauge/Random.hpp +++ b/Hadrons/Modules/MGauge/Random.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MGauge_Random_hpp_ #define Hadrons_MGauge_Random_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/StochEm.cc b/Hadrons/Modules/MGauge/StochEm.cc similarity index 98% rename from extras/Hadrons/Modules/MGauge/StochEm.cc rename to Hadrons/Modules/MGauge/StochEm.cc index adb33d9c..e2b2c458 100644 --- a/extras/Hadrons/Modules/MGauge/StochEm.cc +++ b/Hadrons/Modules/MGauge/StochEm.cc @@ -27,7 +27,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MGauge/StochEm.hpp b/Hadrons/Modules/MGauge/StochEm.hpp similarity index 95% rename from extras/Hadrons/Modules/MGauge/StochEm.hpp rename to Hadrons/Modules/MGauge/StochEm.hpp index fd07c294..151b61dc 100644 --- a/extras/Hadrons/Modules/MGauge/StochEm.hpp +++ b/Hadrons/Modules/MGauge/StochEm.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MGauge_StochEm_hpp_ #define Hadrons_MGauge_StochEm_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/StoutSmearing.cc b/Hadrons/Modules/MGauge/StoutSmearing.cc similarity index 95% rename from extras/Hadrons/Modules/MGauge/StoutSmearing.cc rename to Hadrons/Modules/MGauge/StoutSmearing.cc index 3dae8428..01378d1f 100644 --- a/extras/Hadrons/Modules/MGauge/StoutSmearing.cc +++ b/Hadrons/Modules/MGauge/StoutSmearing.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MGauge/StoutSmearing.hpp b/Hadrons/Modules/MGauge/StoutSmearing.hpp similarity index 97% rename from extras/Hadrons/Modules/MGauge/StoutSmearing.hpp rename to Hadrons/Modules/MGauge/StoutSmearing.hpp index ddfc1a73..9ed1e98b 100644 --- a/extras/Hadrons/Modules/MGauge/StoutSmearing.hpp +++ b/Hadrons/Modules/MGauge/StoutSmearing.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MGauge_StoutSmearing_hpp_ #define Hadrons_MGauge_StoutSmearing_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/Unit.cc b/Hadrons/Modules/MGauge/Unit.cc similarity index 97% rename from extras/Hadrons/Modules/MGauge/Unit.cc rename to Hadrons/Modules/MGauge/Unit.cc index 3df12fa7..aa85f97e 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.cc +++ b/Hadrons/Modules/MGauge/Unit.cc @@ -26,7 +26,7 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MGauge/Unit.hpp b/Hadrons/Modules/MGauge/Unit.hpp similarity index 94% rename from extras/Hadrons/Modules/MGauge/Unit.hpp rename to Hadrons/Modules/MGauge/Unit.hpp index 8bdb7ef3..8600dafe 100644 --- a/extras/Hadrons/Modules/MGauge/Unit.hpp +++ b/Hadrons/Modules/MGauge/Unit.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MGauge_Unit_hpp_ #define Hadrons_MGauge_Unit_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MGauge/UnitEm.cc b/Hadrons/Modules/MGauge/UnitEm.cc similarity index 97% rename from extras/Hadrons/Modules/MGauge/UnitEm.cc rename to Hadrons/Modules/MGauge/UnitEm.cc index 5c076592..06d0117a 100644 --- a/extras/Hadrons/Modules/MGauge/UnitEm.cc +++ b/Hadrons/Modules/MGauge/UnitEm.cc @@ -26,7 +26,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MGauge/UnitEm.hpp b/Hadrons/Modules/MGauge/UnitEm.hpp similarity index 95% rename from extras/Hadrons/Modules/MGauge/UnitEm.hpp rename to Hadrons/Modules/MGauge/UnitEm.hpp index c6c89bb0..f6d83cb9 100644 --- a/extras/Hadrons/Modules/MGauge/UnitEm.hpp +++ b/Hadrons/Modules/MGauge/UnitEm.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MGauge_UnitEm_hpp_ #define Hadrons_MGauge_UnitEm_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MIO/LoadBinary.cc b/Hadrons/Modules/MIO/LoadBinary.cc similarity index 96% rename from extras/Hadrons/Modules/MIO/LoadBinary.cc rename to Hadrons/Modules/MIO/LoadBinary.cc index f04df9df..4e510a91 100644 --- a/extras/Hadrons/Modules/MIO/LoadBinary.cc +++ b/Hadrons/Modules/MIO/LoadBinary.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MIO/LoadBinary.hpp b/Hadrons/Modules/MIO/LoadBinary.hpp similarity index 97% rename from extras/Hadrons/Modules/MIO/LoadBinary.hpp rename to Hadrons/Modules/MIO/LoadBinary.hpp index b2070bef..c307a7dd 100644 --- a/extras/Hadrons/Modules/MIO/LoadBinary.hpp +++ b/Hadrons/Modules/MIO/LoadBinary.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MIO_LoadBinary_hpp_ #define Hadrons_MIO_LoadBinary_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.cc b/Hadrons/Modules/MIO/LoadCoarseEigenPack.cc similarity index 95% rename from extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.cc rename to Hadrons/Modules/MIO/LoadCoarseEigenPack.cc index 0ed7643c..68f96914 100644 --- a/extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.cc +++ b/Hadrons/Modules/MIO/LoadCoarseEigenPack.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp b/Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp similarity index 97% rename from extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp rename to Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp index 945b6751..78834d14 100644 --- a/extras/Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp +++ b/Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MIO_LoadCoarseEigenPack_hpp_ #define Hadrons_MIO_LoadCoarseEigenPack_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MIO/LoadEigenPack.cc b/Hadrons/Modules/MIO/LoadEigenPack.cc similarity index 95% rename from extras/Hadrons/Modules/MIO/LoadEigenPack.cc rename to Hadrons/Modules/MIO/LoadEigenPack.cc index 5b7aebc3..e492f0f1 100644 --- a/extras/Hadrons/Modules/MIO/LoadEigenPack.cc +++ b/Hadrons/Modules/MIO/LoadEigenPack.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MIO/LoadEigenPack.hpp b/Hadrons/Modules/MIO/LoadEigenPack.hpp similarity index 96% rename from extras/Hadrons/Modules/MIO/LoadEigenPack.hpp rename to Hadrons/Modules/MIO/LoadEigenPack.hpp index fcad4107..8ad85eba 100644 --- a/extras/Hadrons/Modules/MIO/LoadEigenPack.hpp +++ b/Hadrons/Modules/MIO/LoadEigenPack.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MIO_LoadEigenPack_hpp_ #define Hadrons_MIO_LoadEigenPack_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MIO/LoadNersc.cc b/Hadrons/Modules/MIO/LoadNersc.cc similarity index 98% rename from extras/Hadrons/Modules/MIO/LoadNersc.cc rename to Hadrons/Modules/MIO/LoadNersc.cc index 36a56d54..35645f9b 100644 --- a/extras/Hadrons/Modules/MIO/LoadNersc.cc +++ b/Hadrons/Modules/MIO/LoadNersc.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MIO/LoadNersc.hpp b/Hadrons/Modules/MIO/LoadNersc.hpp similarity index 95% rename from extras/Hadrons/Modules/MIO/LoadNersc.hpp rename to Hadrons/Modules/MIO/LoadNersc.hpp index 11b86eec..80e5ee18 100644 --- a/extras/Hadrons/Modules/MIO/LoadNersc.hpp +++ b/Hadrons/Modules/MIO/LoadNersc.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MIO_LoadNersc_hpp_ #define Hadrons_MIO_LoadNersc_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MLoop/NoiseLoop.cc b/Hadrons/Modules/MLoop/NoiseLoop.cc similarity index 96% rename from extras/Hadrons/Modules/MLoop/NoiseLoop.cc rename to Hadrons/Modules/MLoop/NoiseLoop.cc index 5c510afd..57e4bda6 100644 --- a/extras/Hadrons/Modules/MLoop/NoiseLoop.cc +++ b/Hadrons/Modules/MLoop/NoiseLoop.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MLoop/NoiseLoop.hpp b/Hadrons/Modules/MLoop/NoiseLoop.hpp similarity index 97% rename from extras/Hadrons/Modules/MLoop/NoiseLoop.hpp rename to Hadrons/Modules/MLoop/NoiseLoop.hpp index 3ce9353d..9c6f4cf5 100644 --- a/extras/Hadrons/Modules/MLoop/NoiseLoop.hpp +++ b/Hadrons/Modules/MLoop/NoiseLoop.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MLoop_NoiseLoop_hpp_ #define Hadrons_MLoop_NoiseLoop_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc b/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc similarity index 95% rename from extras/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc rename to Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc index 50997962..e4e73944 100644 --- a/extras/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc +++ b/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp b/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp similarity index 96% rename from extras/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp rename to Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp index 3c324cd1..05f0252f 100644 --- a/extras/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp +++ b/Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MNoise_TimeDilutedSpinColorDiagonal_hpp_ #define Hadrons_MNoise_TimeDilutedSpinColorDiagonal_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalar/ChargedProp.cc b/Hadrons/Modules/MScalar/ChargedProp.cc similarity index 99% rename from extras/Hadrons/Modules/MScalar/ChargedProp.cc rename to Hadrons/Modules/MScalar/ChargedProp.cc index 88c3dffd..c1f8fc6c 100644 --- a/extras/Hadrons/Modules/MScalar/ChargedProp.cc +++ b/Hadrons/Modules/MScalar/ChargedProp.cc @@ -26,8 +26,8 @@ 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 +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalar/ChargedProp.hpp b/Hadrons/Modules/MScalar/ChargedProp.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalar/ChargedProp.hpp rename to Hadrons/Modules/MScalar/ChargedProp.hpp index 5b2f0422..45872850 100644 --- a/extras/Hadrons/Modules/MScalar/ChargedProp.hpp +++ b/Hadrons/Modules/MScalar/ChargedProp.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalar_ChargedProp_hpp_ #define Hadrons_MScalar_ChargedProp_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalar/FreeProp.cc b/Hadrons/Modules/MScalar/FreeProp.cc similarity index 96% rename from extras/Hadrons/Modules/MScalar/FreeProp.cc rename to Hadrons/Modules/MScalar/FreeProp.cc index 8d256e3c..4ae87848 100644 --- a/extras/Hadrons/Modules/MScalar/FreeProp.cc +++ b/Hadrons/Modules/MScalar/FreeProp.cc @@ -25,8 +25,8 @@ 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 +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalar/FreeProp.hpp b/Hadrons/Modules/MScalar/FreeProp.hpp similarity index 95% rename from extras/Hadrons/Modules/MScalar/FreeProp.hpp rename to Hadrons/Modules/MScalar/FreeProp.hpp index 50f4ba52..c307d4f9 100644 --- a/extras/Hadrons/Modules/MScalar/FreeProp.hpp +++ b/Hadrons/Modules/MScalar/FreeProp.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalar_FreeProp_hpp_ #define Hadrons_MScalar_FreeProp_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalar/Scalar.hpp b/Hadrons/Modules/MScalar/Scalar.hpp similarity index 100% rename from extras/Hadrons/Modules/MScalar/Scalar.hpp rename to Hadrons/Modules/MScalar/Scalar.hpp diff --git a/extras/Hadrons/Modules/MScalar/ScalarVP.cc b/Hadrons/Modules/MScalar/ScalarVP.cc similarity index 99% rename from extras/Hadrons/Modules/MScalar/ScalarVP.cc rename to Hadrons/Modules/MScalar/ScalarVP.cc index b43b0c9f..cafbf952 100644 --- a/extras/Hadrons/Modules/MScalar/ScalarVP.cc +++ b/Hadrons/Modules/MScalar/ScalarVP.cc @@ -26,9 +26,9 @@ 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 -#include +#include +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalar/ScalarVP.hpp b/Hadrons/Modules/MScalar/ScalarVP.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalar/ScalarVP.hpp rename to Hadrons/Modules/MScalar/ScalarVP.hpp index 191348d3..3c772c05 100644 --- a/extras/Hadrons/Modules/MScalar/ScalarVP.hpp +++ b/Hadrons/Modules/MScalar/ScalarVP.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalar_ScalarVP_hpp_ #define Hadrons_MScalar_ScalarVP_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalar/VPCounterTerms.cc b/Hadrons/Modules/MScalar/VPCounterTerms.cc similarity index 98% rename from extras/Hadrons/Modules/MScalar/VPCounterTerms.cc rename to Hadrons/Modules/MScalar/VPCounterTerms.cc index 4c3fab85..9953a7be 100644 --- a/extras/Hadrons/Modules/MScalar/VPCounterTerms.cc +++ b/Hadrons/Modules/MScalar/VPCounterTerms.cc @@ -26,8 +26,8 @@ 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 +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalar/VPCounterTerms.hpp b/Hadrons/Modules/MScalar/VPCounterTerms.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalar/VPCounterTerms.hpp rename to Hadrons/Modules/MScalar/VPCounterTerms.hpp index 92d37686..fcfa5064 100644 --- a/extras/Hadrons/Modules/MScalar/VPCounterTerms.hpp +++ b/Hadrons/Modules/MScalar/VPCounterTerms.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalar_VPCounterTerms_hpp_ #define Hadrons_MScalar_VPCounterTerms_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/Div.cc b/Hadrons/Modules/MScalarSUN/Div.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/Div.cc rename to Hadrons/Modules/MScalarSUN/Div.cc index 6a2e366d..1f55c593 100644 --- a/extras/Hadrons/Modules/MScalarSUN/Div.cc +++ b/Hadrons/Modules/MScalarSUN/Div.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/Div.hpp b/Hadrons/Modules/MScalarSUN/Div.hpp similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/Div.hpp rename to Hadrons/Modules/MScalarSUN/Div.hpp index ff26c60b..916b823f 100644 --- a/extras/Hadrons/Modules/MScalarSUN/Div.hpp +++ b/Hadrons/Modules/MScalarSUN/Div.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_Div_hpp_ #define Hadrons_MScalarSUN_Div_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/EMT.cc b/Hadrons/Modules/MScalarSUN/EMT.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/EMT.cc rename to Hadrons/Modules/MScalarSUN/EMT.cc index 7f8ca16d..2ae024fd 100644 --- a/extras/Hadrons/Modules/MScalarSUN/EMT.cc +++ b/Hadrons/Modules/MScalarSUN/EMT.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/EMT.hpp b/Hadrons/Modules/MScalarSUN/EMT.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalarSUN/EMT.hpp rename to Hadrons/Modules/MScalarSUN/EMT.hpp index dbbfb6b3..4858490b 100644 --- a/extras/Hadrons/Modules/MScalarSUN/EMT.hpp +++ b/Hadrons/Modules/MScalarSUN/EMT.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_EMT_hpp_ #define Hadrons_MScalarSUN_EMT_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/Grad.cc b/Hadrons/Modules/MScalarSUN/Grad.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/Grad.cc rename to Hadrons/Modules/MScalarSUN/Grad.cc index be03b4a7..7e07dba4 100644 --- a/extras/Hadrons/Modules/MScalarSUN/Grad.cc +++ b/Hadrons/Modules/MScalarSUN/Grad.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/Grad.hpp b/Hadrons/Modules/MScalarSUN/Grad.hpp similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/Grad.hpp rename to Hadrons/Modules/MScalarSUN/Grad.hpp index ecf65e90..c8b25a7d 100644 --- a/extras/Hadrons/Modules/MScalarSUN/Grad.hpp +++ b/Hadrons/Modules/MScalarSUN/Grad.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_Grad_hpp_ #define Hadrons_MScalarSUN_Grad_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/ShiftProbe.cc b/Hadrons/Modules/MScalarSUN/ShiftProbe.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/ShiftProbe.cc rename to Hadrons/Modules/MScalarSUN/ShiftProbe.cc index 30320667..f08e9f20 100644 --- a/extras/Hadrons/Modules/MScalarSUN/ShiftProbe.cc +++ b/Hadrons/Modules/MScalarSUN/ShiftProbe.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/ShiftProbe.hpp b/Hadrons/Modules/MScalarSUN/ShiftProbe.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalarSUN/ShiftProbe.hpp rename to Hadrons/Modules/MScalarSUN/ShiftProbe.hpp index edd38e42..dfc56d64 100644 --- a/extras/Hadrons/Modules/MScalarSUN/ShiftProbe.hpp +++ b/Hadrons/Modules/MScalarSUN/ShiftProbe.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_ShiftProbe_hpp_ #define Hadrons_MScalarSUN_ShiftProbe_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/StochFreeField.cc b/Hadrons/Modules/MScalarSUN/StochFreeField.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/StochFreeField.cc rename to Hadrons/Modules/MScalarSUN/StochFreeField.cc index db14d75d..e51868f0 100644 --- a/extras/Hadrons/Modules/MScalarSUN/StochFreeField.cc +++ b/Hadrons/Modules/MScalarSUN/StochFreeField.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/StochFreeField.hpp b/Hadrons/Modules/MScalarSUN/StochFreeField.hpp similarity index 98% rename from extras/Hadrons/Modules/MScalarSUN/StochFreeField.hpp rename to Hadrons/Modules/MScalarSUN/StochFreeField.hpp index d757c1ab..1e4d2265 100644 --- a/extras/Hadrons/Modules/MScalarSUN/StochFreeField.hpp +++ b/Hadrons/Modules/MScalarSUN/StochFreeField.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_StochFreeField_hpp_ #define Hadrons_MScalarSUN_StochFreeField_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc b/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc rename to Hadrons/Modules/MScalarSUN/TimeMomProbe.cc index eaddd318..5ae5336c 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc +++ b/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp b/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp similarity index 98% rename from extras/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp rename to Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp index 80424936..89cc2893 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp +++ b/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TimeMomProbe_hpp_ #define Hadrons_MScalarSUN_TimeMomProbe_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TrKinetic.cc b/Hadrons/Modules/MScalarSUN/TrKinetic.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TrKinetic.cc rename to Hadrons/Modules/MScalarSUN/TrKinetic.cc index 8d377f21..5053c88a 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TrKinetic.cc +++ b/Hadrons/Modules/MScalarSUN/TrKinetic.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TrKinetic.hpp b/Hadrons/Modules/MScalarSUN/TrKinetic.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalarSUN/TrKinetic.hpp rename to Hadrons/Modules/MScalarSUN/TrKinetic.hpp index a714daaa..6fb615a2 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TrKinetic.hpp +++ b/Hadrons/Modules/MScalarSUN/TrKinetic.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TrKinetic_hpp_ #define Hadrons_MScalarSUN_TrKinetic_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TrMag.cc b/Hadrons/Modules/MScalarSUN/TrMag.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TrMag.cc rename to Hadrons/Modules/MScalarSUN/TrMag.cc index 29897abc..20cf281d 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TrMag.cc +++ b/Hadrons/Modules/MScalarSUN/TrMag.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TrMag.hpp b/Hadrons/Modules/MScalarSUN/TrMag.hpp similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TrMag.hpp rename to Hadrons/Modules/MScalarSUN/TrMag.hpp index cdbf7e30..eabb15f6 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TrMag.hpp +++ b/Hadrons/Modules/MScalarSUN/TrMag.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TrMag_hpp_ #define Hadrons_MScalarSUN_TrMag_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TrPhi.cc b/Hadrons/Modules/MScalarSUN/TrPhi.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TrPhi.cc rename to Hadrons/Modules/MScalarSUN/TrPhi.cc index e1fcb8e5..d5eca1e4 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TrPhi.cc +++ b/Hadrons/Modules/MScalarSUN/TrPhi.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TrPhi.hpp b/Hadrons/Modules/MScalarSUN/TrPhi.hpp similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TrPhi.hpp rename to Hadrons/Modules/MScalarSUN/TrPhi.hpp index 9be0a5d6..28397f99 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TrPhi.hpp +++ b/Hadrons/Modules/MScalarSUN/TrPhi.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TrPhi_hpp_ #define Hadrons_MScalarSUN_TrPhi_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TransProj.cc b/Hadrons/Modules/MScalarSUN/TransProj.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TransProj.cc rename to Hadrons/Modules/MScalarSUN/TransProj.cc index 0fb230bb..21ee1296 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TransProj.cc +++ b/Hadrons/Modules/MScalarSUN/TransProj.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TransProj.hpp b/Hadrons/Modules/MScalarSUN/TransProj.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalarSUN/TransProj.hpp rename to Hadrons/Modules/MScalarSUN/TransProj.hpp index c9b42bf0..d5bdbcfb 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TransProj.hpp +++ b/Hadrons/Modules/MScalarSUN/TransProj.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TransProj_hpp_ #define Hadrons_MScalarSUN_TransProj_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TwoPoint.cc b/Hadrons/Modules/MScalarSUN/TwoPoint.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TwoPoint.cc rename to Hadrons/Modules/MScalarSUN/TwoPoint.cc index 840cc02a..966ebab1 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TwoPoint.cc +++ b/Hadrons/Modules/MScalarSUN/TwoPoint.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TwoPoint.hpp b/Hadrons/Modules/MScalarSUN/TwoPoint.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalarSUN/TwoPoint.hpp rename to Hadrons/Modules/MScalarSUN/TwoPoint.hpp index 2407f26f..fac770e3 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TwoPoint.hpp +++ b/Hadrons/Modules/MScalarSUN/TwoPoint.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TwoPoint_hpp_ #define Hadrons_MScalarSUN_TwoPoint_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/TwoPointNPR.cc b/Hadrons/Modules/MScalarSUN/TwoPointNPR.cc similarity index 96% rename from extras/Hadrons/Modules/MScalarSUN/TwoPointNPR.cc rename to Hadrons/Modules/MScalarSUN/TwoPointNPR.cc index 712f86d8..61bc9f90 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TwoPointNPR.cc +++ b/Hadrons/Modules/MScalarSUN/TwoPointNPR.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp b/Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp similarity index 97% rename from extras/Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp rename to Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp index 48dddd4f..567e4662 100644 --- a/extras/Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp +++ b/Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_TwoPointNPR_hpp_ #define Hadrons_MScalarSUN_TwoPointNPR_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MScalarSUN/Utils.hpp b/Hadrons/Modules/MScalarSUN/Utils.hpp similarity index 98% rename from extras/Hadrons/Modules/MScalarSUN/Utils.hpp rename to Hadrons/Modules/MScalarSUN/Utils.hpp index 68009f5e..b717f20c 100644 --- a/extras/Hadrons/Modules/MScalarSUN/Utils.hpp +++ b/Hadrons/Modules/MScalarSUN/Utils.hpp @@ -28,8 +28,8 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MScalarSUN_Utils_hpp_ #define Hadrons_MScalarSUN_Utils_hpp_ -#include -#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSink/Point.cc b/Hadrons/Modules/MSink/Point.cc similarity index 96% rename from extras/Hadrons/Modules/MSink/Point.cc rename to Hadrons/Modules/MSink/Point.cc index 127c4c74..59bb26bc 100644 --- a/extras/Hadrons/Modules/MSink/Point.cc +++ b/Hadrons/Modules/MSink/Point.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSink/Point.hpp b/Hadrons/Modules/MSink/Point.hpp similarity index 97% rename from extras/Hadrons/Modules/MSink/Point.hpp rename to Hadrons/Modules/MSink/Point.hpp index 7617ee78..722ff4dd 100644 --- a/extras/Hadrons/Modules/MSink/Point.hpp +++ b/Hadrons/Modules/MSink/Point.hpp @@ -31,9 +31,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSink_Point_hpp_ #define Hadrons_MSink_Point_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSink/Smear.cc b/Hadrons/Modules/MSink/Smear.cc similarity index 96% rename from extras/Hadrons/Modules/MSink/Smear.cc rename to Hadrons/Modules/MSink/Smear.cc index ff250140..dc2bea78 100644 --- a/extras/Hadrons/Modules/MSink/Smear.cc +++ b/Hadrons/Modules/MSink/Smear.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSink/Smear.hpp b/Hadrons/Modules/MSink/Smear.hpp similarity index 97% rename from extras/Hadrons/Modules/MSink/Smear.hpp rename to Hadrons/Modules/MSink/Smear.hpp index 1a46c693..21e7bdf0 100644 --- a/extras/Hadrons/Modules/MSink/Smear.hpp +++ b/Hadrons/Modules/MSink/Smear.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSink_Smear_hpp_ #define Hadrons_MSink_Smear_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSolver/A2AVectors.cc b/Hadrons/Modules/MSolver/A2AVectors.cc similarity index 96% rename from extras/Hadrons/Modules/MSolver/A2AVectors.cc rename to Hadrons/Modules/MSolver/A2AVectors.cc index a13920ff..df08ed4c 100644 --- a/extras/Hadrons/Modules/MSolver/A2AVectors.cc +++ b/Hadrons/Modules/MSolver/A2AVectors.cc @@ -26,7 +26,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSolver/A2AVectors.hpp b/Hadrons/Modules/MSolver/A2AVectors.hpp similarity index 96% rename from extras/Hadrons/Modules/MSolver/A2AVectors.hpp rename to Hadrons/Modules/MSolver/A2AVectors.hpp index 7022b90b..4573487a 100644 --- a/extras/Hadrons/Modules/MSolver/A2AVectors.hpp +++ b/Hadrons/Modules/MSolver/A2AVectors.hpp @@ -29,13 +29,13 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSolver_A2AVectors_hpp_ #define Hadrons_MSolver_A2AVectors_hpp_ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.cc b/Hadrons/Modules/MSolver/LocalCoherenceLanczos.cc similarity index 95% rename from extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.cc rename to Hadrons/Modules/MSolver/LocalCoherenceLanczos.cc index 5bddce95..3dc441ad 100644 --- a/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.cc +++ b/Hadrons/Modules/MSolver/LocalCoherenceLanczos.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp b/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp similarity index 98% rename from extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp rename to Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp index c9088cf4..1179b6e4 100644 --- a/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp +++ b/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp @@ -28,10 +28,10 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSolver_LocalCoherenceLanczos_hpp_ #define Hadrons_MSolver_LocalCoherenceLanczos_hpp_ -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc b/Hadrons/Modules/MSolver/RBPrecCG.cc similarity index 96% rename from extras/Hadrons/Modules/MSolver/RBPrecCG.cc rename to Hadrons/Modules/MSolver/RBPrecCG.cc index 867c6c5d..e0f3487c 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.cc +++ b/Hadrons/Modules/MSolver/RBPrecCG.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/Hadrons/Modules/MSolver/RBPrecCG.hpp similarity index 97% rename from extras/Hadrons/Modules/MSolver/RBPrecCG.hpp rename to Hadrons/Modules/MSolver/RBPrecCG.hpp index 8bcd3968..e4c6529f 100644 --- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp +++ b/Hadrons/Modules/MSolver/RBPrecCG.hpp @@ -30,11 +30,11 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSolver_RBPrecCG_hpp_ #define Hadrons_MSolver_RBPrecCG_hpp_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSource/Point.cc b/Hadrons/Modules/MSource/Point.cc similarity index 96% rename from extras/Hadrons/Modules/MSource/Point.cc rename to Hadrons/Modules/MSource/Point.cc index 5e49af2a..20e0a324 100644 --- a/extras/Hadrons/Modules/MSource/Point.cc +++ b/Hadrons/Modules/MSource/Point.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/Hadrons/Modules/MSource/Point.hpp similarity index 97% rename from extras/Hadrons/Modules/MSource/Point.hpp rename to Hadrons/Modules/MSource/Point.hpp index 0898a1a8..21c67969 100644 --- a/extras/Hadrons/Modules/MSource/Point.hpp +++ b/Hadrons/Modules/MSource/Point.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSource_Point_hpp_ #define Hadrons_MSource_Point_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSource/SeqConserved.cc b/Hadrons/Modules/MSource/SeqConserved.cc similarity index 95% rename from extras/Hadrons/Modules/MSource/SeqConserved.cc rename to Hadrons/Modules/MSource/SeqConserved.cc index 35b6ef37..a2eb64f3 100644 --- a/extras/Hadrons/Modules/MSource/SeqConserved.cc +++ b/Hadrons/Modules/MSource/SeqConserved.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSource/SeqConserved.hpp b/Hadrons/Modules/MSource/SeqConserved.hpp similarity index 98% rename from extras/Hadrons/Modules/MSource/SeqConserved.hpp rename to Hadrons/Modules/MSource/SeqConserved.hpp index ce9cd4e6..7779e370 100644 --- a/extras/Hadrons/Modules/MSource/SeqConserved.hpp +++ b/Hadrons/Modules/MSource/SeqConserved.hpp @@ -31,9 +31,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSource_SeqConserved_hpp_ #define Hadrons_MSource_SeqConserved_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSource/SeqGamma.cc b/Hadrons/Modules/MSource/SeqGamma.cc similarity index 96% rename from extras/Hadrons/Modules/MSource/SeqGamma.cc rename to Hadrons/Modules/MSource/SeqGamma.cc index ce4f3dd0..e566b762 100644 --- a/extras/Hadrons/Modules/MSource/SeqGamma.cc +++ b/Hadrons/Modules/MSource/SeqGamma.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSource/SeqGamma.hpp b/Hadrons/Modules/MSource/SeqGamma.hpp similarity index 98% rename from extras/Hadrons/Modules/MSource/SeqGamma.hpp rename to Hadrons/Modules/MSource/SeqGamma.hpp index 2d8e1c31..58fcfa8d 100644 --- a/extras/Hadrons/Modules/MSource/SeqGamma.hpp +++ b/Hadrons/Modules/MSource/SeqGamma.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSource_SeqGamma_hpp_ #define Hadrons_MSource_SeqGamma_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSource/Wall.cc b/Hadrons/Modules/MSource/Wall.cc similarity index 96% rename from extras/Hadrons/Modules/MSource/Wall.cc rename to Hadrons/Modules/MSource/Wall.cc index 9b293232..c3c0a3f0 100644 --- a/extras/Hadrons/Modules/MSource/Wall.cc +++ b/Hadrons/Modules/MSource/Wall.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSource/Wall.hpp b/Hadrons/Modules/MSource/Wall.hpp similarity index 97% rename from extras/Hadrons/Modules/MSource/Wall.hpp rename to Hadrons/Modules/MSource/Wall.hpp index f8bec19e..968fda87 100644 --- a/extras/Hadrons/Modules/MSource/Wall.hpp +++ b/Hadrons/Modules/MSource/Wall.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSource_WallSource_hpp_ #define Hadrons_MSource_WallSource_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MSource/Z2.cc b/Hadrons/Modules/MSource/Z2.cc similarity index 96% rename from extras/Hadrons/Modules/MSource/Z2.cc rename to Hadrons/Modules/MSource/Z2.cc index 9644c6fd..6ed27400 100644 --- a/extras/Hadrons/Modules/MSource/Z2.cc +++ b/Hadrons/Modules/MSource/Z2.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MSource/Z2.hpp b/Hadrons/Modules/MSource/Z2.hpp similarity index 97% rename from extras/Hadrons/Modules/MSource/Z2.hpp rename to Hadrons/Modules/MSource/Z2.hpp index 51bbbaa2..77714941 100644 --- a/extras/Hadrons/Modules/MSource/Z2.hpp +++ b/Hadrons/Modules/MSource/Z2.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MSource_Z2_hpp_ #define Hadrons_MSource_Z2_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MUtilities/RandomVectors.cc b/Hadrons/Modules/MUtilities/RandomVectors.cc similarity index 95% rename from extras/Hadrons/Modules/MUtilities/RandomVectors.cc rename to Hadrons/Modules/MUtilities/RandomVectors.cc index 7da32322..89aea0ee 100644 --- a/extras/Hadrons/Modules/MUtilities/RandomVectors.cc +++ b/Hadrons/Modules/MUtilities/RandomVectors.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MUtilities/RandomVectors.hpp b/Hadrons/Modules/MUtilities/RandomVectors.hpp similarity index 97% rename from extras/Hadrons/Modules/MUtilities/RandomVectors.hpp rename to Hadrons/Modules/MUtilities/RandomVectors.hpp index 4da84506..5da18dc3 100644 --- a/extras/Hadrons/Modules/MUtilities/RandomVectors.hpp +++ b/Hadrons/Modules/MUtilities/RandomVectors.hpp @@ -28,9 +28,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MUtilities_RandomVectors_hpp_ #define Hadrons_MUtilities_RandomVectors_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MUtilities/TestSeqConserved.cc b/Hadrons/Modules/MUtilities/TestSeqConserved.cc similarity index 95% rename from extras/Hadrons/Modules/MUtilities/TestSeqConserved.cc rename to Hadrons/Modules/MUtilities/TestSeqConserved.cc index 99beac71..0ccdeac9 100644 --- a/extras/Hadrons/Modules/MUtilities/TestSeqConserved.cc +++ b/Hadrons/Modules/MUtilities/TestSeqConserved.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp b/Hadrons/Modules/MUtilities/TestSeqConserved.hpp similarity index 98% rename from extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp rename to Hadrons/Modules/MUtilities/TestSeqConserved.hpp index 7b1bc1db..db16a69c 100644 --- a/extras/Hadrons/Modules/MUtilities/TestSeqConserved.hpp +++ b/Hadrons/Modules/MUtilities/TestSeqConserved.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MUtilities_TestSeqConserved_hpp_ #define Hadrons_MUtilities_TestSeqConserved_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/MUtilities/TestSeqGamma.cc b/Hadrons/Modules/MUtilities/TestSeqGamma.cc similarity index 95% rename from extras/Hadrons/Modules/MUtilities/TestSeqGamma.cc rename to Hadrons/Modules/MUtilities/TestSeqGamma.cc index f53d9f85..70f39ddd 100644 --- a/extras/Hadrons/Modules/MUtilities/TestSeqGamma.cc +++ b/Hadrons/Modules/MUtilities/TestSeqGamma.cc @@ -25,7 +25,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 using namespace Grid; using namespace Hadrons; diff --git a/extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp b/Hadrons/Modules/MUtilities/TestSeqGamma.hpp similarity index 97% rename from extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp rename to Hadrons/Modules/MUtilities/TestSeqGamma.hpp index 6f2665e4..33761f03 100644 --- a/extras/Hadrons/Modules/MUtilities/TestSeqGamma.hpp +++ b/Hadrons/Modules/MUtilities/TestSeqGamma.hpp @@ -30,9 +30,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_MUtilities_TestSeqGamma_hpp_ #define Hadrons_MUtilities_TestSeqGamma_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.cc.template b/Hadrons/Modules/templates/Module_in_NS.cc.template similarity index 100% rename from extras/Hadrons/Modules/templates/Module_in_NS.cc.template rename to Hadrons/Modules/templates/Module_in_NS.cc.template diff --git a/extras/Hadrons/Modules/templates/Module_in_NS.hpp.template b/Hadrons/Modules/templates/Module_in_NS.hpp.template similarity index 100% rename from extras/Hadrons/Modules/templates/Module_in_NS.hpp.template rename to Hadrons/Modules/templates/Module_in_NS.hpp.template diff --git a/extras/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template b/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template similarity index 100% rename from extras/Hadrons/Modules/templates/Module_tmp_in_NS.cc.template rename to Hadrons/Modules/templates/Module_tmp_in_NS.cc.template diff --git a/extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template b/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template similarity index 100% rename from extras/Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template rename to Hadrons/Modules/templates/Module_tmp_in_NS.hpp.template diff --git a/extras/Hadrons/Solver.hpp b/Hadrons/Solver.hpp similarity index 98% rename from extras/Hadrons/Solver.hpp rename to Hadrons/Solver.hpp index 5d72e3d5..479516de 100644 --- a/extras/Hadrons/Solver.hpp +++ b/Hadrons/Solver.hpp @@ -28,7 +28,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_Solver_hpp_ #define Hadrons_Solver_hpp_ -#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/VirtualMachine.cc b/Hadrons/VirtualMachine.cc similarity index 99% rename from extras/Hadrons/VirtualMachine.cc rename to Hadrons/VirtualMachine.cc index 17aaaf63..ed36cec2 100644 --- a/extras/Hadrons/VirtualMachine.cc +++ b/Hadrons/VirtualMachine.cc @@ -26,9 +26,9 @@ See the full license in the file "LICENSE" in the top level distribution directo *************************************************************************************/ /* END LEGAL */ -#include -#include -#include +#include +#include +#include using namespace Grid; using namespace QCD; diff --git a/extras/Hadrons/VirtualMachine.hpp b/Hadrons/VirtualMachine.hpp similarity index 98% rename from extras/Hadrons/VirtualMachine.hpp rename to Hadrons/VirtualMachine.hpp index 7e6e36c2..aac7e8c4 100644 --- a/extras/Hadrons/VirtualMachine.hpp +++ b/Hadrons/VirtualMachine.hpp @@ -29,9 +29,9 @@ See the full license in the file "LICENSE" in the top level distribution directo #ifndef Hadrons_VirtualMachine_hpp_ #define Hadrons_VirtualMachine_hpp_ -#include -#include -#include +#include +#include +#include BEGIN_HADRONS_NAMESPACE diff --git a/extras/Hadrons/add_module.sh b/Hadrons/add_module.sh similarity index 100% rename from extras/Hadrons/add_module.sh rename to Hadrons/add_module.sh diff --git a/extras/Hadrons/add_module_template.sh b/Hadrons/add_module_template.sh similarity index 100% rename from extras/Hadrons/add_module_template.sh rename to Hadrons/add_module_template.sh diff --git a/extras/Hadrons/make_module_inst.sh b/Hadrons/make_module_inst.sh similarity index 100% rename from extras/Hadrons/make_module_inst.sh rename to Hadrons/make_module_inst.sh diff --git a/extras/Hadrons/make_module_list.sh b/Hadrons/make_module_list.sh similarity index 100% rename from extras/Hadrons/make_module_list.sh rename to Hadrons/make_module_list.sh diff --git a/extras/Hadrons/modules.inc b/Hadrons/modules.inc similarity index 100% rename from extras/Hadrons/modules.inc rename to Hadrons/modules.inc diff --git a/Makefile.am b/Makefile.am index b4f4f788..1901305b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # additional include paths necessary to compile the C++ library -SUBDIRS = lib benchmarks tests extras +SUBDIRS = Grid Hadrons benchmarks tests include $(top_srcdir)/doxygen.inc @@ -8,7 +8,7 @@ bin_SCRIPTS=grid-config BUILT_SOURCES = version.h version.h: - if [ `git status --porcelain | wc -l` -gt 0 ]; then a="uncommited changes"; else a="no uncommitted changes"; fi; echo "`git log -n 1 --format=format:"#define GITHASH \\"%H:%d $$a\\"%n" HEAD`" > $(srcdir)/lib/version.h + if [ `git status --porcelain | wc -l` -gt 0 ]; then a="uncommited changes"; else a="no uncommitted changes"; fi; echo "`git log -n 1 --format=format:"#define GITHASH \\"%H:%d $$a\\"%n" HEAD`" > $(srcdir)/Grid/version.h .PHONY: bench check tests doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) diff --git a/configure.ac b/configure.ac index 774824e7..ee8a0620 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,8 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([subdir-objects 1.13]) AM_EXTRA_RECURSIVE_TARGETS([tests bench]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([lib/Grid.h]) -AC_CONFIG_HEADERS([lib/Config.h],[sed -i 's|PACKAGE_|GRID_|' lib/Config.h]) +AC_CONFIG_SRCDIR([Grid/Grid.h]) +AC_CONFIG_HEADERS([Grid/Config.h],[sed -i 's|PACKAGE_|GRID_|' Grid/Config.h]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ################ Get git info @@ -491,9 +491,9 @@ GRID_LIBS=$LIBS GRID_SHORT_SHA=`git rev-parse --short HEAD` GRID_SHA=`git rev-parse HEAD` GRID_BRANCH=`git rev-parse --abbrev-ref HEAD` -AM_CXXFLAGS="-I${abs_srcdir}/include -I${abs_srcdir}/include/Grid $AM_CXXFLAGS" -AM_CFLAGS="-I${abs_srcdir}/include -I${abs_srcdir}/include/Grid $AM_CFLAGS" -AM_LDFLAGS="-L${cwd}/lib $AM_LDFLAGS" +AM_CXXFLAGS="-I${abs_srcdir} $AM_CXXFLAGS" +AM_CFLAGS="-I${abs_srcdir} $AM_CFLAGS" +AM_LDFLAGS="-L${cwd}/Grid $AM_LDFLAGS" AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_LDFLAGS]) @@ -547,7 +547,7 @@ AC_SUBST([GRID_SUMMARY]) AC_CONFIG_FILES([grid-config], [chmod +x grid-config]) AC_CONFIG_FILES(Makefile) -AC_CONFIG_FILES(lib/Makefile) +AC_CONFIG_FILES(Grid/Makefile) AC_CONFIG_FILES(tests/Makefile) AC_CONFIG_FILES(tests/IO/Makefile) AC_CONFIG_FILES(tests/core/Makefile) @@ -561,8 +561,7 @@ AC_CONFIG_FILES(tests/smearing/Makefile) AC_CONFIG_FILES(tests/qdpxx/Makefile) AC_CONFIG_FILES(tests/testu01/Makefile) AC_CONFIG_FILES(benchmarks/Makefile) -AC_CONFIG_FILES(extras/Makefile) -AC_CONFIG_FILES(extras/Hadrons/Makefile) +AC_CONFIG_FILES(Hadrons/Makefile) AC_OUTPUT echo "" diff --git a/extras/Hadrons/Modules.hpp b/extras/Hadrons/Modules.hpp deleted file mode 100644 index 86d50755..00000000 --- a/extras/Hadrons/Modules.hpp +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************************* - -Grid physics library, www.github.com/paboyle/Grid - -Source file: extras/Hadrons/Modules.hpp - -Copyright (C) 2015-2018 - -Author: Antonin Portelli -Author: Guido Cossu -Author: James Harrison -Author: Lanny91 -Author: Peter Boyle -Author: Vera Guelpers -Author: fionnoh -Author: pretidav - -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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/extras/Makefile.am b/extras/Makefile.am deleted file mode 100644 index d8c2b675..00000000 --- a/extras/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = Hadrons \ No newline at end of file diff --git a/extras/qed-fvol/Global.cc b/extras/qed-fvol/Global.cc deleted file mode 100644 index 57ed97cc..00000000 --- a/extras/qed-fvol/Global.cc +++ /dev/null @@ -1,11 +0,0 @@ -#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/extras/qed-fvol/Global.hpp b/extras/qed-fvol/Global.hpp deleted file mode 100644 index 7f07200d..00000000 --- a/extras/qed-fvol/Global.hpp +++ /dev/null @@ -1,42 +0,0 @@ -#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/extras/qed-fvol/Makefile.am b/extras/qed-fvol/Makefile.am deleted file mode 100644 index 0a9030c7..00000000 --- a/extras/qed-fvol/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_CXXFLAGS += -I$(top_srcdir)/extras - -bin_PROGRAMS = qed-fvol - -qed_fvol_SOURCES = \ - qed-fvol.cc \ - Global.cc - -qed_fvol_LDADD = -lGrid diff --git a/extras/qed-fvol/WilsonLoops.h b/extras/qed-fvol/WilsonLoops.h deleted file mode 100644 index 98db6b7a..00000000 --- a/extras/qed-fvol/WilsonLoops.h +++ /dev/null @@ -1,265 +0,0 @@ -#ifndef QEDFVOL_WILSONLOOPS_H -#define QEDFVOL_WILSONLOOPS_H - -#include - -BEGIN_QEDFVOL_NAMESPACE - -template class NewWilsonLoops : 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 < U[0]._grid->_ndimension; 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 Real sumPlaquette(const GaugeLorentz &Umu) { - std::vector U(4, Umu._grid); - - for (int mu = 0; mu < Umu._grid->_ndimension; 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 Real avgPlaquette(const GaugeLorentz &Umu) { - int ndim = Umu._grid->_ndimension; - Real sumplaq = sumPlaquette(Umu); - Real vol = Umu._grid->gSites(); - Real faces = (1.0 * ndim * (ndim - 1)) / 2.0; - return sumplaq / vol / faces / Nc; // 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 < 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; - 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 Real sumWilsonLoop(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); - - siteWilsonLoop(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 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); - 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 - } -}; - -END_QEDFVOL_NAMESPACE - -#endif // QEDFVOL_WILSONLOOPS_H \ No newline at end of file diff --git a/extras/qed-fvol/qed-fvol.cc b/extras/qed-fvol/qed-fvol.cc deleted file mode 100644 index 3ecac2fc..00000000 --- a/extras/qed-fvol/qed-fvol.cc +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include - -using namespace Grid; -using namespace QCD; -using namespace QedFVol; - -typedef PeriodicGaugeImpl QedPeriodicGimplR; -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 - 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; - - // 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); - EmField expA(&grid); - - Complex imag_unit(0, 1); - - Real wlA; - std::vector logWlAvg(NWILSON, 0.0), logWlTime(NWILSON, 0.0), logWlSpace(NWILSON, 0.0); - - pRNG.SeedRandomDevice(); - - 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 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 - LOG(Message) << "Grid is finalizing now" << std::endl; - Grid_finalize(); - - return EXIT_SUCCESS; -} diff --git a/lib/.dirstamp b/lib/.dirstamp deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/Hadrons b/lib/Hadrons deleted file mode 120000 index 1f422592..00000000 --- a/lib/Hadrons +++ /dev/null @@ -1 +0,0 @@ -../extras/Hadrons \ No newline at end of file diff --git a/lib/qcd/hmc/.dirstamp b/lib/qcd/hmc/.dirstamp deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/qcd/hmc/integrators/.dirstamp b/lib/qcd/hmc/integrators/.dirstamp deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/simd/.dirstamp b/lib/simd/.dirstamp deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/filelist b/scripts/filelist index 74f8e334..6db53687 100755 --- a/scripts/filelist +++ b/scripts/filelist @@ -3,7 +3,7 @@ home=`pwd` # library Make.inc -cd $home/lib +cd $home/Grid HFILES=`find . -type f -name '*.h' -not -name '*Hdf5*' -not -path '*/gamma-gen/*' -not -path '*/Old/*' -not -path '*/Eigen/*'` HFILES="$HFILES" CCFILES=`find . -type f -name '*.cc' -not -path '*/gamma-gen/*' -not -name '*Communicator*.cc' -not -name '*SharedMemory*.cc' -not -name '*Hdf5*'` diff --git a/scripts/update_eigen.sh b/scripts/update_eigen.sh index 5ed59655..b1834175 100755 --- a/scripts/update_eigen.sh +++ b/scripts/update_eigen.sh @@ -7,7 +7,7 @@ fi ARC=$1 INITDIR=`pwd` -rm -f lib/Eigen +rm -f Grid/Eigen rm -rf Eigen ################## @@ -21,13 +21,13 @@ ARCDIR=`tar -tf ${ARC} | head -n1 | sed -e 's@/.*@@'` ############################### mv ${ARCDIR} Eigen -ln -s ${INITDIR}/Eigen/Eigen ${INITDIR}/lib/Eigen -ln -s ${INITDIR}/Eigen/unsupported/Eigen ${INITDIR}/lib/Eigen/unsupported +ln -s ${INITDIR}/Eigen/Eigen ${INITDIR}/Grid/Eigen +ln -s ${INITDIR}/Eigen/unsupported/Eigen ${INITDIR}/Grid/Eigen/unsupported # Eigen source headers -cd ${INITDIR}/lib -echo 'eigen_files =\' > ${INITDIR}/lib/Eigen.inc -find -L Eigen -print | sed 's/^/ /;$q;s/$/ \\/' >> ${INITDIR}/lib/Eigen.inc +cd ${INITDIR}/Grid +echo 'eigen_files =\' > ${INITDIR}/Grid/Eigen.inc +find -L Eigen -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> ${INITDIR}/Grid/Eigen.inc ################################### # back to home diff --git a/tests/hadrons/Test_QED.cc b/tests/hadrons/Test_QED.cc index eecc6d6a..6d89ad23 100644 --- a/tests/hadrons/Test_QED.cc +++ b/tests/hadrons/Test_QED.cc @@ -26,8 +26,8 @@ directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/tests/hadrons/Test_free_prop.cc b/tests/hadrons/Test_free_prop.cc index a1a5aadd..bc7521bf 100644 --- a/tests/hadrons/Test_free_prop.cc +++ b/tests/hadrons/Test_free_prop.cc @@ -26,8 +26,8 @@ directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/tests/hadrons/Test_hadrons.hpp b/tests/hadrons/Test_hadrons.hpp index fc061459..a56a18da 100644 --- a/tests/hadrons/Test_hadrons.hpp +++ b/tests/hadrons/Test_hadrons.hpp @@ -25,8 +25,8 @@ directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/tests/hadrons/Test_hadrons_meson_3pt.cc b/tests/hadrons/Test_hadrons_meson_3pt.cc index 243ffebb..6f7f1773 100644 --- a/tests/hadrons/Test_hadrons_meson_3pt.cc +++ b/tests/hadrons/Test_hadrons_meson_3pt.cc @@ -25,8 +25,8 @@ directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/tests/hadrons/Test_hadrons_spectrum.cc b/tests/hadrons/Test_hadrons_spectrum.cc index f41bd5b4..0038fcbd 100644 --- a/tests/hadrons/Test_hadrons_spectrum.cc +++ b/tests/hadrons/Test_hadrons_spectrum.cc @@ -25,8 +25,8 @@ directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace Hadrons; diff --git a/tests/hadrons/Test_hadrons_wilsonFund.cc b/tests/hadrons/Test_hadrons_wilsonFund.cc index bad0f2d3..f2d1227e 100644 --- a/tests/hadrons/Test_hadrons_wilsonFund.cc +++ b/tests/hadrons/Test_hadrons_wilsonFund.cc @@ -25,8 +25,8 @@ directory. *******************************************************************************/ -#include -#include +#include +#include using namespace Grid; using namespace Hadrons;