Move hardware info structs to hardware/

Move hw_info.h and gpu_hw_info.h to hardware/, removing more code from
legacyheaders/types/.

Change-Id: Id324f8b517beb9cfd4e9d517f9e704efc55a4096

diff --git a/src/gromacs/domdec/domdec.cpp b/src/gromacs/domdec/domdec.cpp
index e48b415b77d9001e64df1b4edce2fe40af92502b..b935197ee433ecdde5469b5da2ee392e152f528b 100644 (file)
--- a/src/gromacs/domdec/domdec.cpp
+++ b/src/gromacs/domdec/domdec.cpp
@@ -58,10 +58,10 @@
 #include "gromacs/gmxlib/network.h"
 #include "gromacs/gmxlib/nrnb.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/imd/imd.h"
 #include "gromacs/legacyheaders/types/commrec.h"
 #include "gromacs/legacyheaders/types/forcerec.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
 #include "gromacs/legacyheaders/types/ifunc.h"
 #include "gromacs/listed-forces/manage-threading.h"
 #include "gromacs/math/vec.h"

diff --git a/src/gromacs/domdec/domdec.h b/src/gromacs/domdec/domdec.h
index 502f1d6799596310cb15750a0cdbcd5f805cee62..91bf5fec3db383f22a2f507a14102f21e6e952d1 100644 (file)
--- a/src/gromacs/domdec/domdec.h
+++ b/src/gromacs/domdec/domdec.h
@@ -61,8 +61,8 @@
 #include <stdio.h>
 
 #include "gromacs/gmxlib/nrnb.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/legacyheaders/types/forcerec.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/constr.h"
 #include "gromacs/mdlib/vsite.h"

diff --git a/src/gromacs/gmxlib/gmx_detect_hardware.cpp b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
index 44b114f3757140dd16d05d92e32683e93276d3d6..65701b44eef0b5010d285384c937cd2ea0ad1ddf 100644 (file)
--- a/src/gromacs/gmxlib/gmx_detect_hardware.cpp
+++ b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
@@ -60,10 +60,10 @@
 #include "gromacs/gmxlib/network.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/hardware/cpuinfo.h"
+#include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/hardware/hardwaretopology.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/legacyheaders/types/commrec.h"
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/simd/support.h"
 #include "gromacs/utility/arrayref.h"

diff --git a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
index df9aaa5f976cdf7ea1d7d9e0d460bc43c91dfe45..e3bdd6f2de129b2ca7144cbf5942e3471d15a871 100644 (file)
--- a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
+++ b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
@@ -50,7 +50,7 @@
 
 #include "gromacs/gmxlib/cuda_tools/cudautils.cuh"
 #include "gromacs/gmxlib/cuda_tools/pmalloc_cuda.h"
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
+#include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/smalloc.h"

diff --git a/src/gromacs/gmxlib/gpu_utils/gpu_utils_ocl.cpp b/src/gromacs/gmxlib/gpu_utils/gpu_utils_ocl.cpp
index ad83f34c3d874fe4ee3efc38080e16401f0f9be4..c247e050753860a1548f0db435dcdf76be2153f4 100644 (file)
--- a/src/gromacs/gmxlib/gpu_utils/gpu_utils_ocl.cpp
+++ b/src/gromacs/gmxlib/gpu_utils/gpu_utils_ocl.cpp
@@ -55,7 +55,7 @@
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/gmxlib/gpu_utils/ocl_compiler.h"
 #include "gromacs/gmxlib/ocl_tools/oclutils.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/fatalerror.h"

diff --git a/src/gromacs/gmxlib/gpu_utils/ocl_compiler.h b/src/gromacs/gmxlib/gpu_utils/ocl_compiler.h
index 2265e050864b282c1e94e56477a5ff1bf105f3be..b9bfba10b210ca345e59e50f76d18337ee8dde10 100644 (file)
--- a/src/gromacs/gmxlib/gpu_utils/ocl_compiler.h
+++ b/src/gromacs/gmxlib/gpu_utils/ocl_compiler.h
@@ -49,7 +49,7 @@
 #define GMX_GMXLIB_GPU_UTILS_OCL_COMPILER_H
 
 #include "gromacs/gmxlib/ocl_tools/oclutils.h"
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
+#include "gromacs/hardware/gpu_hw_info.h"
 
 /*! \brief Vendor specific kernel sources
  *

diff --git a/src/gromacs/gmxlib/thread_affinity.cpp b/src/gromacs/gmxlib/thread_affinity.cpp
index ca4f294b9c7fc21a49a53753fc395eb3ebfcde80..94b0ed2e05a52a4d438604f71f4c15753cc0bec7 100644 (file)
--- a/src/gromacs/gmxlib/thread_affinity.cpp
+++ b/src/gromacs/gmxlib/thread_affinity.cpp
@@ -52,8 +52,8 @@
 #include "gromacs/gmxlib/gmx_omp_nthreads.h"
 #include "gromacs/gmxlib/md_logging.h"
 #include "gromacs/hardware/hardwaretopology.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/legacyheaders/types/commrec.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
 #include "gromacs/utility/basenetwork.h"
 #include "gromacs/utility/cstringutil.h"
 #include "gromacs/utility/exceptions.h"

diff --git a/src/gromacs/gmxlib/thread_affinity.h b/src/gromacs/gmxlib/thread_affinity.h
index 0d35eea22a782b13579e542b0dfad1e48e617bc1..7a77ff0f7465bb90e569d1b557a9ae4468e7684b 100644 (file)
--- a/src/gromacs/gmxlib/thread_affinity.h
+++ b/src/gromacs/gmxlib/thread_affinity.h
@@ -37,7 +37,7 @@
 
 #include <cstdio>
 
-#include "gromacs/legacyheaders/types/hw_info.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/utility/basedefinitions.h"
 
 struct t_commrec;

diff --git a/src/gromacs/legacyheaders/types/gpu_hw_info.h b/src/gromacs/hardware/gpu_hw_info.h
similarity index 97%
rename from src/gromacs/legacyheaders/types/gpu_hw_info.h
rename to src/gromacs/hardware/gpu_hw_info.h
index 58ace87b1288908731f3c9dbbe90e50d41ba5e56..b78ee6e75998e1c440ddf433912c318488b90278 100644 (file)
--- a/src/gromacs/legacyheaders/types/gpu_hw_info.h
+++ b/src/gromacs/hardware/gpu_hw_info.h
@@ -32,9 +32,8 @@
  * 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 GMX_GPU_HW_INFO_H
-#define GMX_GPU_HW_INFO_H
+#ifndef GMX_HARDWARE_GPU_HW_INFO_H
+#define GMX_HARDWARE_GPU_HW_INFO_H
 
 #include "gromacs/utility/basedefinitions.h"
 
@@ -86,4 +85,4 @@ typedef struct gmx_gpu_opt_t
 }
 #endif
 
-#endif /* GMX_GPU_HW_INFO_H */
+#endif

diff --git a/src/gromacs/legacyheaders/types/hw_info.h b/src/gromacs/hardware/hw_info.h
similarity index 97%
rename from src/gromacs/legacyheaders/types/hw_info.h
rename to src/gromacs/hardware/hw_info.h
index c4225e32c8f802ef7c83cb750c29ae97c2d4d81a..aff6517a76e1b528698d2a6df0c1cff93f50db99 100644 (file)
--- a/src/gromacs/legacyheaders/types/hw_info.h
+++ b/src/gromacs/hardware/hw_info.h
@@ -32,11 +32,10 @@
  * 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 GMX_HARDWARE_HWINFO_H
+#define GMX_HARDWARE_HWINFO_H
 
-#ifndef HWINFO_H
-#define HWINFO_H
-
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
+#include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/utility/basedefinitions.h"
 
 namespace gmx
@@ -99,4 +98,4 @@ typedef struct gmx_hw_opt_t {
     gmx_gpu_opt_t gpu_opt;             /* The GPU options                          */
 } gmx_hw_opt_t;
 
-#endif /* HWINFO_H */
+#endif

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 190828573c5821a18e748f10351cc8e650ede11d..10c2e92874a4c55e1c4b48d3fc11cdeab9e1a983 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
+++ b/src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
@@ -52,8 +52,8 @@
 #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/hardware/gpu_hw_info.h"
 #include "gromacs/legacyheaders/types/force_flags.h"
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
 #include "gromacs/legacyheaders/types/interaction_const.h"
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/nb_verlet.h"

diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
index 485dd19d7c96813fb27e8aa65cbec28d5c4207ee..93acf0d5421392ac96ad27fcc0d50a7c9a2a5d58 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
+++ b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
@@ -52,8 +52,8 @@
 #endif
 
 #include "gromacs/gmxlib/ocl_tools/oclutils.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/legacyheaders/types/force_flags.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
 #include "gromacs/mdlib/nb_verlet.h"
 #include "gromacs/mdlib/nbnxn_consts.h"
 #include "gromacs/mdlib/nbnxn_pairlist.h"

diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
index 6d7706b6f32a29f3bcea07eb58becc5b9f41abea..8b83979ef42602634af536349ad990a3b02d7f74 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
+++ b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
@@ -51,8 +51,8 @@
 #include "gromacs/gmxlib/gmx_detect_hardware.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/gmxlib/ocl_tools/oclutils.h"
+#include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/legacyheaders/types/force_flags.h"
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
 #include "gromacs/legacyheaders/types/interaction_const.h"
 #include "gromacs/math/vectypes.h"
 #include "gromacs/mdlib/nb_verlet.h"

diff --git a/src/programs/mdrun/resource-division.cpp b/src/programs/mdrun/resource-division.cpp
index 420c8737df8cd2f4720218668299fa607ac5b97e..29b37347d50e54877ddb86c82f68dd80785030b9 100644 (file)
--- a/src/programs/mdrun/resource-division.cpp
+++ b/src/programs/mdrun/resource-division.cpp
@@ -48,10 +48,10 @@
 #include "gromacs/gmxlib/gmx_omp_nthreads.h"
 #include "gromacs/gmxlib/md_logging.h"
 #include "gromacs/hardware/cpuinfo.h"
+#include "gromacs/hardware/gpu_hw_info.h"
 #include "gromacs/hardware/hardwaretopology.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/legacyheaders/types/commrec.h"
-#include "gromacs/legacyheaders/types/gpu_hw_info.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
 #include "gromacs/mdtypes/inputrec.h"
 #include "gromacs/mdtypes/md_enums.h"
 #include "gromacs/topology/topology.h"

diff --git a/src/programs/mdrun/runner.h b/src/programs/mdrun/runner.h
index b19d410a076acc106cf3c618554f9711d95ddf26..cd3b251f7ef2dae36a064b2be1ac34395b14ecf4 100644 (file)
--- a/src/programs/mdrun/runner.h
+++ b/src/programs/mdrun/runner.h
@@ -45,7 +45,7 @@
 #include <cstdio>
 
 #include "gromacs/fileio/filenm.h"
-#include "gromacs/legacyheaders/types/hw_info.h"
+#include "gromacs/hardware/hw_info.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/real.h"