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

matmul: don't assume the existence of type-conversions #14618

Merged
merged 2 commits into from
Jan 9, 2016

Conversation

timholy
Copy link
Member

@timholy timholy commented Jan 9, 2016

(cherry picked from commit 709c867)

This is a backport of #14293 that doesn't rely on #13803. It loses the ability to do A*B, but it works with A_mul_B!(C, A, B). CC @tkelman, note this is against your tk/backports-0.4.3 branch.

In retrospect, in the tests I realize I should have (for mathematical obviousness) named RootInt something like PureImaginary, as a more familiar example of a type of number where !isa(::T * ::T, ::T) and for which the conversion to T cannot be defined.

@tkelman
Copy link
Contributor

tkelman commented Jan 9, 2016

okay, may as well also put the conflict-resolved cherry pick of #14372 in here too

(cherry picked from commit 2c53437)
@timholy
Copy link
Member Author

timholy commented Jan 9, 2016

Done.

@tkelman
Copy link
Contributor

tkelman commented Jan 9, 2016

travis failure was a caching hiccup, pr's against non master or release confuse the caching a bit. merging so travis and appveyor run on it in the other pr.

tkelman added a commit that referenced this pull request Jan 9, 2016
matmul: don't assume the existence of type-conversions
@tkelman tkelman merged commit bc35739 into tk/backports-0.4.3 Jan 9, 2016
@tkelman tkelman deleted the teh/backport_14293 branch January 9, 2016 21:57
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.

2 participants