Merge branch release-2020 into master

[alexxy/gromacs.git] / src / gromacs / hardware / gpu_hw_info.h

diff --git a/src/gromacs/hardware/gpu_hw_info.h b/src/gromacs/hardware/gpu_hw_info.h
index a8b3144ee5b32f88c52a24a30d4e8eda8f7fb569..8952ca4f8747333d47bc8d55b3f578bed47d9d71 100644 (file)
--- a/src/gromacs/hardware/gpu_hw_info.h
+++ b/src/gromacs/hardware/gpu_hw_info.h
@@ -1,7 +1,8 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2017,2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017 The GROMACS development team.
+ * Copyright (c) 2018,2019,2020, 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,7 +38,7 @@
 
 #include "gromacs/utility/basedefinitions.h"
 
-struct gmx_device_info_t;
+struct DeviceInformation;
 
 /*! \brief Possible results of the GPU detection/check.
  *
@@ -76,7 +77,7 @@ struct gmx_gpu_info_t
     //! Total number of GPU devices detected on this physical node
     int n_dev;
     //! Information about each GPU device detected on this physical node
-    gmx_device_info_t* gpu_dev;
+    DeviceInformation* deviceInfo;
     //! Number of GPU devices detected on this physical node that are compatible.
     int n_dev_compatible;
 };