-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #71 from huanglangwen/tridiagonal-diff
add colored diff support for (tri/bi-)diagonal matrices
- Loading branch information
Showing
8 changed files
with
371 additions
and
183 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| import Base.Broadcast: _broadcast_getindex, preprocess, preprocess_args, Broadcasted, broadcast_unalias, combine_axes, broadcast_axes, broadcast_shape, check_broadcast_axes, check_broadcast_shape, throwdm, broadcastable, AbstractArrayStyle, DefaultArrayStyle | ||
| import Base: copyto!, tail, axes, length, ndims | ||
| struct DiffBC{T} | ||
| x::T | ||
| end | ||
| @inline axes(b::DiffBC) = axes(b.x) | ||
| @inline length(b::DiffBC) = length(b.x) | ||
| @inline broadcastable(b::DiffBC) = b | ||
| @inline Base.ndims(b::Type{DiffBC{T}}) where T = ndims(T) | ||
| Base.@propagate_inbounds _broadcast_getindex(b::DiffBC, i) = _broadcast_getindex(b.x, i) | ||
| Base.@propagate_inbounds _broadcast_getindex(b::DiffBC{<:AbstractArray{<:Any,0}}, i) = b.x[] | ||
| Base.@propagate_inbounds _broadcast_getindex(b::DiffBC{<:AbstractVector}, i) = b.x[i[1]] | ||
| Base.@propagate_inbounds _broadcast_getindex(b::DiffBC{<:AbstractArray}, i) = b.x[i] | ||
| diffbc(x::Array) = DiffBC(x) | ||
| diffbc(x) = x | ||
|
|
||
| # Ensure inlining | ||
| @inline combine_axes(A, B) = broadcast_shape(broadcast_axes(A), broadcast_axes(B)) # Julia 1.0 compatible | ||
| @inline check_broadcast_axes(shp, A::Union{Number, Array, Broadcasted}) = check_broadcast_shape(shp, axes(A)) | ||
|
|
||
| @inline preprocess(f, dest, bc::Broadcasted{Style}) where {Style} = Broadcasted{Style}(bc.f, preprocess_args(f, dest, bc.args), bc.axes) | ||
| preprocess(f, dest, x) = f(broadcast_unalias(dest, x)) | ||
|
|
||
| @inline preprocess_args(f, dest, args::Tuple) = (preprocess(f, dest, args[1]), preprocess_args(f, dest, tail(args))...) | ||
| @inline preprocess_args(f, dest, args::Tuple{Any}) = (preprocess(f, dest, args[1]),) | ||
| preprocess_args(f, dest, args::Tuple{}) = () | ||
|
|
||
| # Performance optimization for the common identity scalar case: dest .= val | ||
| @inline copyto!(dest::DiffBC, bc::Broadcasted{<:AbstractArrayStyle{0}}) = copyto!(dest.x, bc) | ||
| @inline function copyto!(dest::DiffBC, bc::Broadcasted) | ||
| axes(dest) == axes(bc) || throwdm(axes(dest), axes(bc)) | ||
| dest′ = dest.x | ||
| # Performance optimization: broadcast!(identity, dest, A) is equivalent to copyto!(dest, A) if indices match | ||
| if bc.f === identity && bc.args isa Tuple{AbstractArray} # only a single input argument to broadcast! | ||
| A = bc.args[1] | ||
| if axes(dest) == axes(A) | ||
| return copyto!(dest′, A) | ||
| end | ||
| end | ||
| bcs′ = preprocess(diffbc, dest, bc) | ||
| @simd ivdep for I in eachindex(bcs′) | ||
| @inbounds dest′[I] = bcs′[I] | ||
| end | ||
| return dest′ # return the original array without the wrapper | ||
| end | ||
|
|
||
| # Forcing `broadcasted` to inline is not necessary, since `Vern9` plays well | ||
| # with the Base implementation, and `Feagin`s do not use broadcasting. | ||
| # | ||
| #import Base.Broadcast: broadcasted, combine_styles | ||
| #map_nostop(f, t::Tuple{}) = () | ||
| #map_nostop(f, t::Tuple{Any,}) = (f(t[1]),) | ||
| #map_nostop(f, t::Tuple{Any, Any}) = (f(t[1]), f(t[2])) | ||
| #map_nostop(f, t::Tuple{Any, Any, Any}) = (f(t[1]), f(t[2]), f(t[3])) | ||
| #map_nostop(f, t::Tuple) = (Base.@_inline_meta; (f(t[1]), map_nostop(f,tail(t))...)) | ||
| #@inline function broadcasted(f::Union{typeof(*), typeof(+), typeof(muladd)}, arg1, arg2, args...) | ||
| # arg1′ = broadcastable(arg1) | ||
| # arg2′ = broadcastable(arg2) | ||
| # args′ = map_nostop(broadcastable, args) | ||
| # broadcasted(combine_styles(arg1′, arg2′, args′...), f, arg1′, arg2′, args′...) | ||
| #end | ||
|
|
||
| macro ..(x) | ||
| expr = Base.Broadcast.__dot__(x) | ||
| if expr.head in (:(.=), :(.+=), :(.-=), :(.*=), :(./=), :(.\=), :(.^=)) # we exclude `÷=` `%=` `&=` `|=` `⊻=` `>>>=` `>>=` `<<=` because they are for integers | ||
| name = gensym() | ||
| dest = :(DiffEqDiffTools.diffbc($(expr.args[1]))) | ||
| expr.args[1] = name | ||
| return esc(quote | ||
| $name = $dest | ||
| $expr | ||
| end) | ||
| else | ||
| return esc(expr) | ||
| end | ||
| end |
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
Oops, something went wrong.