-
Notifications
You must be signed in to change notification settings - Fork 653
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ENH: support tpx 133 (GMX 2024.1) #4523
Conversation
* One of my postdocs (Emvia) needs parsing of newer `.tpr` files to work; we actually are using tpx version `130` internally, but that wasn't from a stable release, so I just went for `2024.1` and presumbly we can just use `convert-tpr` to "up-version" to the stable release version. * This patch used `convert-tpr` with GMX `2024.1` to mimic Jonathan's changes from MDAnalysisgh-4052, when we last bumped `tpx` version. The full testsuite passed for me locally at least, so maybe we'll be lucky enough to have another simple bump. * Note that I did not update the documentation or the `CHANGELOG`, fell free to push that in here if you're confident of the various tpx generation things, etc.
Hello @tylerjereddy! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:
Comment last updated at 2024-03-25 22:24:16 UTC |
Linter Bot Results:Hi @tylerjereddy! Thanks for making this PR. We linted your code and found the following: Some issues were found with the formatting of your code.
Please have a look at the Please note: The |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #4523 +/- ##
===========================================
- Coverage 93.65% 93.63% -0.03%
===========================================
Files 168 180 +12
Lines 21215 22294 +1079
Branches 3908 3908
===========================================
+ Hits 19869 20875 +1006
- Misses 888 961 +73
Partials 458 458 ☔ View full report in Codecov by Sentry. |
Thanks for working on this @tylerjereddy - I was also looking at this a few weeks back (got as far as John telling me to use convert-tpr 😅) and got distracted, I'll try to give it a review as soon as possible. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the test files are TPR 133 and all tests pass then that looks good enough for me.
We'd just need the docs + CHANGELOG. Could you quickly add those in, please?
I pushed in what I could, but as I noted above, I don't know how to find out the |
@tylerjereddy if I remember correctly this is the enum class that gets used for the generation: https://gitlab.com/gromacs/gromacs/-/blob/main/src/gromacs/fileio/tpxio.cpp?ref_type=heads#L190 Should still be 28 I think? (sorry it's late and I'm not in a C++ frame of mind) |
Just briefly putting this here because it's something @jbarnoud mentioned in a DM but I didn't get a chance to dig into it - apparently there are (edit: ITP?) input files for "all bonded" and "virtual sites" TPR tests somewhere that might need adding too? |
pretty sure I did that in the diff already, I'll see if I can dig up the obscure generation thing |
🤦🏾♂️ Sorry I'm not paying attention - I saw the dummy one but somehow my brain just ignored it completely |
* add `CHANGELOG` and TPR docs updates
f43b047
to
26098bb
Compare
@@ -66,6 +66,7 @@ | |||
122 28 2021 yes | |||
127 28 2022 yes | |||
129 28 2023 yes | |||
133 28 2024.1 yes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I added the generation as 28
based on a fresh compilation of GROMACS 2024.1
with this adjustment:
--- a/src/gromacs/fileio/tpxio.cpp
+++ b/src/gromacs/fileio/tpxio.cpp
@@ -1034,6 +1034,7 @@ static void do_inputrec(gmx::ISerializer* serializer, t_inputrec* ir, int file_v
ir->tpxFileVersion = file_version;
+ fprintf(stderr, "****** Note: tpx_generation %d\n", tpx_generation);
if (file_version != tpx_version)
{
/* Give a warning about features that are not accessible */
Then used one of the .tpr
files here as follows:
gmx mdrun -s dummy_2024.tpr
which includes in its output:
<snip>
Reading file dummy_2024.tpr, VERSION 2024.1-spack (single precision)
****** Note: tpx_generation 28
****** Note: tpx_generation 28
<snip>
One of my postdocs (Emvia) needs parsing of newer
.tpr
files to work; we actually are using tpx version130
internally, but that wasn't from a stable release, so I just went for2024.1
and presumbly we can just useconvert-tpr
to "up-version" to the stable release version internally.This patch used
convert-tpr
with GMX2024.1
to mimic Jonathan's changes from Support TPR files produced by gromacs 2023 #4052, when we last bumpedtpx
version. The full testsuite passed for me locally at least, so maybe we'll be lucky enough to have another simple bump.Note that I did not update the documentation or the
CHANGELOG
, fell free to push that in here if you're confident of the various tpx generation things, etc.PR Checklist
Developers certificate of origin
📚 Documentation preview 📚: https://mdanalysis--4523.org.readthedocs.build/en/4523/