Fix compiler issues

We recently added some extern template declarations to a function
whose argument list was then modified, but gerrit didn't flag the
change as requiring a rebase.

Also fixed mdrun-only build

Change-Id: Ib7aa0d685e881faa2abce628f06aef3d666d260c

diff --git a/src/gromacs/gpu_utils/cudautils.cuh b/src/gromacs/gpu_utils/cudautils.cuh
index df319ae051fe33223107e7927fd8fc6fffe99645..1116d6667406df78c3f030364f08e17f05ca7a6c 100644 (file)
--- a/src/gromacs/gpu_utils/cudautils.cuh
+++ b/src/gromacs/gpu_utils/cudautils.cuh
@@ -188,8 +188,8 @@ void initParamLookupTable(T                        * &d_ptr,
 
 // Add extern declarations so each translation unit understands that
 // there will be a definition provided.
-extern template void initParamLookupTable<int>(int * &, cudaTextureObject_t &, const int *, int, const gmx_device_info_t *);
-extern template void initParamLookupTable<float>(float * &, cudaTextureObject_t &, const float *, int, const gmx_device_info_t *);
+extern template void initParamLookupTable<int>(int * &, cudaTextureObject_t &, const int *, int);
+extern template void initParamLookupTable<float>(float * &, cudaTextureObject_t &, const float *, int);
 
 /*! \brief Destroy parameter lookup table.
  *
@@ -205,8 +205,8 @@ void destroyParamLookupTable(T                       *d_ptr,
 
 // Add extern declarations so each translation unit understands that
 // there will be a definition provided.
-extern template void destroyParamLookupTable<int>(int *, cudaTextureObject_t, const gmx_device_info_t *);
-extern template void destroyParamLookupTable<float>(float *, cudaTextureObject_t, const gmx_device_info_t *);
+extern template void destroyParamLookupTable<int>(int *, cudaTextureObject_t);
+extern template void destroyParamLookupTable<float>(float *, cudaTextureObject_t);
 
 /*! \brief Add a triplets stored in a float3 to an rvec variable.
  *

diff --git a/src/programs/mdrun_main.cpp b/src/programs/mdrun_main.cpp
index c2bdb70b3df5fdd4913947893cf056a81e4e5964..660e16c89822f4cda6c1c1947cba27cef6166050 100644 (file)
--- a/src/programs/mdrun_main.cpp
+++ b/src/programs/mdrun_main.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013,2014,2016, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2016,2018, 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.
@@ -53,5 +53,5 @@ void initSettingsNoNice(gmx::CommandLineModuleSettings *settings)
 int main(int argc, char *argv[])
 {
     return gmx::CommandLineModuleManager::runAsMainCMainWithSettings(
-            argc, argv, &gmx_mdrun, &initSettingsNoNice);
+            argc, argv, &gmx::gmx_mdrun, &initSettingsNoNice);
 }