Move nbnxn files to nbnxm directory

[alexxy/gromacs.git] / src / gromacs / nbnxm / cuda / nbnxm_cuda.cu

diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu b/src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
rename to src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
index 7a78dda1097b29ce66909b46563004edd9c07d05..15eb634f282bebc59839101b3b8ba46f5a259afb 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
+++ b/src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
@@ -44,28 +44,27 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "gromacs/mdlib/nbnxn_gpu.h"
+#include "gromacs/nbnxm/nbnxm_gpu.h"
 
 #if defined(_MSVC)
 #include <limits>
 #endif
 
 
-#include "nbnxn_cuda.h"
+#include "nbnxm_cuda.h"
 
 #include "gromacs/gpu_utils/cudautils.cuh"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_common.h"
-#include "gromacs/mdlib/nbnxn_gpu_common_utils.h"
-#include "gromacs/mdlib/nbnxn_gpu_data_mgmt.h"
-#include "gromacs/mdlib/nbnxn_pairlist.h"
+#include "gromacs/nbnxm/gpu_common.h"
+#include "gromacs/nbnxm/gpu_common_utils.h"
+#include "gromacs/nbnxm/gpu_data_mgmt.h"
+#include "gromacs/nbnxm/nbnxm.h"
+#include "gromacs/nbnxm/pairlist.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/gmxassert.h"
 
-#include "nbnxn_cuda_types.h"
-
+#include "nbnxm_cuda_types.h"
 
 /***** The kernel declarations/definitions come here *****/
 
@@ -78,33 +77,33 @@
  */
 #define FUNCTION_DECLARATION_ONLY
 /** Force only **/
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 /** Force & energy **/
 #define CALC_ENERGIES
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef CALC_ENERGIES
 
 /*** Pair-list pruning kernels ***/
 /** Force only **/
 #define PRUNE_NBL
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 /** Force & energy **/
 #define CALC_ENERGIES
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernels.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernels.cuh"
 #undef CALC_ENERGIES
 #undef PRUNE_NBL
 
 /* Prune-only kernels */
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cuh"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cuh"
 #undef FUNCTION_DECLARATION_ONLY
 
 /* Now generate the function definitions if we are using a single compilation unit. */
 #if GMX_CUDA_NB_SINGLE_COMPILATION_UNIT
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_noprune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_F_prune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_noprune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_VF_prune.cu"
-#include "gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_pruneonly.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_noprune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_F_prune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_noprune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_VF_prune.cu"
+#include "gromacs/nbnxm/cuda/nbnxm_cuda_kernel_pruneonly.cu"
 #endif /* GMX_CUDA_NB_SINGLE_COMPILATION_UNIT */