Skip to content
This repository has been archived by the owner on Nov 28, 2023. It is now read-only.

added some utility codes #87

Merged
merged 35 commits into from
Aug 12, 2019
Merged

added some utility codes #87

merged 35 commits into from
Aug 12, 2019

Conversation

LilySnow
Copy link
Contributor

  1. plot_utils.py: for plotting success rate and hit rate averaging over cases. compare with haddock scores.
  2. run_slurmFLs.py: submit slurm jobs by batches (one batch waiting for the first N batches to finish). Each job uses M cores in parallel.
  3. get_h5subset.py: extract a subset of docked models from one hdf5 to form a small test set.

@coveralls
Copy link

coveralls commented Jul 16, 2019

Pull Request Test Coverage Report for Build 509

  • 29 of 52 (55.77%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.4%) to 75.418%

Changes Missing Coverage Covered Lines Changed/Added Lines %
deeprank/utils/cal_hitrate_successrate.py 29 52 55.77%
Totals Coverage Status
Change from base Build 461: -0.4%
Covered Lines: 2209
Relevant Lines: 2929

💛 - Coveralls

@LilySnow
Copy link
Contributor Author

Tried to use from shlex import split to solve the subprocess security issue. But "Codacy/PR Quality Review" still complains about subprocess...

@CunliangGeng CunliangGeng moved this from To do to In progress in Code Improvements Jul 25, 2019
Copy link
Member

@CunliangGeng CunliangGeng left a comment

Choose a reason for hiding this comment

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

Most of the utility codes are only used by ourselves on very specific tasks, e.g. comparison with Haddock. And thus these code are much less interesting and useful to general users. I suggest we create an independent repo for them.

@@ -0,0 +1,32 @@
#!/usr/bin/env python
Copy link
Member

Choose a reason for hiding this comment

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

I will replace count_hits.py with my code for checking statistics including hits, which is more general.

@@ -0,0 +1,31 @@
#!/usr/bin/env python
Copy link
Member

Choose a reason for hiding this comment

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

Will be updated to be able to extract not only 5 but first N models.

@@ -0,0 +1,31 @@
#!/usr/bin/env python
Copy link
Member

Choose a reason for hiding this comment

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

Will be deleted. It is same as get_h5subset.py.

@@ -0,0 +1,64 @@
import unittest
from deeprank.utils.plot_utils import evaluate
Copy link
Member

Choose a reason for hiding this comment

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

CI failed due to the R_HOME problem from rpy2 package, but the tests passed locally. Could move the utility code to a new repo for only in-house using, considering these code are non-generic.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

rpy2 is not needed in unittest. Too many repos already ... At the current stage, we are the major users of deeprank.

@@ -0,0 +1,169 @@
import numpy as np
Copy link
Member

Choose a reason for hiding this comment

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

Extract the calculation of hit/success rate from plot_utils to this new file, which could avoid CI failure due to the import of rpy2 module.

@CunliangGeng CunliangGeng moved this from In progress to In review in Code Improvements Aug 2, 2019
@CunliangGeng CunliangGeng merged commit fb2e2c2 into development Aug 12, 2019
Code Improvements automation moved this from In review to Done Aug 12, 2019
@CunliangGeng CunliangGeng deleted the successrate branch August 12, 2019 13:57
@CunliangGeng CunliangGeng restored the successrate branch August 26, 2019 15:51
@CunliangGeng CunliangGeng deleted the successrate branch August 26, 2019 15:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants