Fix matrix trig functions for matrices of integers #24180
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stevengj
reviewed
Oct 17, 2017
base/linalg/dense.jl
Outdated
| @@ -718,14 +718,16 @@ function cos(A::AbstractMatrix{<:Real}) | |||
| if issymmetric(A) | |||
| return full(cos(Symmetric(A))) | |||
| end | |||
| return real(exp!(im*A)) | |||
| T = complex(float(eltype(A))) | |||
| return real(exp!(convert(AbstractArray{T}, im*A))) | |||
There was a problem hiding this comment.
If A is an integer array, this makes an extra copy. Maybe
real(exp!(Complex.(zero(float(eltype(A))), A))) # real(exp!(im*A)))
instead?
There was a problem hiding this comment.
Or T.(im .* A) should avoid the temporary as well.
stevengj
reviewed
Oct 17, 2017
base/linalg/dense.jl
Outdated
| X .= (X .+ exp!(-im*A)) ./ 2 | ||
| T = complex(float(eltype(A))) | ||
| X = exp!(convert(AbstractArray{T}, im*A)) | ||
| X .= (X .+ exp!(convert(AbstractArray{T}, -im*A))) ./ 2 |
There was a problem hiding this comment.
See above. T.(im .* A) and convert.(T, .- im .* A), maybe? Or
X = exp!(T.(im .* A))
@. X = (X + $exp!(T(-im*A))) / 2
if you want to reduce the number of dots in the second line
stevengj
reviewed
Oct 17, 2017
base/linalg/dense.jl
Outdated
| X = exp(A) | ||
| X .= (X .+ exp!(-A)) ./ 2 | ||
| X .= (X .+ exp!(convert(AbstractArray{T}, -A))) ./ 2 |
|
@stevengj Thanks a bunch for the review! So dotty. Took me a few days to get back to this, but I just pushed the changes. |
stevengj
approved these changes
Oct 23, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should not error because
exp!(::Matrix{<:Integer})is undefined anymore.