diff --git a/Makefile.am b/Makefile.am index fc3f6a0a..3b1d5690 100644 --- a/Makefile.am +++ b/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) \ No newline at end of file diff --git a/configure b/configure index 615ba987..20328052 100755 --- a/configure +++ b/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" ;; diff --git a/configure.ac b/configure.ac index 5dcbea36..03fd7900 100644 --- a/configure.ac +++ b/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([ diff --git a/lib/Grid_algorithms.h b/lib/Algorithms.h similarity index 100% rename from lib/Grid_algorithms.h rename to lib/Algorithms.h diff --git a/lib/Grid_aligned_allocator.h b/lib/AlignedAllocator.h similarity index 100% rename from lib/Grid_aligned_allocator.h rename to lib/AlignedAllocator.h diff --git a/lib/Cartesian.h b/lib/Cartesian.h new file mode 100644 index 00000000..db384b53 --- /dev/null +++ b/lib/Cartesian.h @@ -0,0 +1,8 @@ +#ifndef GRID_CARTESIAN_H +#define GRID_CARTESIAN_H + +#include +#include +#include + +#endif diff --git a/lib/Grid_communicator.h b/lib/Communicator.h similarity index 57% rename from lib/Grid_communicator.h rename to lib/Communicator.h index cfa6e0a7..6880adda 100644 --- a/lib/Grid_communicator.h +++ b/lib/Communicator.h @@ -1,6 +1,6 @@ #ifndef GRID_COMMUNICATOR_H #define GRID_COMMUNICATOR_H -#include +#include #endif diff --git a/lib/Grid_comparison.h b/lib/Comparison.h similarity index 98% rename from lib/Grid_comparison.h rename to lib/Comparison.h index 3f9c206d..ecd6ece0 100644 --- a/lib/Grid_comparison.h +++ b/lib/Comparison.h @@ -141,7 +141,7 @@ namespace Grid { } } -#include -#include +#include +#include #endif diff --git a/lib/Grid_cshift.h b/lib/Cshift.h similarity index 51% rename from lib/Grid_cshift.h rename to lib/Cshift.h index 10c7a3c4..3caccbf9 100644 --- a/lib/Grid_cshift.h +++ b/lib/Cshift.h @@ -1,13 +1,13 @@ #ifndef _GRID_CSHIFT_H_ #define _GRID_CSHIFT_H_ -#include +#include #ifdef GRID_COMMS_NONE -#include +#include #endif #ifdef GRID_COMMS_MPI -#include +#include #endif #endif diff --git a/lib/Grid.h b/lib/Grid.h index 7fa56892..16530434 100644 --- a/lib/Grid.h +++ b/lib/Grid.h @@ -33,7 +33,7 @@ #define strong_inline __attribute__((always_inline)) inline -#include +#include //////////////////////////////////////////////////////////// // Tunable header includes @@ -46,22 +46,22 @@ #include #endif -#include +#include -#include -#include +#include +#include -#include // subdir aggregate -#include // subdir aggregate -#include // subdir aggregate -#include -#include // subdir aggregate -#include // subdir aggregate - -#include // subdir aggregate +#include // subdir aggregate +#include // subdir aggregate +#include // subdir aggregate +#include // subdir aggregate +#include +#include // subdir aggregate +#include // subdir aggregate +#include // subdir aggregate #include -#include +#include namespace Grid { diff --git a/lib/Grid_config.h b/lib/GridConfig.h similarity index 100% rename from lib/Grid_config.h rename to lib/GridConfig.h diff --git a/lib/Grid_config.h.in b/lib/GridConfig.h.in similarity index 97% rename from lib/Grid_config.h.in rename to lib/GridConfig.h.in index 6f05d6cb..03f91ff4 100644 --- a/lib/Grid_config.h.in +++ b/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 diff --git a/lib/Grid_init.cc b/lib/GridInit.cc similarity index 100% rename from lib/Grid_init.cc rename to lib/GridInit.cc diff --git a/lib/Grid_cartesian.h b/lib/Grid_cartesian.h deleted file mode 100644 index c01be20a..00000000 --- a/lib/Grid_cartesian.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef GRID_CARTESIAN_H -#define GRID_CARTESIAN_H - -#include -#include -#include - -#endif diff --git a/lib/Grid_math.h b/lib/Grid_math.h deleted file mode 100644 index 17bc09a5..00000000 --- a/lib/Grid_math.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef GRID_MATH_H -#define GRID_MATH_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#endif diff --git a/lib/Grid_lattice.h b/lib/Lattice.h similarity index 58% rename from lib/Grid_lattice.h rename to lib/Lattice.h index 35664aee..1f29a908 100644 --- a/lib/Grid_lattice.h +++ b/lib/Lattice.h @@ -1,6 +1,6 @@ #ifndef GRID_LATTICE_H #define GRID_LATTICE_H -#include +#include #endif diff --git a/lib/Makefile.am b/lib/Makefile.am index b688d8b2..7ee52e0e 100644 --- a/lib/Makefile.am +++ b/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) diff --git a/lib/Grid_simd.h b/lib/Simd.h similarity index 100% rename from lib/Grid_simd.h rename to lib/Simd.h diff --git a/lib/Grid_stencil.h b/lib/Stencil.h similarity index 99% rename from lib/Grid_stencil.h rename to lib/Stencil.h index 50d22453..8529e73a 100644 --- a/lib/Grid_stencil.h +++ b/lib/Stencil.h @@ -1,7 +1,7 @@ #ifndef GRID_STENCIL_H #define GRID_STENCIL_H -#include // subdir aggregate +#include // subdir aggregate ////////////////////////////////////////////////////////////////////////////////////////// // Must not lose sight that goal is to be able to construct really efficient diff --git a/lib/Tensors.h b/lib/Tensors.h new file mode 100644 index 00000000..e812149f --- /dev/null +++ b/lib/Tensors.h @@ -0,0 +1,16 @@ +#ifndef GRID_MATH_H +#define GRID_MATH_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/lib/Grid_threads.h b/lib/Threads.h similarity index 100% rename from lib/Grid_threads.h rename to lib/Threads.h diff --git a/lib/cartesian/Grid_cartesian_base.h b/lib/cartesian/Cartesian_base.h similarity index 99% rename from lib/cartesian/Grid_cartesian_base.h rename to lib/cartesian/Cartesian_base.h index 66339648..6303e38e 100644 --- a/lib/cartesian/Grid_cartesian_base.h +++ b/lib/cartesian/Cartesian_base.h @@ -2,7 +2,6 @@ #define GRID_CARTESIAN_BASE_H #include -#include namespace Grid{ diff --git a/lib/cartesian/Grid_cartesian_full.h b/lib/cartesian/Cartesian_full.h similarity index 100% rename from lib/cartesian/Grid_cartesian_full.h rename to lib/cartesian/Cartesian_full.h diff --git a/lib/cartesian/Grid_cartesian_red_black.h b/lib/cartesian/Cartesian_red_black.h similarity index 100% rename from lib/cartesian/Grid_cartesian_red_black.h rename to lib/cartesian/Cartesian_red_black.h diff --git a/lib/communicator/Grid_communicator_base.h b/lib/communicator/Communicator_base.h similarity index 100% rename from lib/communicator/Grid_communicator_base.h rename to lib/communicator/Communicator_base.h diff --git a/lib/communicator/Grid_communicator_mpi.cc b/lib/communicator/Communicator_mpi.cc similarity index 100% rename from lib/communicator/Grid_communicator_mpi.cc rename to lib/communicator/Communicator_mpi.cc diff --git a/lib/communicator/Grid_communicator_none.cc b/lib/communicator/Communicator_none.cc similarity index 100% rename from lib/communicator/Grid_communicator_none.cc rename to lib/communicator/Communicator_none.cc diff --git a/lib/cshift/Grid_cshift_common.h b/lib/cshift/Cshift_common.h similarity index 100% rename from lib/cshift/Grid_cshift_common.h rename to lib/cshift/Cshift_common.h diff --git a/lib/cshift/Grid_cshift_mpi.h b/lib/cshift/Cshift_mpi.h similarity index 100% rename from lib/cshift/Grid_cshift_mpi.h rename to lib/cshift/Cshift_mpi.h diff --git a/lib/cshift/Grid_cshift_none.h b/lib/cshift/Cshift_none.h similarity index 100% rename from lib/cshift/Grid_cshift_none.h rename to lib/cshift/Cshift_none.h diff --git a/lib/lattice/Grid_lattice_ET.h b/lib/lattice/Lattice_ET.h similarity index 100% rename from lib/lattice/Grid_lattice_ET.h rename to lib/lattice/Lattice_ET.h diff --git a/lib/lattice/Grid_lattice_arith.h b/lib/lattice/Lattice_arith.h similarity index 100% rename from lib/lattice/Grid_lattice_arith.h rename to lib/lattice/Lattice_arith.h diff --git a/lib/lattice/Grid_lattice_base.h b/lib/lattice/Lattice_base.h similarity index 93% rename from lib/lattice/Grid_lattice_base.h rename to lib/lattice/Lattice_base.h index 15ef0944..6b5fe261 100644 --- a/lib/lattice/Grid_lattice_base.h +++ b/lib/lattice/Lattice_base.h @@ -283,24 +283,23 @@ PARALLEL_FOR_LOOP -#include +#include #define GRID_LATTICE_EXPRESSION_TEMPLATES #ifdef GRID_LATTICE_EXPRESSION_TEMPLATES -#include +#include #else -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/lib/lattice/Grid_lattice_comparison.h b/lib/lattice/Lattice_comparison.h similarity index 100% rename from lib/lattice/Grid_lattice_comparison.h rename to lib/lattice/Lattice_comparison.h diff --git a/lib/lattice/Grid_lattice_conformable.h b/lib/lattice/Lattice_conformable.h similarity index 100% rename from lib/lattice/Grid_lattice_conformable.h rename to lib/lattice/Lattice_conformable.h diff --git a/lib/lattice/Grid_lattice_coordinate.h b/lib/lattice/Lattice_coordinate.h similarity index 100% rename from lib/lattice/Grid_lattice_coordinate.h rename to lib/lattice/Lattice_coordinate.h diff --git a/lib/lattice/Grid_lattice_local.h b/lib/lattice/Lattice_local.h similarity index 100% rename from lib/lattice/Grid_lattice_local.h rename to lib/lattice/Lattice_local.h diff --git a/lib/lattice/Grid_lattice_overload.h b/lib/lattice/Lattice_overload.h similarity index 100% rename from lib/lattice/Grid_lattice_overload.h rename to lib/lattice/Lattice_overload.h diff --git a/lib/lattice/Grid_lattice_peekpoke.h b/lib/lattice/Lattice_peekpoke.h similarity index 100% rename from lib/lattice/Grid_lattice_peekpoke.h rename to lib/lattice/Lattice_peekpoke.h diff --git a/lib/lattice/Grid_lattice_reality.h b/lib/lattice/Lattice_reality.h similarity index 100% rename from lib/lattice/Grid_lattice_reality.h rename to lib/lattice/Lattice_reality.h diff --git a/lib/lattice/Grid_lattice_reduction.h b/lib/lattice/Lattice_reduction.h similarity index 100% rename from lib/lattice/Grid_lattice_reduction.h rename to lib/lattice/Lattice_reduction.h diff --git a/lib/lattice/Grid_lattice_rng.h b/lib/lattice/Lattice_rng.h similarity index 100% rename from lib/lattice/Grid_lattice_rng.h rename to lib/lattice/Lattice_rng.h diff --git a/lib/lattice/Grid_lattice_trace.h b/lib/lattice/Lattice_trace.h similarity index 100% rename from lib/lattice/Grid_lattice_trace.h rename to lib/lattice/Lattice_trace.h diff --git a/lib/lattice/Grid_lattice_transfer.h b/lib/lattice/Lattice_transfer.h similarity index 100% rename from lib/lattice/Grid_lattice_transfer.h rename to lib/lattice/Lattice_transfer.h diff --git a/lib/lattice/Grid_lattice_transpose.h b/lib/lattice/Lattice_transpose.h similarity index 100% rename from lib/lattice/Grid_lattice_transpose.h rename to lib/lattice/Lattice_transpose.h diff --git a/lib/lattice/Grid_lattice_where.h b/lib/lattice/Lattice_where.h similarity index 100% rename from lib/lattice/Grid_lattice_where.h rename to lib/lattice/Lattice_where.h diff --git a/lib/math/Grid_math_arith.h b/lib/math/Grid_math_arith.h deleted file mode 100644 index ca90ba88..00000000 --- a/lib/math/Grid_math_arith.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GRID_MATH_ARITH_H -#define GRID_MATH_ARITH_H - -#include -#include -#include -#include -#include - -#endif - diff --git a/lib/parallelIO/GridNerscIO.h b/lib/parallelIO/NerscIO.h similarity index 100% rename from lib/parallelIO/GridNerscIO.h rename to lib/parallelIO/NerscIO.h diff --git a/lib/qcd/action/fermion/PartialFractionFermion5D.cc b/lib/qcd/action/fermion/PartialFractionFermion5D.cc index 21f62a75..8b137891 100644 --- a/lib/qcd/action/fermion/PartialFractionFermion5D.cc +++ b/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 p; - std::vector q; - - // Constructors - PartialFractionFermion5D(LatticeGaugeField &_Umu, - GridCartesian &FiveDimGrid, - GridRedBlackCartesian &FiveDimRedBlackGrid, - GridCartesian &FourDimGrid, - GridRedBlackCartesian &FourDimRedBlackGrid, - RealD _mass,RealD M5); - - }; - - - } -} - -#endif diff --git a/lib/stencil/Grid_lebesgue.cc b/lib/stencil/Lebesgue.cc similarity index 100% rename from lib/stencil/Grid_lebesgue.cc rename to lib/stencil/Lebesgue.cc diff --git a/lib/stencil/Grid_lebesgue.h b/lib/stencil/Lebesgue.h similarity index 100% rename from lib/stencil/Grid_lebesgue.h rename to lib/stencil/Lebesgue.h diff --git a/lib/stencil/Grid_stencil_common.cc b/lib/stencil/Stencil_common.cc similarity index 100% rename from lib/stencil/Grid_stencil_common.cc rename to lib/stencil/Stencil_common.cc diff --git a/lib/tensors/Tensor_arith.h b/lib/tensors/Tensor_arith.h new file mode 100644 index 00000000..853a19a5 --- /dev/null +++ b/lib/tensors/Tensor_arith.h @@ -0,0 +1,11 @@ +#ifndef GRID_MATH_ARITH_H +#define GRID_MATH_ARITH_H + +#include +#include +#include +#include +#include + +#endif + diff --git a/lib/math/Grid_math_arith_add.h b/lib/tensors/Tensor_arith_add.h similarity index 100% rename from lib/math/Grid_math_arith_add.h rename to lib/tensors/Tensor_arith_add.h diff --git a/lib/math/Grid_math_arith_mac.h b/lib/tensors/Tensor_arith_mac.h similarity index 100% rename from lib/math/Grid_math_arith_mac.h rename to lib/tensors/Tensor_arith_mac.h diff --git a/lib/math/Grid_math_arith_mul.h b/lib/tensors/Tensor_arith_mul.h similarity index 100% rename from lib/math/Grid_math_arith_mul.h rename to lib/tensors/Tensor_arith_mul.h diff --git a/lib/math/Grid_math_arith_scalar.h b/lib/tensors/Tensor_arith_scalar.h similarity index 100% rename from lib/math/Grid_math_arith_scalar.h rename to lib/tensors/Tensor_arith_scalar.h diff --git a/lib/math/Grid_math_arith_sub.h b/lib/tensors/Tensor_arith_sub.h similarity index 100% rename from lib/math/Grid_math_arith_sub.h rename to lib/tensors/Tensor_arith_sub.h diff --git a/lib/math/Grid_math_tensors.h b/lib/tensors/Tensor_class.h similarity index 100% rename from lib/math/Grid_math_tensors.h rename to lib/tensors/Tensor_class.h diff --git a/lib/Grid_extract.h b/lib/tensors/Tensor_extract_merge.h similarity index 100% rename from lib/Grid_extract.h rename to lib/tensors/Tensor_extract_merge.h diff --git a/lib/math/Grid_math_inner.h b/lib/tensors/Tensor_inner.h similarity index 100% rename from lib/math/Grid_math_inner.h rename to lib/tensors/Tensor_inner.h diff --git a/lib/math/Grid_math_outer.h b/lib/tensors/Tensor_outer.h similarity index 100% rename from lib/math/Grid_math_outer.h rename to lib/tensors/Tensor_outer.h diff --git a/lib/math/Grid_math_peek.h b/lib/tensors/Tensor_peek.h similarity index 100% rename from lib/math/Grid_math_peek.h rename to lib/tensors/Tensor_peek.h diff --git a/lib/math/Grid_math_poke.h b/lib/tensors/Tensor_poke.h similarity index 100% rename from lib/math/Grid_math_poke.h rename to lib/tensors/Tensor_poke.h diff --git a/lib/math/Grid_math_reality.h b/lib/tensors/Tensor_reality.h similarity index 100% rename from lib/math/Grid_math_reality.h rename to lib/tensors/Tensor_reality.h diff --git a/lib/math/Grid_math_trace.h b/lib/tensors/Tensor_trace.h similarity index 100% rename from lib/math/Grid_math_trace.h rename to lib/tensors/Tensor_trace.h diff --git a/lib/math/Grid_math_traits.h b/lib/tensors/Tensor_traits.h similarity index 100% rename from lib/math/Grid_math_traits.h rename to lib/tensors/Tensor_traits.h diff --git a/lib/math/Grid_math_transpose.h b/lib/tensors/Tensor_transpose.h similarity index 100% rename from lib/math/Grid_math_transpose.h rename to lib/tensors/Tensor_transpose.h diff --git a/tests/Test_cshift.cc b/tests/Test_cshift.cc index 76125977..cc1da333 100644 --- a/tests/Test_cshift.cc +++ b/tests/Test_cshift.cc @@ -1,5 +1,4 @@ #include -#include using namespace Grid; using namespace Grid::QCD; diff --git a/tests/Test_cshift_red_black.cc b/tests/Test_cshift_red_black.cc index 212e9b6e..9ffa66b1 100644 --- a/tests/Test_cshift_red_black.cc +++ b/tests/Test_cshift_red_black.cc @@ -1,5 +1,4 @@ #include -#include using namespace Grid; using namespace Grid::QCD; diff --git a/tests/Test_gamma.cc b/tests/Test_gamma.cc index e803029b..bae77ecc 100644 --- a/tests/Test_gamma.cc +++ b/tests/Test_gamma.cc @@ -1,5 +1,4 @@ #include -#include using namespace std; using namespace Grid; diff --git a/tests/Test_nersc_io.cc b/tests/Test_nersc_io.cc index 6fe587a6..80d78291 100644 --- a/tests/Test_nersc_io.cc +++ b/tests/Test_nersc_io.cc @@ -1,5 +1,4 @@ #include -#include using namespace std; using namespace Grid; diff --git a/tests/Test_rng.cc b/tests/Test_rng.cc index 97f6c6b7..1731b740 100644 --- a/tests/Test_rng.cc +++ b/tests/Test_rng.cc @@ -1,5 +1,4 @@ #include -#include using namespace std; using namespace Grid; diff --git a/tests/Test_rng_fixed.cc b/tests/Test_rng_fixed.cc index 01e3315b..c836c93f 100644 --- a/tests/Test_rng_fixed.cc +++ b/tests/Test_rng_fixed.cc @@ -1,5 +1,4 @@ #include -#include using namespace std; using namespace Grid; diff --git a/tests/Test_simd.cc b/tests/Test_simd.cc index db600fe4..f4858d06 100644 --- a/tests/Test_simd.cc +++ b/tests/Test_simd.cc @@ -1,5 +1,4 @@ #include -#include using namespace std; using namespace Grid;