Move nbnxn files to nbnxm directory

[alexxy/gromacs.git] / src / gromacs / nbnxm / kerneldispatch.cpp

diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp b/src/gromacs/nbnxm/kerneldispatch.cpp
similarity index 95%
rename from src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp
rename to src/gromacs/nbnxm/kerneldispatch.cpp
index 3f47f2d0b795a9ccb72d95637a3fb8c85029ddaa..04a79159a895b240e3fcca1cad204e3ae1f23fbd 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_cpu.cpp
+++ b/src/gromacs/nbnxm/kerneldispatch.cpp
@@ -35,28 +35,27 @@
 
 #include "gmxpre.h"
 
-#include "nbnxn_kernel_cpu.h"
+#include "kerneldispatch.h"
 
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/force_flags.h"
 #include "gromacs/mdlib/gmx_omp_nthreads.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_consts.h"
-#include "gromacs/mdlib/nbnxn_simd.h"
 #include "gromacs/mdtypes/interaction_const.h"
 #include "gromacs/mdtypes/md_enums.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/nbnxm_simd.h"
 #include "gromacs/simd/simd.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/real.h"
 
-#include "nbnxn_kernel_common.h"
+#include "kernel_common.h"
 #define INCLUDE_KERNELFUNCTION_TABLES
-#include "gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref.h"
+#include "gromacs/nbnxm/kernels_reference/kernel_ref.h"
 #ifdef GMX_NBNXN_SIMD_2XNN
-#include "gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.h"
+#include "gromacs/nbnxm/kernels_simd_2xmm/kernels.h"
 #endif
 #ifdef GMX_NBNXN_SIMD_4XN
-#include "gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.h"
+#include "gromacs/nbnxm/kernels_simd_4xm/kernels.h"
 #endif
 #undef INCLUDE_FUNCTION_TABLES
 
@@ -254,7 +253,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
                     break;
 #ifdef GMX_NBNXN_SIMD_2XNN
                 case nbnxnk4xN_SIMD_2xNN:
-                    nbnxn_kernel_noener_simd_2xnn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_noener_simd_2xmm[coulkt][vdwkt](nbl[nb], nbat,
                                                                  ic,
                                                                  shiftVectors,
                                                                  out->f.data(),
@@ -263,7 +262,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #endif
 #ifdef GMX_NBNXN_SIMD_4XN
                 case nbnxnk4xN_SIMD_4xN:
-                    nbnxn_kernel_noener_simd_4xn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_noener_simd_4xm[coulkt][vdwkt](nbl[nb], nbat,
                                                                 ic,
                                                                 shiftVectors,
                                                                 out->f.data(),
@@ -293,7 +292,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
                     break;
 #ifdef GMX_NBNXN_SIMD_2XNN
                 case nbnxnk4xN_SIMD_2xNN:
-                    nbnxn_kernel_ener_simd_2xnn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_ener_simd_2xmm[coulkt][vdwkt](nbl[nb], nbat,
                                                                ic,
                                                                shiftVectors,
                                                                out->f.data(),
@@ -304,7 +303,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #endif
 #ifdef GMX_NBNXN_SIMD_4XN
                 case nbnxnk4xN_SIMD_4xN:
-                    nbnxn_kernel_ener_simd_4xn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_ener_simd_4xm[coulkt][vdwkt](nbl[nb], nbat,
                                                               ic,
                                                               shiftVectors,
                                                               out->f.data(),
@@ -339,7 +338,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #ifdef GMX_NBNXN_SIMD_2XNN
                 case nbnxnk4xN_SIMD_2xNN:
                     unrollj = GMX_SIMD_REAL_WIDTH/2;
-                    nbnxn_kernel_energrp_simd_2xnn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_energrp_simd_2xmm[coulkt][vdwkt](nbl[nb], nbat,
                                                                   ic,
                                                                   shiftVectors,
                                                                   out->f.data(),
@@ -351,7 +350,7 @@ nbnxn_kernel_cpu(nonbonded_verlet_group_t  *nbvg,
 #ifdef GMX_NBNXN_SIMD_4XN
                 case nbnxnk4xN_SIMD_4xN:
                     unrollj = GMX_SIMD_REAL_WIDTH;
-                    nbnxn_kernel_energrp_simd_4xn[coulkt][vdwkt](nbl[nb], nbat,
+                    nbnxm_kernel_energrp_simd_4xm[coulkt][vdwkt](nbl[nb], nbat,
                                                                  ic,
                                                                  shiftVectors,
                                                                  out->f.data(),