Reorganise of file naming

Makefile.am

@@ -1,3 +1,5 @@
 # additional include paths necessary to compile the C++ library
 AM_CXXFLAGS = -I$(top_srcdir)/
 SUBDIRS = lib tests benchmarks
+
+filelist: $(SUBDIRS)

configure

@@ -3064,7 +3064,7 @@ fi
 
 
 
-ac_config_headers="$ac_config_headers lib/Grid_config.h"
+ac_config_headers="$ac_config_headers lib/GridConfig.h"
 
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
@@ -5814,7 +5814,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "lib/Grid_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/Grid_config.h" ;;
+    "lib/GridConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/GridConfig.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "docs/doxy.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxy.cfg" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

configure.ac

@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(subdir-objects)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/Grid.h])
-AC_CONFIG_HEADERS([lib/Grid_config.h])
+AC_CONFIG_HEADERS([lib/GridConfig.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_MSG_NOTICE([

lib/Cartesian.h

@@ -0,0 +1,8 @@
+#ifndef GRID_CARTESIAN_H
+#define GRID_CARTESIAN_H
+
+#include <cartesian/Cartesian_base.h>
+#include <cartesian/Cartesian_full.h>
+#include <cartesian/Cartesian_red_black.h> 
+
+#endif

lib/Communicator.h

@@ -1,6 +1,6 @@
 #ifndef GRID_COMMUNICATOR_H
 #define GRID_COMMUNICATOR_H
 
-#include <communicator/Grid_communicator_base.h>
+#include <communicator/Communicator_base.h>
 
 #endif

lib/Comparison.h

@@ -141,7 +141,7 @@ namespace Grid {
     }
 }
 
-#include <lattice/Grid_lattice_comparison.h>
-#include <lattice/Grid_lattice_where.h>
+#include <lattice/Lattice_comparison.h>
+#include <lattice/Lattice_where.h>
 
 #endif

lib/Cshift.h

@@ -1,13 +1,13 @@
 #ifndef _GRID_CSHIFT_H_
 #define _GRID_CSHIFT_H_
 
-#include <cshift/Grid_cshift_common.h>
+#include <cshift/Cshift_common.h>
 
 #ifdef GRID_COMMS_NONE
-#include <cshift/Grid_cshift_none.h>
+#include <cshift/Cshift_none.h>
 #endif
 
 #ifdef GRID_COMMS_MPI
-#include <cshift/Grid_cshift_mpi.h>
+#include <cshift/Cshift_mpi.h>
 #endif 
 #endif

lib/Grid.h

@@ -33,7 +33,7 @@
 
 #define strong_inline __attribute__((always_inline)) inline
 
-#include <Grid_config.h>
+#include <GridConfig.h>
 
 ////////////////////////////////////////////////////////////
 // Tunable header includes
@@ -46,22 +46,22 @@
 #include <malloc.h>
 #endif
 
-#include <Grid_aligned_allocator.h>
+#include <AlignedAllocator.h>
 
-#include <Grid_simd.h>
-#include <Grid_threads.h>
+#include <Simd.h>
+#include <Threads.h>
 
-#include <Grid_cartesian.h> // subdir aggregate
-#include <Grid_math.h>      // subdir aggregate
-#include <Grid_lattice.h>   // subdir aggregate
-#include <Grid_comparison.h>
-#include <Grid_cshift.h>    // subdir aggregate
-#include <Grid_stencil.h>   // subdir aggregate
-
-#include <Grid_algorithms.h>// subdir aggregate
+#include <Communicator.h> // subdir aggregate
+#include <Cartesian.h> // subdir aggregate
+#include <Tensors.h>   // subdir aggregate
+#include <Lattice.h>   // subdir aggregate
+#include <Comparison.h>
+#include <Cshift.h>    // subdir aggregate
+#include <Stencil.h>   // subdir aggregate
+#include <Algorithms.h>// subdir aggregate
 
 #include <qcd/QCD.h>
-#include <parallelIO/GridNerscIO.h>
+#include <parallelIO/NerscIO.h>
 
 namespace Grid {
 

lib/GridConfig.h.in

@@ -1,4 +1,4 @@
-/* lib/Grid_config.h.in.  Generated from configure.ac by autoheader.  */
+/* lib/GridConfig.h.in.  Generated from configure.ac by autoheader.  */
 
 /* AVX */
 #undef AVX1

lib/Grid_cartesian.h

@@ -1,8 +0,0 @@
-#ifndef GRID_CARTESIAN_H
-#define GRID_CARTESIAN_H
-
-#include <cartesian/Grid_cartesian_base.h>
-#include <cartesian/Grid_cartesian_full.h>
-#include <cartesian/Grid_cartesian_red_black.h> 
-
-#endif

lib/Grid_math.h

@@ -1,16 +0,0 @@
-#ifndef GRID_MATH_H
-#define GRID_MATH_H
-
-#include <math/Grid_math_traits.h>
-#include <math/Grid_math_tensors.h>
-#include <math/Grid_math_arith.h>
-#include <math/Grid_math_inner.h>
-#include <math/Grid_math_outer.h>
-#include <math/Grid_math_transpose.h>
-#include <math/Grid_math_trace.h>
-#include <math/Grid_math_peek.h>
-#include <math/Grid_math_poke.h>
-#include <math/Grid_math_reality.h>
-
-    
-#endif

lib/Lattice.h

@@ -1,6 +1,6 @@
 #ifndef GRID_LATTICE_H
 #define GRID_LATTICE_H
 
-#include <lattice/Grid_lattice_base.h>
+#include <lattice/Lattice_base.h>
 
 #endif

lib/Makefile.am

@@ -3,119 +3,26 @@ AM_CXXFLAGS = -I$(top_srcdir)/
 
 extra_sources=
 if BUILD_COMMS_MPI
-  extra_sources+=communicator/Grid_communicator_mpi.cc
+  extra_sources+=communicator/Communicator_mpi.cc
 endif
 
 if BUILD_COMMS_NONE
-  extra_sources+=communicator/Grid_communicator_none.cc
+  extra_sources+=communicator/Communicator_none.cc
 endif
 
 #
 # Libraries
 #
-lib_LIBRARIES = libGrid.a
-libGrid_a_SOURCES =				\
-	Grid_init.cc				\
-	stencil/Grid_lebesgue.cc		\
-	stencil/Grid_stencil_common.cc		\
-	algorithms/approx/Zolotarev.cc		\
-	algorithms/approx/Remez.cc		\
-	qcd/SpaceTimeGrid.cc\
-	qcd/Dirac.cc\
-	qcd/action/fermion/WilsonKernels.cc\
-	qcd/action/fermion/WilsonKernelsHand.cc\
-	qcd/action/fermion/WilsonFermion.cc\
-	qcd/action/fermion/WilsonFermion5D.cc\
-	qcd/action/fermion/CayleyFermion5D.cc \
-	qcd/action/fermion/ContinuedFractionFermion5D.cc	\
-	$(extra_sources)
 
-#	qcd/action/fermion/PartialFractionFermion5D.cc	\
+include Make.inc
+
+lib_LIBRARIES = libGrid.a
+libGrid_a_SOURCES = $(CCFILES) $(extra_sources)
+
+
+#	qcd/action/fermion/PartialFractionFermion5D.cc\	\
 #
 # Include files
 #
-nobase_include_HEADERS=\
-		./algorithms/approx/bigfloat.h\
-		./algorithms/approx/bigfloat_double.h\
-		./algorithms/approx/Chebyshev.h\
-		./algorithms/approx/Remez.h\
-		./algorithms/approx/Zolotarev.h\
-		./algorithms/iterative/ConjugateGradient.h\
-		./algorithms/iterative/NormalEquations.h\
-		./algorithms/iterative/SchurRedBlack.h\
-		./algorithms/LinearOperator.h\
-		./algorithms/SparseMatrix.h\
-		./cartesian/Grid_cartesian_base.h\
-		./cartesian/Grid_cartesian_full.h\
-		./cartesian/Grid_cartesian_red_black.h\
-		./communicator/Grid_communicator_base.h\
-		./cshift/Grid_cshift_common.h\
-		./cshift/Grid_cshift_mpi.h\
-		./cshift/Grid_cshift_none.h\
-		./Grid.h\
-		./Grid_algorithms.h\
-		./Grid_aligned_allocator.h\
-		./Grid_cartesian.h\
-		./Grid_communicator.h\
-		./Grid_comparison.h\
-		./Grid_config.h\
-		./Grid_cshift.h\
-		./Grid_extract.h\
-		./Grid_lattice.h\
-		./Grid_math.h\
-		./Grid_simd.h\
-		./Grid_stencil.h\
-		./Grid_threads.h\
-		./lattice/Grid_lattice_arith.h\
-		./lattice/Grid_lattice_base.h\
-		./lattice/Grid_lattice_comparison.h\
-		./lattice/Grid_lattice_conformable.h\
-		./lattice/Grid_lattice_coordinate.h\
-		./lattice/Grid_lattice_ET.h\
-		./lattice/Grid_lattice_local.h\
-		./lattice/Grid_lattice_overload.h\
-		./lattice/Grid_lattice_peekpoke.h\
-		./lattice/Grid_lattice_reality.h\
-		./lattice/Grid_lattice_reduction.h\
-		./lattice/Grid_lattice_rng.h\
-		./lattice/Grid_lattice_trace.h\
-		./lattice/Grid_lattice_transfer.h\
-		./lattice/Grid_lattice_transpose.h\
-		./lattice/Grid_lattice_where.h\
-		./math/Grid_math_arith.h\
-		./math/Grid_math_arith_add.h\
-		./math/Grid_math_arith_mac.h\
-		./math/Grid_math_arith_mul.h\
-		./math/Grid_math_arith_scalar.h\
-		./math/Grid_math_arith_sub.h\
-		./math/Grid_math_inner.h\
-		./math/Grid_math_outer.h\
-		./math/Grid_math_peek.h\
-		./math/Grid_math_poke.h\
-		./math/Grid_math_reality.h\
-		./math/Grid_math_tensors.h\
-		./math/Grid_math_trace.h\
-		./math/Grid_math_traits.h\
-		./math/Grid_math_transpose.h\
-		./parallelIO/GridNerscIO.h\
-		./qcd/action/Actions.h\
-		./qcd/action/fermion/FermionOperator.h\
-		./qcd/action/fermion/WilsonCompressor.h\
-		./qcd/action/fermion/WilsonKernels.h\
-		./qcd/action/fermion/WilsonFermion.h\
-		./qcd/action/fermion/WilsonFermion5D.h\
-		./qcd/Dirac.h\
-		./qcd/QCD.h\
-		./qcd/TwoSpinor.h\
-		./simd/Grid_avx.h\
-		./simd/Grid_avx512.h\
-		./simd/Grid_qpx.h\
-		./simd/Grid_sse4.h\
-		./simd/Grid_vector_types.h\
-		./simd/Old/Grid_vComplexD.h\
-		./simd/Old/Grid_vComplexF.h\
-		./simd/Old/Grid_vInteger.h\
-		./simd/Old/Grid_vRealD.h\
-		./simd/Old/Grid_vRealF.h\
-		./stencil/Grid_lebesgue.h
+nobase_include_HEADERS=$(HFILES)
 

lib/Stencil.h

@@ -1,7 +1,7 @@
 #ifndef GRID_STENCIL_H
 #define GRID_STENCIL_H
 
-#include <stencil/Grid_lebesgue.h>   // subdir aggregate
+#include <stencil/Lebesgue.h>   // subdir aggregate
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Must not lose sight that goal is to be able to construct really efficient

lib/Tensors.h

@@ -0,0 +1,16 @@
+#ifndef GRID_MATH_H
+#define GRID_MATH_H
+
+#include <tensors/Tensor_traits.h>
+#include <tensors/Tensor_class.h>
+#include <tensors/Tensor_arith.h>
+#include <tensors/Tensor_inner.h>
+#include <tensors/Tensor_outer.h>
+#include <tensors/Tensor_transpose.h>
+#include <tensors/Tensor_trace.h>
+#include <tensors/Tensor_peek.h>
+#include <tensors/Tensor_poke.h>
+#include <tensors/Tensor_reality.h>
+#include <tensors/Tensor_extract_merge.h>
+    
+#endif

lib/cartesian/Cartesian_base.h

@@ -2,7 +2,6 @@
 #define GRID_CARTESIAN_BASE_H
 
 #include <Grid.h>
-#include <Grid_communicator.h>
 
 namespace Grid{
 

lib/lattice/Lattice_base.h

@@ -283,24 +283,23 @@ PARALLEL_FOR_LOOP
 
 
 
-#include <lattice/Grid_lattice_conformable.h>
+#include <lattice/Lattice_conformable.h>
 #define GRID_LATTICE_EXPRESSION_TEMPLATES
 #ifdef  GRID_LATTICE_EXPRESSION_TEMPLATES
-#include <lattice/Grid_lattice_ET.h>
+#include <lattice/Lattice_ET.h>
 #else 
-#include <lattice/Grid_lattice_overload.h>
+#include <lattice/Lattice_overload.h>
 #endif
-#include <lattice/Grid_lattice_arith.h>
-#include <lattice/Grid_lattice_trace.h>
-#include <lattice/Grid_lattice_transpose.h>
-#include <lattice/Grid_lattice_local.h>
-#include <lattice/Grid_lattice_reduction.h>
-#include <lattice/Grid_lattice_peekpoke.h>
-#include <lattice/Grid_lattice_reality.h>
-#include <Grid_extract.h>
-#include <lattice/Grid_lattice_coordinate.h>
-#include <lattice/Grid_lattice_rng.h>
-#include <lattice/Grid_lattice_transfer.h>
+#include <lattice/Lattice_arith.h>
+#include <lattice/Lattice_trace.h>
+#include <lattice/Lattice_transpose.h>
+#include <lattice/Lattice_local.h>
+#include <lattice/Lattice_reduction.h>
+#include <lattice/Lattice_peekpoke.h>
+#include <lattice/Lattice_reality.h>
+#include <lattice/Lattice_coordinate.h>
+#include <lattice/Lattice_rng.h>
+#include <lattice/Lattice_transfer.h>
 
 
 

lib/math/Grid_math_arith.h

@@ -1,11 +0,0 @@
-#ifndef GRID_MATH_ARITH_H
-#define GRID_MATH_ARITH_H
-
-#include <math/Grid_math_arith_add.h>
-#include <math/Grid_math_arith_sub.h>
-#include <math/Grid_math_arith_mac.h>
-#include <math/Grid_math_arith_mul.h>
-#include <math/Grid_math_arith_scalar.h>
-
-#endif
-

lib/qcd/action/fermion/PartialFractionFermion5D.cc

@@ -1,47 +1 @@
-#ifndef  GRID_QCD_PARTIAL_FRACTION_H
-#define  GRID_QCD_PARTIAL_FRACTION_H
 
-namespace Grid {
-
-  namespace QCD {
-
-    class PartialFractionFermion5D : public WilsonFermion5D
-    {
-    public:
-
-      // override multiply
-      virtual RealD  M    (const LatticeFermion &in, LatticeFermion &out);
-      virtual RealD  Mdag (const LatticeFermion &in, LatticeFermion &out);
-
-      // half checkerboard operaions
-      virtual void   Meooe       (const LatticeFermion &in, LatticeFermion &out);
-      virtual void   MeooeDag    (const LatticeFermion &in, LatticeFermion &out);
-      virtual void   Mooee       (const LatticeFermion &in, LatticeFermion &out);
-      virtual void   MooeeDag    (const LatticeFermion &in, LatticeFermion &out);
-      virtual void   MooeeInv    (const LatticeFermion &in, LatticeFermion &out);
-      virtual void   MooeeInvDag (const LatticeFermion &in, LatticeFermion &out);
-
-    private:
-
-      zolotarev_data *zdata;
-
-      // Part frac
-      double R=(1+this->mass)/(1-this->mass);
-      std::vector<double> p; 
-      std::vector<double> q;
-
-      // Constructors
-      PartialFractionFermion5D(LatticeGaugeField &_Umu,
-				    GridCartesian         &FiveDimGrid,
-				    GridRedBlackCartesian &FiveDimRedBlackGrid,
-				    GridCartesian         &FourDimGrid,
-				    GridRedBlackCartesian &FourDimRedBlackGrid,
-				    RealD _mass,RealD M5);
-
-    };
-
-
-  }
-}
-
-#endif

lib/tensors/Tensor_arith.h

@@ -0,0 +1,11 @@
+#ifndef GRID_MATH_ARITH_H
+#define GRID_MATH_ARITH_H
+
+#include <tensors/Tensor_arith_add.h>
+#include <tensors/Tensor_arith_sub.h>
+#include <tensors/Tensor_arith_mac.h>
+#include <tensors/Tensor_arith_mul.h>
+#include <tensors/Tensor_arith_scalar.h>
+
+#endif
+

tests/Test_cshift.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace Grid;
 using namespace Grid::QCD;

tests/Test_cshift_red_black.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace Grid;
 using namespace Grid::QCD;

tests/Test_gamma.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace std;
 using namespace Grid;

tests/Test_nersc_io.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace std;
 using namespace Grid;

tests/Test_rng.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace std;
 using namespace Grid;

tests/Test_rng_fixed.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace std;
 using namespace Grid;

tests/Test_simd.cc

@@ -1,5 +1,4 @@
 #include <Grid.h>
-#include <parallelIO/GridNerscIO.h>
 
 using namespace std;
 using namespace Grid;