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

fixed check_space_for_hashtable to use args.n_tables #382

Merged
merged 1 commit into from
Apr 16, 2014

Conversation

ctb
Copy link
Member

@ctb ctb commented Apr 11, 2014

Fixes bug where table size was calculated based on args.ksize instead of args.n_tables. Important bug to fix for some cloud computing systems w/limited disk space.

@ctb
Copy link
Member Author

ctb commented Apr 11, 2014

  • Is it mergable
  • Did it pass the tests?
  • If it introduces new functionality in scripts/ is it tested?
    Check for code coverage.
  • Is it well formatted? Look at pep8/pylint, cppcheck, and
    make doc output. Use autopep8 and astyle -A10 if needed.
  • Is it documented in the Changelog?

@ctb
Copy link
Member Author

ctb commented Apr 11, 2014

Fixes #380.

@ctb
Copy link
Member Author

ctb commented Apr 11, 2014

Ready for review, if tests pass.

@ged-jenkins
Copy link

Test FAILed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/477/

@ctb
Copy link
Member Author

ctb commented Apr 13, 2014

test this please.

@ged-jenkins
Copy link

Test PASSed.
Refer to this link for build results: http://ci.ged.msu.edu/job/khmer-multi-pullrequest/479/

@ctb
Copy link
Member Author

ctb commented Apr 13, 2014

ready for review.

@@ -53,7 +53,7 @@ def main():
check_file_status(_)

check_space(args.input_filenames)
check_space_for_hashtable(args.ksize * args.min_tablesize)
check_space_for_hashtable(float(args.n_tables * args.min_tablesize) / 8.)
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we define these arguments to be type float to avoid the need for this (and future potential bugs)?

Copy link
Member Author

Choose a reason for hiding this comment

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

On Sun, Apr 13, 2014 at 11:58:32AM -0700, Michael R. Crusoe wrote:

@@ -53,7 +53,7 @@ def main():
check_file_status(_)

 check_space(args.input_filenames)
  • check_space_for_hashtable(args.ksize * args.min_tablesize)
  • check_space_for_hashtable(float(args.n_tables * args.min_tablesize) / 8.)

Should we define these arguments to be type float to avoid the need for this (and future potential bugs)?

I don't think it's necessary, I guess. I could go either way. Any points
of evidence that this is needed? I can't think of anywhere else this is
done.

--t

C. Titus Brown, ctb@msu.edu

@ctb
Copy link
Member Author

ctb commented Apr 16, 2014

I've added an issue re improving the test coverage.

mr-c added a commit that referenced this pull request Apr 16, 2014
…wrong

fixed check_space_for_hashtable to use args.n_tables
@mr-c mr-c merged commit 2c43bdb into master Apr 16, 2014
@mr-c mr-c deleted the bug/hashtable_size_calculations_wrong branch April 16, 2014 21:34
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