-
Notifications
You must be signed in to change notification settings - Fork 696
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
Parallelizes MDAnalysis.analysis.InterRDF
and MDAnalysis.analysis.InterRDF_s
#4884
base: develop
Are you sure you want to change the base?
Conversation
Hello @tanishy7777! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:
Comment last updated at 2025-01-20 20:35:32 UTC |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #4884 +/- ##
===========================================
- Coverage 93.42% 93.42% -0.01%
===========================================
Files 177 189 +12
Lines 21859 22950 +1091
Branches 3078 3080 +2
===========================================
+ Hits 20422 21440 +1018
- Misses 986 1059 +73
Partials 451 451 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
@tanishy7777 thanks for the prompt PR! I have some comments though:
Can we just sum it up separately though? I mean, make it a part of |
Got it! I have made |
when trying to make
I tried to find out why this is happening by looking at the result itself which is being aggregated along 'count' so the so I tried finding the dimensions of the arrays manually because it wasnt converting to a numpy array. so its not able to convert to a numpy array, because of inconsistent dimensions. I am not sure how to resolve this here |
based on the above comment #4884 (comment) I think we can mark because its not possible to convert array of inhomogenous dimensions to a numpy array and since Because after the self.results.count[i] / norm wont be possible as division is not supported between |
@tanishy7777 the class should be marked as non-parallelizable only if the algorithm to run it is not actually parallelizable, which I'm not yet convinced is the case for all the mentioned classes. But I think you're on the right path here, you just need to implement a custom aggregation function, instead of those implemented among Can you describe what kind of arrays you're trying to aggregate and can not find an appropriate function for? I didn't quite get it from your screenshots. |
it should be the same as if you'd run it without parallelization. And I assume you want to stack/sum/whatever along the dimension that corresponds to the timestep -- you can probably guess which one it is if you run it on some example with known number of frames. Example trajectories you can find in MDAnalysisTests. |
Got it. Will work on that! |
used a custom aggregator for
Thanks @marinegor for your help! |
analysis.rdf.InterRDF
and analysis.rdf.InterRDF_s
analysis.rdf.InterRDF
and analysis.rdf.InterRDF_s
MDAnalysis.InterRDF
and MDAnalysis.InterRDF_s
MDAnalysis.InterRDF
and MDAnalysis.InterRDF_s
MDAnalysis.analysis.InterRDF
and MDAnalysis.analysis.InterRDF_s
@orbeckst @RMeli @marinegor I think this is ready to be merged, can you please review it? |
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.
hi @tanishy7777, sorry for the long review (again).
good work, thanks for your contribution! I've added my comments, main action points below:
- move your custom aggregation function from the class to a standalone function, name appropriately and test
- revert changes to
test_xds.py
andcore/selection.py
(I'm guessing they were introduced byblack
or smth) - make sure you don't need to track
self.volume_cum
, since you're trackingself.results.volume_cum
and assigningself.volume_cum
in_conclude
. I made suggestions regarding that but might have missed something; please make sure until_conclude
onlyself.results.volume_cum
is used.
package/MDAnalysis/analysis/rdf.py
Outdated
def func(arrs): | ||
r"""Custom aggregator for nested arrays |
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.
please make it a separate function since it's not really needed for the class to function, and also to avoid potential issues with serialization that class methods (even static) sometimes have
and change the name to something more descriptive, e.g. nested_array_sum
, that reflects the nature of the function.
finally, this function must be tested in test_rdf.py
package/MDAnalysis/core/selection.py
Outdated
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.
revert it back to the original state since this change is not related to the PR. you can just commit on top to make this change disappear, that's fine.
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.
revert it back to the original state since this change is not related to the PR. you can just commit on top to make this change disappear, that's fine.
Co-authored-by: Egor Marin <[email protected]>
Sorry for the late reply. I will get to work on these changes! I had semester examinations so was quite busy the last 2 weeks. |
Fixes #4675
Changes made in this Pull Request:
rdf.InterRDF
andrdf.InterRDF_s
TLDR: of the comments below: Initially I thought
rdf
isnt parallizable but turns out both classes inrdf
can be parallelized.PR Checklist
Developers certificate of origin
📚 Documentation preview 📚: https://mdanalysis--4884.org.readthedocs.build/en/4884/