Move nbnxn files to nbnxm directory

[alexxy/gromacs.git] / src / gromacs / nbnxm / gpu_common.h

diff --git a/src/gromacs/mdlib/nbnxn_gpu_common.h b/src/gromacs/nbnxm/gpu_common.h
similarity index 97%
rename from src/gromacs/mdlib/nbnxn_gpu_common.h
rename to src/gromacs/nbnxm/gpu_common.h
index c8726c9716e67e64d4af2db2ba0fc887f21a2846..cd64c8ca1a8b31761c3e89e61dc3e2afe68bbdc8 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_gpu_common.h
+++ b/src/gromacs/nbnxm/gpu_common.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -37,35 +37,35 @@
  *
  * \author Szilard Pall <pall.szilard@gmail.com>
  *
- * \ingroup module_mdlib
+ * \ingroup module_nbnxm
  */
 
-#ifndef GMX_MDLIB_NBNXN_GPU_COMMON_H
-#define GMX_MDLIB_NBNXN_GPU_COMMON_H
+#ifndef GMX_NBNXM_GPU_COMMON_H
+#define GMX_NBNXM_GPU_COMMON_H
 
 #include "config.h"
 
 #include <string>
 
 #if GMX_GPU == GMX_GPU_CUDA
-#include "nbnxn_cuda/nbnxn_cuda_types.h"
+#include "cuda/nbnxm_cuda_types.h"
 #endif
 
 #if GMX_GPU == GMX_GPU_OPENCL
-#include "nbnxn_ocl/nbnxn_ocl_types.h"
+#include "opencl/nbnxm_ocl_types.h"
 #endif
 
 #include "gromacs/gpu_utils/gpu_utils.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/mdlib/force_flags.h"
-#include "gromacs/mdlib/nb_verlet.h"
-#include "gromacs/mdlib/nbnxn_gpu_types.h"
+#include "gromacs/nbnxm/nbnxm.h"
 #include "gromacs/pbcutil/ishift.h"
 #include "gromacs/timing/gpu_timing.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/stringutil.h"
 
-#include "nbnxn_gpu_common_utils.h"
+#include "gpu_common_utils.h"
+#include "nbnxm_gpu.h"
 
 /*! \brief Check that atom locality values are valid for the GPU module.
  *