From e3369e08e779c4fc3a6af6f4ec498af9b5ab99ea Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Wed, 28 Aug 2019 16:32:42 +0200 Subject: [PATCH] Fix integration issues Post-submit is warning about CUDA, and an automatic rebase missed out on the change to remove gmx_install_headers(). Change-Id: I64d6fd149a4fa0d72cbd7e7d210b325f9f66a112 --- docs/dev-manual/gmxtree.rst | 6 +++--- src/gromacs/mdlib/leapfrog_cuda.cu | 2 +- src/gromacs/modularsimulator/CMakeLists.txt | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/dev-manual/gmxtree.rst b/docs/dev-manual/gmxtree.rst index f09a9ba45a..565c62325b 100644 --- a/docs/dev-manual/gmxtree.rst +++ b/docs/dev-manual/gmxtree.rst @@ -85,9 +85,9 @@ module and documenting it. #include <...> // This should be used for system and external headers - * Installed headers must not include non-installed headers. Headers can be - marked for install within ``CMakeLists.txt`` files of their respective - modules, using ``gmx_install_headers()``. + * When we again have installed headers, they must not include non-installed + headers. Headers should be marked for install within ``CMakeLists.txt`` + files of their respective modules. * All source files must include "gmxpre.h" as the first header. * A source/header file should include "config.h," "gromacs/simd/simd.h", or "gromacs/ewald/pme_simd.h" if and only if it uses a macro declared diff --git a/src/gromacs/mdlib/leapfrog_cuda.cu b/src/gromacs/mdlib/leapfrog_cuda.cu index 36364aa562..1a338fc60b 100644 --- a/src/gromacs/mdlib/leapfrog_cuda.cu +++ b/src/gromacs/mdlib/leapfrog_cuda.cu @@ -206,7 +206,7 @@ void LeapFrogCuda::integrate(const float3 *d_x, if (doTempCouple) { - GMX_ASSERT(numTempScaleValues_ == h_lambdas_.size(), "Number of temperature scaling factors changed since it was set for the last time."); + GMX_ASSERT(numTempScaleValues_ == ssize(h_lambdas_), "Number of temperature scaling factors changed since it was set for the last time."); for (int i = 0; i < numTempScaleValues_; i++) { h_lambdas_[i] = tcstat[i].lambda; diff --git a/src/gromacs/modularsimulator/CMakeLists.txt b/src/gromacs/modularsimulator/CMakeLists.txt index e9e40d94c4..18ad0c30d4 100644 --- a/src/gromacs/modularsimulator/CMakeLists.txt +++ b/src/gromacs/modularsimulator/CMakeLists.txt @@ -31,5 +31,3 @@ # # To help us fund GROMACS development, we humbly ask that you cite # the research papers on the package. Check out http://www.gromacs.org. - -gmx_install_headers() -- 2.11.4.GIT