Skip to content
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

Update analyse_freenrg to use pymbar 4 #91

Merged
merged 3 commits into from
Aug 7, 2023

Conversation

fjclark
Copy link
Collaborator

@fjclark fjclark commented Jul 28, 2023

Is this pull request to fix a bug, or to introduce new functionality?

Since it was a quick fix, I've updated analyse_freenrg to use the pymbar 4 API. I tested on two sets of free energy data before and after the changes and got identical results.

  • I confirm that I have merged the latest version of devel into this branch before issuing this pull request (e.g. by running git pull origin devel): y
  • I confirm that I have added a changelog entry to the changelog (we will add a link to this PR as part of the review): y
  • I confirm that I have permission to release this code under the GPL3 license: y

Suggested reviewers:

@chryswoods, @lohedges

@fjclark fjclark temporarily deployed to sire-build July 28, 2023 12:59 — with GitHub Actions Inactive
@fjclark fjclark temporarily deployed to sire-build July 28, 2023 12:59 — with GitHub Actions Inactive
@fjclark fjclark temporarily deployed to sire-build July 28, 2023 12:59 — with GitHub Actions Inactive
@fjclark fjclark temporarily deployed to sire-build July 28, 2023 12:59 — with GitHub Actions Inactive
@fjclark fjclark temporarily deployed to sire-build July 28, 2023 12:59 — with GitHub Actions Inactive
chryswoods
chryswoods previously approved these changes Jul 29, 2023
Copy link
Contributor

@chryswoods chryswoods left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve of all of these changes. Thanks for updating the requirements_bss and try_import lines to the latest versions :-)

@chryswoods
Copy link
Contributor

@jmichel80 - is this something you are happy to merge? Do you want to run more tests? This is a change in functionality, so would go into 2023.4.0.dev for a development period, and would only be properly released and supported once 2023.4.0 is released at the end of September. I am aware though that this is close to the workshops...

@jmichel80
Copy link
Contributor

Could we support both pymbar versions easily for the time being ? The default would be pymbar 4 but it would make it possible to revert to using BSS in an environment with pymbar3 in case we run into issues.

@fjclark
Copy link
Collaborator Author

fjclark commented Aug 6, 2023

Could we support both pymbar versions easily for the time being ? The default would be pymbar 4 but it would make it possible to revert to using BSS in an environment with pymbar3 in case we run into issues.

@jmichel80 I've updated the code to be compatible with either version of pymbar. I've tested with pymbar greater than, and less than 4 on the same data (bound vanish leg of a MIF ABFE calculation) and got identical results.

@chryswoods
Copy link
Contributor

Thanks @fjclark - I've just merged in feature_align and it is going through GitHub Actions. Once that is done I will update this PR to match devel, and will then merge it in. Thanks for doing the work to port to both versions of pymbar simultaneously. This is super helpful and will make it much easier to build flexible conda packages of sire. I think this will enable us to drop pymbar as a dependency and use try_import to bring it in at runtime. The right version will be brought in based on the environment, or the user can pre-install the version they want (e.g. I suspect we will use the older version on the notebook server for the workshop, but will look to use a newer version later in the year).

@fjclark
Copy link
Collaborator Author

fjclark commented Aug 7, 2023

Great, thanks very much @chryswoods. No problem at all.

@chryswoods
Copy link
Contributor

Thanks - this will take a few hours to build. It should be in the devel binaries by tomorrow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants