Manually sort some includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_cuda / nbnxn_cuda.h

diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h
index 576f413ba255cf9c785b7ba698c71a3c2a9080cd..6ccce27efdc3dcb939baae70da00f22e1151c629 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h
+++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, 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.
@@ -32,12 +32,13 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-
 #ifndef NBNXN_CUDA_H
 #define NBNXN_CUDA_H
 
-#include "types/nbnxn_cuda_types_ext.h"
-#include "types/simple.h"
+#include "gromacs/legacyheaders/types/nbnxn_cuda_types_ext.h"
+#include "gromacs/legacyheaders/types/simple.h"
+
+#include "config.h"
 
 #ifdef GMX_GPU
 #define FUNC_TERM ;
@@ -49,7 +50,11 @@
 extern "C" {
 #endif
 
-/*! Launch asynchronously the nonbonded force calculations.
+struct nbnxn_atomdata_t;
+
+/*! \brief
+ * Launch asynchronously the nonbonded force calculations.
+ *
  *  This consists of the following (async) steps launched:
  *  - upload x and q;
  *  - upload shift vector;
@@ -57,29 +62,31 @@ extern "C" {
  *  The local and non-local interaction calculations are launched in two
  *  separate streams.
  */
-void nbnxn_cuda_launch_kernel(nbnxn_cuda_ptr_t       gmx_unused  cu_nb,
-                              const nbnxn_atomdata_t gmx_unused *nbdata,
-                              int                    gmx_unused  flags,
-                              int                    gmx_unused  iloc) FUNC_TERM
+void nbnxn_cuda_launch_kernel(nbnxn_cuda_ptr_t              gmx_unused  cu_nb,
+                              const struct nbnxn_atomdata_t gmx_unused *nbdata,
+                              int                           gmx_unused  flags,
+                              int                           gmx_unused  iloc) FUNC_TERM
 
-/*! Launch asynchronously the download of nonbonded forces from the GPU
- *  (and energies/shift forces if required).
+/*! \brief
+ * Launch asynchronously the download of nonbonded forces from the GPU
+ * (and energies/shift forces if required).
  */
-void nbnxn_cuda_launch_cpyback(nbnxn_cuda_ptr_t       gmx_unused  cu_nb,
-                               const nbnxn_atomdata_t gmx_unused *nbatom,
-                               int                    gmx_unused  flags,
-                               int                    gmx_unused  aloc) FUNC_TERM
+void nbnxn_cuda_launch_cpyback(nbnxn_cuda_ptr_t              gmx_unused  cu_nb,
+                               const struct nbnxn_atomdata_t gmx_unused *nbatom,
+                               int                           gmx_unused  flags,
+                               int                           gmx_unused  aloc) FUNC_TERM
 
-/*! Wait for the asynchronously launched nonbonded calculations and data
- *  transfers to finish.
+/*! \brief
+ * Wait for the asynchronously launched nonbonded calculations and data
+ * transfers to finish.
  */
-void nbnxn_cuda_wait_gpu(nbnxn_cuda_ptr_t       gmx_unused  cu_nb,
-                         const nbnxn_atomdata_t gmx_unused *nbatom,
-                         int                    gmx_unused  flags,
-                         int                    gmx_unused  aloc,
-                         real                   gmx_unused *e_lj,
-                         real                   gmx_unused *e_el,
-                         rvec                   gmx_unused *fshift) FUNC_TERM
+void nbnxn_cuda_wait_gpu(nbnxn_cuda_ptr_t              gmx_unused  cu_nb,
+                         const struct nbnxn_atomdata_t gmx_unused *nbatom,
+                         int                           gmx_unused  flags,
+                         int                           gmx_unused  aloc,
+                         real                          gmx_unused *e_lj,
+                         real                          gmx_unused *e_el,
+                         rvec                          gmx_unused *fshift) FUNC_TERM
 
 #ifdef __cplusplus
 }