Artem Zhmurov [Wed, 9 Oct 2019 14:02:36 +0000 (16:02 +0200)]
Centralize management of coordinates ready on GPU event
This change shifts the ownership of the EventSynchronizer
indicating that coordinates are available on the device from
UpdateConstraints to StatePropagatorDataGpu.
The latter now provides a getter that, based on workload flags, decides
which synchronizer to return. If update is offloaded the returned event
records the completion of the update-constraints on the GPU.
When update is not offloaded and on search steps the returned event
records the completion of the host to device coordinate transfer.
Change-Id: Idec9f46e78a2708fa31e895bf7590cdad1872987
Artem Zhmurov [Fri, 11 Oct 2019 11:48:35 +0000 (13:48 +0200)]
Wrong locality was used when ignoring the PME force contribution
The PME forces have no no-local contribution, hence they should be
ignored when non-local forces are reduced. This fixes the bug with
local PME forces ignored instead of non-local. The bug was
introduced in
9409fa5f.
Change-Id: Ie27c71d1f51ca4022f196a9fa114af42685fcbcf
Paul Bauer [Tue, 17 Sep 2019 15:33:13 +0000 (17:33 +0200)]
Add helper to reuse generated TPR files in testing
Used static class members in GoogleTest and provided option in
testfilemanager to allow file path specification before test case is
started.
This should speed up some of the test cases that have been slow due to
repeated calls to grompp.
Change-Id: I50e29d04550d78f2324e3665e903d45515464298
Szilárd Páll [Wed, 9 Oct 2019 00:32:11 +0000 (02:32 +0200)]
Migrate code to using SimulationWorkload flags
This changes boolean flags to use the ones defined after task assignment
in SimulationWorkload.
Also does some minor cleanup around code touched in do_force().
No functionality should change.
Change-Id: Ia9bd28f84fee4cb98b578b366153646b2959c1f4
Szilárd Páll [Thu, 10 Oct 2019 14:17:58 +0000 (16:17 +0200)]
Remove incorrect GPU task dependency
The depndency between nonlocal reduction and PME forces is not necessary
and therefore it is removed.
Change-Id: Ic7eba307b519f0fb8bde24a2cf676a22d64065ba
Szilárd Páll [Thu, 10 Oct 2019 19:56:16 +0000 (21:56 +0200)]
Fix conditions for building StatePropagatorDataGpu
StatePropagatorDataGpu was only build when GPU update was active rather
than when GPU buffer ops is active.
Change-Id: I6d2efa73c4896a293155c0853a32b8cedf3d23a6
Szilárd Páll [Wed, 9 Oct 2019 18:18:44 +0000 (20:18 +0200)]
Construct a struct with development feature flags
Added a struct that collects development feature flags pupulated using
the same environment variables that were used previsouly.
With this the change also eliminates repeated getenv queries.
Change-Id: I2cb4f4dfc28bb6370bb4f7cb549f2222e7580e47
Szilárd Páll [Tue, 8 Oct 2019 01:47:46 +0000 (03:47 +0200)]
Pass list of EventSynchronizers to GPU reduction
Instead of passing events one-by-one or doing implicit synchronization
hidden in a force tasks' internals, a list of synchronizer objects that
signal the availability of forces from the source tasks is assembled and
passed to the GPU buffer ops/reduction.
The new dependency added here is the H2D transfer for CPU-side force
contribution, PME-related event is kept, halo exchange dependency needs
to be added.
Change-Id: I5ca5ef919b49508790e813e0469aaeef4f6484c0
Paul Bauer [Mon, 7 Oct 2019 09:36:04 +0000 (11:36 +0200)]
Basic population of simulation workload
Adds basic population of simulation workload datastructure from
information available after task assignment is done to GPU(s).
Also changes population of step and domain work datastructures to
return new datastructure instead of passing pointer to routine that
fills them.
Change-Id: Ie48a4f74eaa69092f24355e19f66a90d6700baa0
Artem Zhmurov [Fri, 4 Oct 2019 15:48:34 +0000 (17:48 +0200)]
Add management for velocities and forces copy events to StatePropagatorDataGpu
All H2D and D2H copies of velocities and forces now record an event, methods
to synchronize on those events are added to the class.
Change-Id: I910c5834d83f317f12c1fe0cd71ced168f412386
Szilárd Páll [Mon, 30 Sep 2019 13:04:10 +0000 (15:04 +0200)]
Add management for coordinates copy events into StatePropagatorDataGpu
The coordinate copies are now assign a GPU stream and fire an event
when done. The consumers can now wait on coordinates to be ready on
Host or get the GPU event to enqueue a wait on Device.
Change-Id: Ia33e366f32d777ec980940ff7e284ab0b3498637
Szilárd Páll [Mon, 30 Sep 2019 12:47:11 +0000 (14:47 +0200)]
Add GPU event to mark that coordinate update is done
Also added related getter of a pointer to the GpuEventSynchronizer
object that allows syncing the dependent tasks.
Added temporary CPU blocking wait that ensures previous behaviour is
maintained while the GPU update integration is pending.
Change-Id: Iaae03d4f1f4083863a359e66a35f44d178b9382d
Berk Hess [Mon, 7 Oct 2019 09:59:56 +0000 (11:59 +0200)]
Make nbnxm a proper module
Added definition of module_nbnxm to doxygen documentation.
Required removing the path from many #includes inside
the module.
Change-Id: I1d46aefaa83b0be674c14a4ef5ee16573eee0e1a
Berk Hess [Tue, 8 Oct 2019 08:29:35 +0000 (10:29 +0200)]
Simplify ewald_LRcorrection() call signature
Also removed an outdated comment.
Change-Id: I09af7185f3475c70eab154974f0dba0653a6142a
M. Eric Irrgang [Sun, 6 Oct 2019 14:41:45 +0000 (17:41 +0300)]
Update handling of CMake policy 68..
The policy is now available in supported CMake versions, so apply it
universally.
Change-Id: Ia6ae999f25d7d9b3932fe74862825a8fb8527352
Artem Zhmurov [Tue, 8 Oct 2019 05:24:51 +0000 (07:24 +0200)]
Fix for the recent nightly failure
The cont qualifier in the function declaration produced a warning
that caused the nightly to fail. This fixes the issue, introduced
by
77857c5.
Change-Id: Icef063107a5f66d841f1d110dc9f9fb807364ed2
Prashanth Kanduri [Mon, 7 Oct 2019 15:19:13 +0000 (17:19 +0200)]
Fused two if branches with the same conditional
Change-Id: I8a1fc90875982f2723d9b2f2ea2d847a33f5866b
Artem Zhmurov [Fri, 27 Sep 2019 20:29:30 +0000 (22:29 +0200)]
Pass the GPU streams to StatePropagatorDataGpu constructor
Now the StatePropagatorDataGpu has a local copy of all GPU streams and
manages the update stream. This will allow to select the specific stream
for a specific copy event in the follow-ups. The update stream is now
created in the constructor of the StatePropagatorDataGPU object, which
is a temporary solution until there is a separate device stream manager
(#3115).
Notes:
- The current implementation where StatePropagatorDataGpu is also used
on PME-only ranks, where many of the streams do not exist, without
any restriction on the methods which would require these streams is a
weakness of the design that will be dealt with in follow-up
- The OpenCL builds unconditionally use PME stream/context, since for
these this object is only used when the initial coordinates are copied.
- The update stream is created in the constructor, whereas the rest of
the streams is passed as arguments. This asymmentry will be removed
with introduction of the centralized management of context/streams.
Refs. #2816.
Change-Id: Ia9b1cabd1d3d4942dba8465c716bf644037581e7
Mark Abraham [Fri, 30 Aug 2019 16:27:05 +0000 (18:27 +0200)]
Extend GPU traits class
Now GPU traits provide a non-GPU header, so that generic code
can use CommandStream, CommandEvent and DeviceContext types.
The header also diverges to a platform-specific version when
needed upon compilation. This change allows for passing the
variables of the above types in the general (non-GPU) parts
of the code and can be included where the code is shared
between different platforms.
Renamed a Context variable to DeviceContext for greater clarity.
Change-Id: If21b9dacac66ff7203948eb03de96f9473b7359a
Artem Zhmurov [Mon, 7 Oct 2019 08:47:34 +0000 (10:47 +0200)]
Clean up the comments sections in Update-Constrain
Remove todos that are done, update the comments related to
the recent changes in the logic.
Change-Id: Ib26848b22efae77d6db0a2ab85734ceaf02db235
M. Eric Irrgang [Sun, 6 Oct 2019 14:39:15 +0000 (17:39 +0300)]
Update rpath comments in src/api/cpp
Change-Id: I7839ee47ec8af7fe9445894f357b10b2ac803338
Artem Zhmurov [Wed, 2 Oct 2019 16:15:32 +0000 (18:15 +0200)]
Fix a bug in GPU halo exchange initialization
The non-local stream was passed to a constructor as a local stream.
Change-Id: I4e5b2405b0beb8e64720b7fc6be72ff15e1847fb
Mark Abraham [Sat, 28 Sep 2019 08:25:41 +0000 (10:25 +0200)]
Fix that tests intended for multiple ranks run that way
Added the flag that triggers ctest to use the flags that will produce
multiple ranks in both thread-MPI and real MPI cases.
Change-Id: I4ef3af4fd1750ab7cc231a29191fc4042385c309
Berk Hess [Fri, 4 Oct 2019 07:43:19 +0000 (09:43 +0200)]
Fix random energy and virial with PME on GPU on a PME-only rank
Missing zero initialization of never computed LJ PME energy and virial
terms with PME on the GPU could lead to random energy, virial and
pressure numbers.
The effect of this bug was that the potential and total energy could
be off (not the Coulomb mesh energy). This didn't affect sampling.
The pressure could be off, which would affect sampling when pressure
coupling is used, but likely the simulation would explode after
a few steps.
Fixes #3120
Change-Id: I309dde958f1b73e7f71f87f4f5ad016d16f8d16b
Artem Zhmurov [Wed, 2 Oct 2019 16:00:54 +0000 (18:00 +0200)]
Fix the bug with offloading the PME-only ranks to GPU
This fixes the bug introduced with StatePropagatorDataGpu (Commit
092a8f68):
In PME-only ranks, the GPU context and stream were mixed up and passed to
the constructor of StatePropagatorDataGpu in the wrong order. This caused
failure in OpenCL builds with error -34 (CL_INVALID_CONTEXT). Did not
affect the CUDA builds, since the context is not relevant in CUDA.
Change-Id: I5e070e361c7bdef3168887dcac4869bb71c6c5ed
Berk Hess [Wed, 2 Oct 2019 09:28:06 +0000 (11:28 +0200)]
Fix GPU atom data init timer issue
The GPU atom data init timer was read conditionally on the timing
of the local pairlist transfer. But the local pairlist transfer
is not timed with an empty list, leading to an inconsistent timer
state.
Change-Id: Ifc2a63c7273ae65ae66708c6a8b0fb526041ee38
Berk Hess [Wed, 25 Sep 2019 15:15:42 +0000 (17:15 +0200)]
Use gmx::Range for iZones in pair search
Change-Id: Ifed1ac3ed2fc0b02680a33d4e44620f82248dda9
M. Eric Irrgang [Wed, 11 Sep 2019 08:56:52 +0000 (11:56 +0300)]
Build gmxapi documentation in main GROMACS documentation.
* Update gmxapi Python package installation instructions and remove
quickstart.rst
* Minor updates to main installation guide document.
Refs #2698
Refs #2985
Change-Id: I6f1d6e6fe59e618144e4f14c0d2fe9f9b8c2c901
Berk Hess [Tue, 1 Oct 2019 22:17:42 +0000 (00:17 +0200)]
Fix setting maxNumColumns in Nbnxm::GridSet
The use of unitialized data likely only led to suboptimal GPU usage.
Change-Id: Ib63c3f039da85dd219226cc6abe9f83cfd97e116
Carsten Kutzner [Wed, 2 Oct 2019 14:09:45 +0000 (16:09 +0200)]
Update the www link to the Doxygen documentation in the dev guide
The doxygen manual seems to have been relocated from
http://www.stack.nl/~dimitri/doxygen/manual/index.html
to http://www.doxygen.nl/manual/
Change-Id: I321072065576c52a104a119abb5e05dc90eece3a
Artem Zhmurov [Fri, 20 Sep 2019 08:34:25 +0000 (10:34 +0200)]
Eliminate D2D copy in update constraints
The intermediate coordinates (x' or xp) are only needed inside
the update-constraints module (for the constraints algorithms)
and never used outside. Hence, the xp variable can be used to
save the coordinates before update, while x stores the final
coordinates. This way, there is no need to make a D2D xp->x
copy after applying the constraints, since x will have the
correct data.
Refs. #2888, #3114.
Change-Id: I363b633976a236a8e2bf2137c21d3bf0a765cb06
Berk Hess [Wed, 2 Oct 2019 12:20:25 +0000 (14:20 +0200)]
Fix harmless OpenMP write race
Change-Id: I77e014ec2005e5289a0bd13ec608c73641928b54
Paul Bauer [Wed, 2 Oct 2019 13:57:41 +0000 (15:57 +0200)]
Fix failures in clang-8 nightly build
Change-Id: Icbf1bf47f4c526f1f04b9ba2e6ec3de54e06eeba
Mark Abraham [Fri, 20 Sep 2019 15:46:06 +0000 (17:46 +0200)]
Improve PME testing
The change to PME coordinate management uglified these tests even
further. Creation semantics are now more clear.
Change-Id: I309a487cdd218d85dbe4620e1d94e2f04f809a8d
Berk Hess [Wed, 25 Sep 2019 09:42:29 +0000 (11:42 +0200)]
Use gmx::Range in domdec
Renamed gmx_domdec_ns_ranges_t to DDPairInteractionRanges
and made it use gmx::Range. This is now used in an std::vector
in gmx_domdec_zones_t.
Note: more refactoring should be done in gmx_domdec_zones_t.
Change-Id: Iff61096ee8ce1e45a998a905fd56e0c2f43fa319
Artem Zhmurov [Tue, 3 Sep 2019 12:23:40 +0000 (14:23 +0200)]
StatePropagatorDataGpu object to manage GPU forces, positions and velocities buffers
In current version the positions and forces on the GPU are managed by different
modules, depending of the offload scenario for a particular run. This makes
management of the buffers complicated and fragile. This commit adds the object
responsible for management of the GPU buffers of coordinates, forces and
velocities. The object is connected to all clients that use coordinates, forces
and velocities buffers, while keeping the existing logic intact where its
possible.
Since the H2D and D2H copies are now done in nullptr stream, some of implicit
synchronization is lost. Consequently this commit does not always work
properly with newly introduced buffer ops / halo exchange features. To avoid
the confusion, GPU buffer ops are disabled by the assertion. There will be
a separate commit with all copies done synchronously, which will work
with the buffer ops. The stream- and event-based synchronization will be
introduced in the follow-up commits.
Refs. #2816.
Change-Id: I2e2ba1b6436f087d1f2fef4ff876445814a724e7
Mark Abraham [Mon, 30 Sep 2019 18:06:20 +0000 (20:06 +0200)]
Move GPU task assignment
This commit changes no functionality except that it does re-order some
log-file reporting, with GPU task assignment reporting now preceding
OpenMP and thread affinity reporting.
Now that there is multi-stage DD construction, the GPU task assignment
can be done between the stages. This will permit the construction of
GPU resources in time to build domain objects with GPU stream(s),
where appropriate.
Change-Id: I1734afa65ee5b54995ccf23a69ff25ec6587a019
Mark Abraham [Tue, 1 Oct 2019 13:54:06 +0000 (15:54 +0200)]
Fix icc warnings
This makes the intent clearer to see
Change-Id: I633d3921d125edf4cb529554b04fd8667a76843a
Berk Hess [Thu, 19 Sep 2019 14:59:26 +0000 (16:59 +0200)]
Completely remove charge groups
Charge groups remain in the .top and .tpr formats for backward
compatibility.
Change-Id: I9410d464dae07e0dac5bddfcc0e551c821963547
Berk Hess [Mon, 30 Sep 2019 20:13:27 +0000 (22:13 +0200)]
Simplify DD exclusion counting
Change-Id: I7004b6860fc0c21fc4d82378b4a86d29a94d9391
Christoph Junghans [Mon, 30 Sep 2019 23:46:46 +0000 (17:46 -0600)]
cmake: add missing header to legacy api
range.h is now needed by block.h
Change-Id: I372ddbe6475511d3e6e711e2f677792d568ac853
Pascal Merz [Tue, 1 Oct 2019 04:28:08 +0000 (22:28 -0600)]
Output correct kinetic at last step (modular simulator)
This replicates the fix in I9a0bc228 for the modular simulator.
Fixes a bug which would write an incorrect kinetic energy and
temperature to the energy and log files when using the leap-frog
integrator and having a last step not coinciding with an energy
calculation step.
Refs #2950
Change-Id: I9969fa8114240145d9aa84f381a898bbb7570b75
Mark Abraham [Tue, 21 May 2019 14:45:17 +0000 (16:45 +0200)]
Removed dependency on commrec of mdrun setup
Changes no functionality.
Setup is now parameterized directly on MPI_COMM_WORLD, which we will
want later for letting library-based callers pass in an
MPI_Communicator. This permits commrec to be initialized later, once
the threads have been spawned for the thread-MPI ranks.
The initialization of multi-simulations moves from LegacyMdrunOptions
to SimulationContext, which is more appropriate for
ensemble-parallelism established directly by the user.
Before the decision about the duty of a rank, there is no difference
between MASTER(cr) and SIMMASTER(cr), so several calls to macros
taking a t_commrec pointer are replaced by booleans. Introduced
findIsSimulationMasterRank to compute that value. This eliminates
early use of t_commrec that has necessitated other hacks and
workarounds.
Removed redundant check for replica exchange when the number of multi
simulations is less than two, because gmx_multisim_t constructor
already prohibits that.
Resolves several TODO items and improves modularity, too.
Refs #2587, #2605, #3081
Change-Id: I48bd3b713bc181b5c1e4cbcd648706a9f00eab96
Carsten Kutzner [Mon, 30 Sep 2019 12:28:29 +0000 (14:28 +0200)]
Move ForceProviders class into the gmx namespace
Since the C group kernels have been removed there is no need any more for
having ForceProviders as a struct outside the gmx namespace.
Change-Id: I2c91fbd06be289e3eb8acd74436d931cf3e994de
Mark Abraham [Mon, 30 Sep 2019 08:36:35 +0000 (10:36 +0200)]
Make a builder for DD
This creates the seam for task assignment to use the rank duty
assignment to choose GPU devices and construct resources like streams
before completing building the DD object with such resouces in place.
Used a pimpl class to keep the DD setup implementation details
private.
Change-Id: I6dbfe0122777bb529f8007386ff06b227e355263
Szilárd Páll [Mon, 30 Sep 2019 10:54:52 +0000 (12:54 +0200)]
Move PME GPU program building later
Moves the code closer to where it is needed and later during
initialization so even without a high-level manager, context between
nonbonded and PME could be be shared.
Change-Id: I47d9645dc0ee5574960964dfd3f79479ff21bcea
Berk Hess [Thu, 19 Sep 2019 14:42:07 +0000 (16:42 +0200)]
Remove charge group code from forcerec
Removed sevearal charge group members from t_forcerec.
Removed the cginfo intra-cg exclusion flags, as it is always true
for single atoms.
Removed loops over charge groups from init_cginfo_mb().
Change-Id: Ic91ea78dc341dc9972567a488294cb3d262ef9f6
Carsten Kutzner [Mon, 30 Sep 2019 12:56:18 +0000 (14:56 +0200)]
Corrected a few typos in documentation and comments
Change-Id: Ic697080a7c1f1a01bb8370563c1256990935d05e
Szilárd Páll [Tue, 10 Sep 2019 15:40:01 +0000 (17:40 +0200)]
Make the wait on PME GPU results conditional
When the PME forces are reduced on-GPU and no energy/virial output is
produced, we can avoid blocking waiting on the CPU for the PME GPU
taks to complete.
This however would break the timing accounting which needs to happen
after PME tasks completed. Hence the accounting is moved to the PME
output clearing.
Refs #3029, #2817
Change-Id: I4e7f3aa43754a187fe5d6b584803444967516958
Berk Hess [Sun, 29 Sep 2019 20:21:15 +0000 (22:21 +0200)]
Increase ti3p5 minimization test tolerance
This is needed because of larger differences when running
this test on multiple ranks.
Change-Id: I3056ae5933800e30e274791e8d27e2b8e79f6e04
Berk Hess [Sat, 28 Sep 2019 21:22:26 +0000 (23:22 +0200)]
Fix CG minimization with DD
A force for determining the CG direction was not communicated
correctly with domain decomposition to recent refactoring change
5ed943bc.
Fixes #3112
Change-Id: Ic33062f4aad0ccd7c1296c7351bc71d735ebba24
Artem Zhmurov [Fri, 27 Sep 2019 11:58:40 +0000 (13:58 +0200)]
Slight improvements to GPU update/constraints initialization
1. Assertions are updated to better correspond to the supported
conditions.
2. The message in the log now depends on whether or not there are
constraints in the system.
3. Redundant set(...)/setPbc(...) before the MD loop removed.
The getter for the total number of constraints is also added to
the Constraints class.
TODO: The assertions can be removed once the supported
functionality is expanded.
Change-Id: I96e2b993f79cf721f7aa48b9af0eab6500c593ba
Szilárd Páll [Fri, 27 Sep 2019 13:11:32 +0000 (15:11 +0200)]
Switch GPU update off by default
The code-path is untested and not fit for being on by default, so better
kept off until it becomes stable and better tested.
Change-Id: Ia651b0ae2f0f6751c13ea6857cdf6d176b83e34e
Artem Zhmurov [Thu, 26 Sep 2019 00:01:31 +0000 (02:01 +0200)]
Introduce stream management to GPU Update-Constraints
The GPU stream in the GPU versions of Leap Frog, LINCS and SETTLE
is now managed by the UpdateConstraints module and passed to the
members. This prepares Update-Constraints to be switched to
non-nullptr stream.
Change-Id: I95b9e4112874eb02ea646975760922ab31ce6b27
Berk Hess [Wed, 25 Sep 2019 09:19:31 +0000 (11:19 +0200)]
Extract gmx::Range
Added a range class for general use by extracting
gmx::RangePartinioning::Block to gmx::Range in range.h and renaming
and adding some methods.
Change-Id: Id9384c139d4daf1a31240e28333c9e9801c2dffc
Berk Hess [Fri, 27 Sep 2019 13:51:09 +0000 (15:51 +0200)]
Fix location of angle in vsite figure
The virtual site figure in the manual had an angle circle
in the wrong location (after shifting part of figure).
Fixes #3109
Change-Id: Ieb19485f231cff3e15bfd4158d64b82f7b69fac5
Mark Abraham [Fri, 27 Sep 2019 07:38:38 +0000 (09:38 +0200)]
Improve MiMiC test implementation
These tests were not using callGrompp in the intended way, and
inadvertently relying on behavior that might change when follow-up
work on #3081 changes mdrun thread-MPI initialization behavior
Change-Id: Icdbb6049a7b609ddaabc8e073f87e8bbb00da4f2
Mark Abraham [Wed, 25 Sep 2019 17:30:36 +0000 (19:30 +0200)]
Stop checking CUDA version reported by nvcc
We should trust FindCUDA.cmake to do its job (and not find headers
that don't match nvcc), and also prepare to use the native CUDA
support in CMake (where nvcc isn't used).
Removed unused GMX_CUDA_VERSION config variable
Change-Id: I8959c16c7e1247dc114bae818e0b867cf6b8ae71
Mark Abraham [Thu, 26 Sep 2019 17:54:20 +0000 (19:54 +0200)]
Fix gro file output with index groups
Fixes #3107
Change-Id: I3fc586c69066a354b3210d9616125ef666f1ce26
Mark Abraham [Thu, 26 Sep 2019 17:50:00 +0000 (19:50 +0200)]
Add tests for editconf file conversion with indexing
The indexed output to gro files illustrates bug #3107
Fixed two memory leaks necessary to let the tests pass
Refs #3107
Change-Id: Ie61430210ac8a804fb86783c8b76c41333b8d3cf
Mark Abraham [Tue, 13 Aug 2019 12:31:57 +0000 (14:31 +0200)]
Remove leftover support for pre-9.0 CUDA
Refs #2831
Change-Id: I7ec33bb3582006123e745d06da27c9eed12fbfc2
Berk Hess [Thu, 26 Sep 2019 21:26:33 +0000 (23:26 +0200)]
Made mdrun appending work again
Fix that mdrun would only append the log file and create new files
for all other file types.
Fixes #3108
Change-Id: I0fe517f4ce3f6630e589a65d106ca67bcb14765b
Paul Bauer [Wed, 25 Sep 2019 15:42:38 +0000 (17:42 +0200)]
Revert "Remove update flag again"
This reverts commit
85ef063c53f77a3423b2943d16d1d2f3759aa1bf.
Reason for revert: We want to have the user interface available again and tested.
Change-Id: I976531f37a9aaf2782b22f22653804ad0f303b95
Szilárd Páll [Wed, 25 Sep 2019 14:05:49 +0000 (16:05 +0200)]
Merge remote-tracking branch 'origin/release-2019'
Change-Id: Ia822fecb18b63d8a4e4408e056850a42875d57e8
Paul Bauer [Mon, 9 Sep 2019 09:04:37 +0000 (11:04 +0200)]
GROMACS 2020 first beta release
Updated regressiontest hash.
TODO branch 2020 from master and set correct regressiontest branch.
Change-Id: Ibe58dfbec933aa6166a7573d2d371614dbacb52f
Mark Abraham [Fri, 20 Sep 2019 16:55:32 +0000 (18:55 +0200)]
Fix log file flag output
Fixes #3099
Change-Id: I5049e8807b87c83959a0a2a5b3439b904d5edc8b
Paul Bauer [Tue, 24 Sep 2019 10:25:36 +0000 (12:25 +0200)]
Add test for noappend
New test covers behaviour where users always set the -noappend flag.
Also adds documentation for checkpoint header.
Change-Id: I012bb6d20eb297bb654cbddfe0c2530161fc902b
Mark Abraham [Tue, 24 Sep 2019 14:09:27 +0000 (16:09 +0200)]
Fix no-MPI CUDA build
Change-Id: I32407bf373acca24dd7250503ab78387fa6b8404
Mark Abraham [Tue, 24 Sep 2019 16:03:08 +0000 (18:03 +0200)]
Merge "Merge branch release-2019 into master"
Magnus Lundborg [Tue, 24 Sep 2019 09:43:44 +0000 (11:43 +0200)]
Add .part0001. to files from the first run with -noappend.
There was a bug where only the runs after the first got
.partxxxx. added when running with -noappend.
Fixes #3103
Change-Id: I36fddfca058216a50f9910c548b8a106bf460f7b
Paul Bauer [Mon, 23 Sep 2019 07:44:00 +0000 (09:44 +0200)]
Merge branch release-2019 into master
Resolved Conflicts:
cmake/gmxDetectCpu.cmake
src/gromacs/gmxpreprocess/topshake.cpp
src/gromacs/listed-forces/bonded.cpp
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
src/gromacs/mdlib/nbnxn_gpu.h
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
This does not include the change to the MPI_COMPILE flags handling,
as the code in master has been reorganized in a way that is incompatible
to that.
Change-Id: Idb1da69ce68f3121442859e8cbe24495c7894726
Paul Bauer [Fri, 14 Jun 2019 14:50:22 +0000 (16:50 +0200)]
Read in TPR char buffer as vector
Perform the I/O of the TPR char buffer as xdr_vector operation instead
of using single bytes.
Also use the xdr vector specialization for unsigned char and rvecs.
Refs #2971
Change-Id: I20534985fbdee8108792f676b3cb4264ab74c456
Mark Abraham [Tue, 24 Sep 2019 10:01:29 +0000 (12:01 +0200)]
Fix clang unused-function warnings
There are many places inline functions in headers are declared that
won't be used so we should suppress the clang warning about that.
Change-Id: I01c26f68473543007427e5baafc74eee966c0e68
Berk Hess [Thu, 19 Sep 2019 20:02:43 +0000 (22:02 +0200)]
Remove obsolete dd_get_ns_ranges()
Change-Id: Id64f2d51d6684cf4c22ebd770963cc69f7af087b
Paul Bauer [Tue, 17 Sep 2019 09:26:13 +0000 (11:26 +0200)]
Add release notes for modular simulator
Change-Id: I0f9081df842ce952ed40bf3844f7f2c10a59761c
Paul Bauer [Mon, 23 Sep 2019 12:09:17 +0000 (14:09 +0200)]
Fix issues when PME rank request becomes negative
Change-Id: I5f9888693983ed732c59a8fe62d596453b6a80dd
Berk Hess [Mon, 23 Sep 2019 11:33:21 +0000 (13:33 +0200)]
Limit Zen nbnxm kernel choice to Zen 1
Changed the Zen flag in gmx_hw_info_t to a Zen1 flag, so Zen 2,
and newer, is treated as a generic x86 AVX2 architecture.
Change-Id: I5a0fd73973416bbd8cd46422a6f22f1ad95d9924
Pascal Merz [Mon, 23 Sep 2019 00:16:44 +0000 (18:16 -0600)]
Parrinello-Rahman for md-vv
Change-Id: I3e49ad4d54fa9533e8a576661b0da3d6239bfd28
Pascal Merz [Sun, 22 Sep 2019 07:37:29 +0000 (01:37 -0600)]
Parrinello-Rahman barostat for modular simulator (leap-frog)
This introduces the Parrinello-Rahman barostat for the leap-frog
version of the modular simulator. Mirroring the implementation in
the legacy do_md, this does not support md-vv. Implementing the
pressure coupling requires the virial calculation to be synchronized
with the pressure coupling, so this is included in the energy
signaller.
As the new integrator framework is not used by default, this
patch adds equivalence tests for md Parrinello-Rahman pressure
coupling.
Change-Id: Iaadd78a3da1ee2b04978ab7c7a7caecbb03181e2
Paul Bauer [Fri, 14 Jun 2019 09:42:28 +0000 (11:42 +0200)]
Change MPI setup to communicate TPR as buffer
Changed the initial setup of nodes to communicate the full tpr file
buffer instead of using the individual calls for the fields.
Now non-master nodes receive the inputrec and mtop
and populate them themselves.
Refs #2971
Change-Id: Id4f3739a978ca507dacc45c78a8a75368cfe86fd
Pascal Merz [Sun, 22 Sep 2019 07:29:24 +0000 (01:29 -0600)]
Zero pressure and virial tensors at beginning of step
This sets pressure and virial tensors to zero when they are
accessed for the first time in a step. Not doing this does not
yield wrong behavior currently, but carries the risk of
hard-to-spot bugs moving forward.
Change-Id: I2553bd52fa56a497a61c31738ec4436f7f587ece
Pascal Merz [Mon, 23 Sep 2019 00:07:37 +0000 (18:07 -0600)]
Introduce FEP into modular simulator
This introduces free energy calculations in the modular simulator.
The lambda vector and the current FEP state are held by the
FreeEnergyPerturbationElement, offering access to its values via getter
functions. The FreeEnergyPerturbationElement does update the lambda
values during the simulation run if lambda is non-static. It does
implement the checkpointing client interface to save its current
state for restart.
Elements using the FEP getters include
* force
* shell/fc
* compute globals
* constraint element (only for initial constraining)
* state propagator data (only for trajectory writing)
The free energy itself is calculated by the energy element.
Change-Id: Iee12697a7ef54a490208fb1457528dc4368c5d5b
Christian Blau [Fri, 20 Sep 2019 09:50:33 +0000 (11:50 +0200)]
Grompp error for mismatching nst for energy calulation and densityfitting
When using multiple-time-stepping with density-guided simulations, the
energy evaluation frequency of the density-guided simulations must
match the "nstcalcenergy" option.
Change-Id: Ifcde8cada8a91540d69c9f91079bfc91c4415ba5
Christian Blau [Mon, 16 Sep 2019 08:49:11 +0000 (10:49 +0200)]
Amendments to density fitting manual section
- Fixed a sign error in the energy and force definition
- Added performance considerations
- Fixed whitespace
- Changed vector notation to mathbf as in the other parts of the manual
- Added pressure-coupling considerations
- Added considerations when using multiple-time-stepping
refs #2282
Change-Id: I8421ccf09ac960fa04508234e738967f51a27fab
Mark Abraham [Wed, 7 Aug 2019 13:03:51 +0000 (15:03 +0200)]
Fixes to broken CUDA compiler flags
Because FindCUDA.cmake is non-idiomatic CMake, recent changes to CUDA
compilation lost most of our custom compilation options for host code.
These are now restored.
Compilation options for build configurations deriving from the Release
build configuration are also restored.
Refs #3099
Change-Id: If030a256481faed425379dab00ea658e3c215867
Pascal Merz [Mon, 23 Sep 2019 00:04:57 +0000 (18:04 -0600)]
Make CheckpointHelper safer and easier to use
This commit improves the CheckpointHelper in two ways:
* Allow the vector of checkpoint helpers to contain nullptr. This
makes the building process easier. Moving forward, this could
be replaced by a builder.
* Reset the legacy t_state flags at every checkpointing step. This
makes sure that only relevant data is checkpointed, and avoids
hiding potential bugs.
Change-Id: I4f2a58f281d0f3d8b3819825df3c52850090d42b
Mark Abraham [Fri, 20 Sep 2019 15:50:08 +0000 (17:50 +0200)]
Fix 1D-1pulse support
Passed the correct rank count to the new checking function
Change-Id: Ib27ba5112a50894dbb0f1a2eb68bba53204270e3
Pascal Merz [Sun, 22 Sep 2019 22:51:46 +0000 (16:51 -0600)]
Fix vrescale thermostat integral (modular simulator)
The v-rescale thermostat was calculating the thermostat integral,
but this was neither written out nor saved into checkpoints. The
current commit fixes this.
Note that this is a good example of why the energy element needs
to become more modular - it should not need to know about the
details of other elements. This is a todo moving forward though,
not something we can solve immediately now.
Change-Id: I69541cb8ffa3c07e294e583f2c20423952e3ec01
Christoph Junghans [Thu, 19 Sep 2019 22:54:41 +0000 (16:54 -0600)]
workaround for rhel bug #
1749463, cmake bug #18349
MPI_C_COMPILE_FLAGS is a list instead of a string
see: https://gitlab.kitware.com/cmake/cmake/issues/18349
We mainly want to workaround this issue as RHEL 8 triggers it:
https://bugzilla.redhat.com/show_bug.cgi?id=
1749463
This issue is fixed in cmake-3.12.3
Change-Id: I14c1c0a4f33f26b128d55baa1b0455f8a463a999
Christian Blau [Fri, 13 Sep 2019 08:32:50 +0000 (10:32 +0200)]
Add cross-correlation as density simlarity measure
Add the canonical cross-correlation as similarity measure for densities
refs #2282
Change-Id: Idec820f38dab07c5ee8281944855a532a587a2ff
Paul Bauer [Fri, 20 Sep 2019 12:03:08 +0000 (14:03 +0200)]
Remove update flag again
Disables assignment of update task to different hardware and removes
user option.
Change-Id: I7780ac54f65809cbd91386a0d6a92b7bee35ab26
Berk Hess [Thu, 19 Sep 2019 15:50:54 +0000 (17:50 +0200)]
Remove cgs_gl from gmx_domdec_comm_t
This is no longer needed now we no longer support charge groups.
This reduced cache pressure, especially with energy minimization.
Change-Id: Ibf51fc4d70b929463f8a77a82cbe0316bdedeab2
Artem Zhmurov [Mon, 16 Sep 2019 14:23:48 +0000 (16:23 +0200)]
Disable GPU update/constraints when neither PME nor buffer ops are offloaded.
Using the GPU-version of update makes sense if forces are already on the GPU,
i.e. if at least:
1. PME is on the GPU (there should be a copy of coordinates on a GPU in rvec
format for PME spread).
2. Non-bonded interactions and buffer ops are on the GPU.
This is temporary solution, needed because the buffer ops offload switch is
operated by the environment variable. More favorable behavior would be to
switch on the GPU buffer ops in the second case rather then disabling the
GPU update.
Refs. #2816.
Change-Id: I37a9969dd6c74dcfa41a95da13ae54d014c9ea60
Berk Hess [Sat, 21 Sep 2019 09:36:32 +0000 (11:36 +0200)]
Fix incorrect shift forces for CMAP
The shift force indices were inverted for the second and third
atom in the CMAP term, leading to incorrect virial and pressure
contributions when these atoms resided in different periodic images.
Fixes #2845 and #2867
Change-Id: I1946a1d375d6c62e4e6d23ee25b92b42a3d4a6f7
Pascal Merz [Fri, 20 Sep 2019 21:01:04 +0000 (15:01 -0600)]
Fix restarts in modular simulator
The modular simulator constraint element was mistakenly performing
an initial constraiinng when restarting from checkpoints.
Change-Id: Icf310ff6d67fcd7f4b8aeb4f9da2749ad098a513
Pascal Merz [Fri, 20 Sep 2019 04:26:19 +0000 (22:26 -0600)]
Fix domdec for md-vv modular simulator
Domdec might have changed the local velocity vector after the state
object made a backup to restore after the first md-vv half step.
This change makes sure that the backup is updated if this happens.
Note that the half-step resetting will be eliminated in the course
of the transition to the modular simulator, but is currently kept
for backwards compatibility.
Change-Id: Ifb6346055a14d34a4efcae43b7b41399b1444bca
Berk Hess [Fri, 20 Sep 2019 14:22:02 +0000 (16:22 +0200)]
Fix DD 1 pulse checks without DLB
The check for requesting single pulse DD communication only
worked correctly without DLB.
Also added a check for 1 pulse with PME tuning.
Todo: PME tuned runs might still end up with multiple pulses
due to pressure scaling. This needs to be checked.
Fixes #3100
Change-Id: Icac5e37ef79385fd7c7cf5c19c7b40b2d685b95b
Mark Abraham [Thu, 19 Sep 2019 14:51:21 +0000 (16:51 +0200)]
Refactor to create a GpuTaskAssignments object
This change is purely reorganization, nothing is reordered or
functionality changed.
This expands on the previous vector of vectors of task assignments
into an object with the invariant of a completed assignment. It has
very complex construction logic, so it has a separate builder class
for the data that describes the decision about which GPUs are assigned
to tasks running on ranks on each physical node.
This refactoring prepares for re-ordering mdrun setup
so that the decision of rank duty by DD can lead to
task assignment, device initialization and the creation
of GPU contexts and streams with which to initialize
the various modules that use them to do their work.
Minor improvements to documentation and naming in a few places.
Change-Id: Idec71a3016212a4125b23b780e1059dbb134d7fb
Pascal Merz [Fri, 20 Sep 2019 04:59:59 +0000 (22:59 -0600)]
Run simulator equivalence tests in double precision only
The simulator equivalence tests are a great help in the effort of
rewriting the simulator framework, but might be too sensitive for
general use. They have been shown to be extremely sensitive to
order of operations which inevitably changes in day-by-day
development. Most recent test failures could be traced back to
the absence of a parenthesis in otherwise identical code (for
md-vv), and to the differences between the SIMD and non-SIMD
code paths (for md), respectively. Double precision builds seem to
be less affected by such re-ordering, so this commit changes the
simulator equivalence tests to be only enabled for double precision
builds. As the simulator rewriting progresses, and the new code paths
get covered by the existing tests, we might want to move away from
these type of equivalence tests altogether.
Change-Id: Ia4ad269959efd207242795ecedb88eaf7a870589
Berk Hess [Thu, 19 Sep 2019 13:00:13 +0000 (15:00 +0200)]
Remove bLocalCG from DD code
Replaced the use of bLocalCG in gmx_domdec_comm_t by ga2la,
which can be done since we no longer support charge groups.
Change-Id: I601e4a9c63e685b21f764fc99dc71c0080e84a43