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

Add Numba jit version of scipy.special.comb #377

Merged
merged 2 commits into from
Jan 4, 2018
Merged

Add Numba jit version of scipy.special.comb #377

merged 2 commits into from
Jan 4, 2018

Conversation

oyamad
Copy link
Member

@oyamad oyamad commented Dec 28, 2017

  1. Add comb_jit, Numba jit version of scipy.special.comb
    Returns 0 if the outcome exceeds the maximum value of np.intp
  2. Add num_compositions_jit which uses comb_jit
  3. Compile simplex_grid in nopython mode using num_compositions_jit

@oyamad oyamad added the ready label Dec 28, 2017
@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 94.836% when pulling 276df50 on comb_jit into 296e595 on master.

@mmcky
Copy link
Contributor

mmcky commented Jan 2, 2018

thanks @oyamad. Sorry I have been off grid for a couple of weeks. I will merge this later today.

@oyamad
Copy link
Member Author

oyamad commented Jan 2, 2018

@mmcky No problem at all!
(Upon merge, it would be nice if you merge the commits as they are without squashing; these commits are logically separate.)

@mmcky
Copy link
Contributor

mmcky commented Jan 2, 2018

Thanks @oyamad for letting me know re: squash. Does this PR rely on #375 to be merged first?

@oyamad
Copy link
Member Author

oyamad commented Jan 3, 2018

@mmcky These PRs are independent. Either PR can be merged first.

@mmcky
Copy link
Contributor

mmcky commented Jan 4, 2018

@oyamad when you get a chance would you mind reviewing this merge conflict. Thanks.

oyamad added 2 commits January 4, 2018 09:26
Numba jit version of scipy.special.comb
Using num_compositions_jit which uses comb_jit
@oyamad
Copy link
Member Author

oyamad commented Jan 4, 2018

@mmcky Rebased on master. Thanks.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 94.843% when pulling 0c35d78 on comb_jit into 828aaf2 on master.

@mmcky mmcky merged commit 475650b into master Jan 4, 2018
@mmcky mmcky deleted the comb_jit branch January 4, 2018 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants