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
// Add extern declarations so each translation unit understands that
// there will be a definition provided.
// 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.
*
/*! \brief Destroy parameter lookup table.
*
// Add extern declarations so each translation unit understands that
// there will be a definition provided.
// 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.
*
/*! \brief Add a triplets stored in a float3 to an rvec variable.
*
/*
* This file is part of the GROMACS molecular simulation package.
*
/*
* 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.
* 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.
int main(int argc, char *argv[])
{
return gmx::CommandLineModuleManager::runAsMainCMainWithSettings(
int main(int argc, char *argv[])
{
return gmx::CommandLineModuleManager::runAsMainCMainWithSettings(
- argc, argv, &gmx_mdrun, &initSettingsNoNice);
+ argc, argv, &gmx::gmx_mdrun, &initSettingsNoNice);