Move code to prepare for GPU interface rework

This is pure renaming, so hopefully rebases work better. Two of the
header files were being explicitly removed from the set installed, but
now that these headers are no longer in legacyheaders, this issue is
resolved.

Change-Id: I5bbc89c2e52e0d92704896c48eeed5d9c00fd61a

diff --git a/src/gromacs/domdec/domdec.cpp b/src/gromacs/domdec/domdec.cpp
index 54fb8f7c35120334dcf036902d8ee1d5cd5872c4..01be44705a77642923247a7d2dd2757e0c86504a 100644 (file)
--- a/src/gromacs/domdec/domdec.cpp
+++ b/src/gromacs/domdec/domdec.cpp
@@ -52,6 +52,7 @@
 #include "gromacs/ewald/pme.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/pdbio.h"
+#include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/imd/imd.h"
 #include "gromacs/legacyheaders/chargegroup.h"
 #include "gromacs/legacyheaders/constr.h"
@@ -59,7 +60,6 @@
 #include "gromacs/legacyheaders/genborn.h"
 #include "gromacs/legacyheaders/gmx_ga2la.h"
 #include "gromacs/legacyheaders/gmx_omp_nthreads.h"
-#include "gromacs/legacyheaders/gpu_utils.h"
 #include "gromacs/legacyheaders/mdatoms.h"
 #include "gromacs/legacyheaders/mdrun.h"
 #include "gromacs/legacyheaders/names.h"

diff --git a/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
index d0c684d4ae0ae29b44d0891e79f673fb23202d68..cfcc620c19372e0740893214cb81397ab7afdf6f 100644 (file)
--- a/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
+++ b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
@@ -35,7 +35,7 @@
 
 #include "gmxpre.h"
 
-#include "gromacs/legacyheaders/pmalloc_cuda.h"
+#include "pmalloc_cuda.h"
 
 #include <stdlib.h>
 

diff --git a/src/gromacs/legacyheaders/pmalloc_cuda.h b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.h
similarity index 100%
rename from src/gromacs/legacyheaders/pmalloc_cuda.h
rename to src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.h

diff --git a/src/gromacs/gmxlib/gmx_detect_hardware.cpp b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
index b2993963f1754c73cc990bfb6ff537bc2463473b..b3edc587ebe555ecb5474f760dd62562422fd44b 100644 (file)
--- a/src/gromacs/gmxlib/gmx_detect_hardware.cpp
+++ b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
@@ -56,9 +56,9 @@
 
 #include "thread_mpi/threads.h"
 
+#include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/gmx_cpuid.h"
-#include "gromacs/legacyheaders/gpu_utils.h"
 #include "gromacs/legacyheaders/md_logging.h"
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/types/commrec.h"

diff --git a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
index c3ae3ed15fbfe92fdba29002e8d73c5577efedb7..df477525c27c379c2cc6da02a21a8d1272559322 100644 (file)
--- a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
+++ b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
@@ -35,7 +35,7 @@
 
 #include "gmxpre.h"
 
-#include "gromacs/legacyheaders/gpu_utils.h"
+#include "gpu_utils.h"
 
 #include "config.h"
 

diff --git a/src/gromacs/legacyheaders/gpu_utils.h b/src/gromacs/gmxlib/gpu_utils/gpu_utils.h
similarity index 100%
rename from src/gromacs/legacyheaders/gpu_utils.h
rename to src/gromacs/gmxlib/gpu_utils/gpu_utils.h

diff --git a/src/gromacs/legacyheaders/CMakeLists.txt b/src/gromacs/legacyheaders/CMakeLists.txt
index f5737e0f02671a282b3dc0f27430898e28eef78b..bd32dda143b2e5e238876e737dad3ed37d4b8f39 100644 (file)
--- a/src/gromacs/legacyheaders/CMakeLists.txt
+++ b/src/gromacs/legacyheaders/CMakeLists.txt
@@ -34,7 +34,7 @@
 
 # includes: Nothing to build, just installation
 file(GLOB HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-list(REMOVE_ITEM HEADERS gmx_hash.h gmx_ga2la.h gpu_utils.h pmalloc_cuda.h)
+list(REMOVE_ITEM HEADERS gmx_hash.h gmx_ga2la.h)
 gmx_install_headers(${HEADERS})
 
 add_subdirectory(types)

diff --git a/src/gromacs/mdlib/forcerec.cpp b/src/gromacs/mdlib/forcerec.cpp
index d3bb4be6f68aca0d95ae4d5ef5fa0bf20c928510..bfcaacce9648d73b6b0b6f854a63629ba6ab22f4 100644 (file)
--- a/src/gromacs/mdlib/forcerec.cpp
+++ b/src/gromacs/mdlib/forcerec.cpp
@@ -44,11 +44,12 @@
 
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/ewald/ewald.h"
+#include "gromacs/gmxlib/cuda_tools/pmalloc_cuda.h"
+#include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/force.h"
 #include "gromacs/legacyheaders/gmx_detect_hardware.h"
 #include "gromacs/legacyheaders/gmx_omp_nthreads.h"
-#include "gromacs/legacyheaders/gpu_utils.h"
 #include "gromacs/legacyheaders/inputrec.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/md_logging.h"
@@ -57,7 +58,6 @@
 #include "gromacs/legacyheaders/network.h"
 #include "gromacs/legacyheaders/nonbonded.h"
 #include "gromacs/legacyheaders/ns.h"
-#include "gromacs/legacyheaders/pmalloc_cuda.h"
 #include "gromacs/legacyheaders/qmmm.h"
 #include "gromacs/legacyheaders/tables.h"
 #include "gromacs/legacyheaders/txtdump.h"

diff --git a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
index a6cf4b2d6bac5d7db17500ddf5824586e7d4eeb4..f1027b0344a164aded49e76cbba1edb5aa516907 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
+++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
@@ -47,9 +47,9 @@
 #include <cuda_profiler_api.h>
 
 #include "gromacs/gmxlib/cuda_tools/cudautils.cuh"
+#include "gromacs/gmxlib/cuda_tools/pmalloc_cuda.h"
+#include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/legacyheaders/gmx_detect_hardware.h"
-#include "gromacs/legacyheaders/gpu_utils.h"
-#include "gromacs/legacyheaders/pmalloc_cuda.h"
 #include "gromacs/legacyheaders/tables.h"
 #include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/legacyheaders/types/enums.h"

diff --git a/src/programs/mdrun/runner.cpp b/src/programs/mdrun/runner.cpp
index 99395b1f5674d04e09fec83cf606d16e629d9dda..148e05d819eb85ee6755a541aa0cc7f30127f053 100644 (file)
--- a/src/programs/mdrun/runner.cpp
+++ b/src/programs/mdrun/runner.cpp
@@ -94,7 +94,7 @@
 #include "corewrap.h"
 #endif
 
-#include "gromacs/legacyheaders/gpu_utils.h"
+#include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 
 typedef struct {
     gmx_integrator_t *func;