Reorganisation

configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT([Grid], [1.0], [paboyle@ph.ed.ac.uk])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(subdir-objects)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/Grid.h])
 AC_CONFIG_HEADERS([lib/Grid_config.h])

lib/Grid.h

@@ -47,8 +47,10 @@
 #include <Grid_cartesian.h>
 #include <Grid_lattice.h>
 #include <Grid_comparison.h>
+#include <Grid_cshift.h>
+#include <Grid_where.h>
 #include <Grid_stencil.h>
-#include <Grid_QCD.h>
+#include <qcd/Grid_QCD.h>
 
 namespace Grid {
 

lib/Grid_cartesian.h

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

lib/Grid_cshift.h

@@ -1,16 +1,17 @@
 #ifndef _GRID_CSHIFT_H_
 #define _GRID_CSHIFT_H_
-#include <Grid_cshift_common.h>
+
+#include <cshift/Grid_cshift_common.h>
 
 #ifdef GRID_COMMS_NONE
-#include <Grid_cshift_none.h>
+#include <cshift/Grid_cshift_none.h>
 #endif
 
 #ifdef GRID_COMMS_FAKE
-#include <Grid_cshift_fake.h>
+#include <cshift/Grid_cshift_fake.h>
 #endif
 
 #ifdef GRID_COMMS_MPI
-#include <Grid_cshift_mpi.h>
+#include <cshift/Grid_cshift_mpi.h>
 #endif 
 #endif

lib/Grid_lattice.h

@@ -77,19 +77,17 @@ public:
  }; // class Lattice
 }
 
-#include <Grid_lattice_conformable.h>
-#include <Grid_lattice_arith.h>
-#include <Grid_lattice_trace.h>
-#include <Grid_lattice_transpose.h>
-#include <Grid_lattice_local.h>
-#include <Grid_lattice_reduction.h>
-#include <Grid_lattice_peekpoke.h>
-#include <Grid_lattice_reality.h>
-#include <Grid_cshift.h>
-#include <Grid_where.h>
-#include <Grid_lattice_coordinate.h>
-#include <Grid_lattice_rng.h>
-#include <Grid_lattice_transfer.h>
+#include <lattice/Grid_lattice_conformable.h>
+#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 <lattice/Grid_lattice_coordinate.h>
+#include <lattice/Grid_lattice_rng.h>
+#include <lattice/Grid_lattice_transfer.h>
 
 
 

lib/Grid_math.h

@@ -1,16 +1,16 @@
 #ifndef GRID_MATH_H
 #define GRID_MATH_H
 
-#include <Grid_math_traits.h>
-#include <Grid_math_tensors.h>
-#include <Grid_math_arith.h>
-#include <Grid_math_inner.h>
-#include <Grid_math_outer.h>
-#include <Grid_math_transpose.h>
-#include <Grid_math_trace.h>
-#include <Grid_math_peek.h>
-#include <Grid_math_poke.h>
-#include <Grid_math_reality.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/Grid_simd.h

@@ -229,11 +229,11 @@ inline void Gpermute(vsimd &y,const vsimd &b,int perm){
     };
 };
 
-#include <Grid_vInteger.h>
-#include <Grid_vRealF.h>
-#include <Grid_vRealD.h>
-#include <Grid_vComplexF.h>
-#include <Grid_vComplexD.h>
+#include <simd/Grid_vInteger.h>
+#include <simd/Grid_vRealF.h>
+#include <simd/Grid_vRealD.h>
+#include <simd/Grid_vComplexF.h>
+#include <simd/Grid_vComplexD.h>
 
 
 namespace Grid {

lib/math/Grid_math_arith.h

@@ -1,11 +1,11 @@
 #ifndef GRID_MATH_ARITH_H
 #define GRID_MATH_ARITH_H
 
-#include <Grid_math_arith_add.h>
-#include <Grid_math_arith_sub.h>
-#include <Grid_math_arith_mac.h>
-#include <Grid_math_arith_mul.h>
-#include <Grid_math_arith_scalar.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