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

Addressing performance issues with broadcasting #230

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"

[compat]
Expand All @@ -36,5 +37,6 @@ SpecialFunctions = "0.8, 0.9, 0.10, 1, 2"
StaticArrays = "0.12, 1.0"
StatsBase = "0.32, 0.33"
StatsFuns = "0.9.10, 1"
StructArrays = "0.6"
ZygoteRules = "0.2"
julia = "1.6"
1 change: 1 addition & 0 deletions src/DistributionsAD.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ using PDMats,
FillArrays,
Adapt

using StructArrays: StructArrays
using SpecialFunctions: logabsgamma, digamma
using LinearAlgebra: copytri!, AbstractTriangular
using Distributions: AbstractMvLogNormal,
Expand Down
42 changes: 42 additions & 0 deletions src/arraydist.jl
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,45 @@ function Distributions.rand(rng::Random.AbstractRNG, dist::VectorOfMultivariate)
init = reshape(rand(rng, dist.dists[1]), :, 1)
return mapreduce(Base.Fix1(rand, rng), hcat, view(dist.dists, 2:length(dist)); init = init)
end

# Lazy array dist
# HACK: Constructor which doesn't enforce the schema.
"""
StructArrayNoSchema(::Type{T}, cols::C) where {T, C<:StructArrays.Tup}

Construct a `StructArray` without enforcing the schema of `T`.

This is useful in scenarios where there's a mismatch between the constructor of `T`
and the `fieldnames(T)`.

# Examples
```jldoctest
julia> using StructArrays, Distributions

julia> # `Normal` has two fields `μ` and `σ`, but here we only provide `μ`.
StructArrayNoSchema(Normal, (zeros(2),))
2-element StructArray(::Vector{Float64}) with eltype Normal:
Normal{Float64}(μ=0.0, σ=1.0)
Normal{Float64}(μ=0.0, σ=1.0)

julia> # This is not allowed by `StructArray`:
StructArray{Normal}((zeros(2),))
ERROR: NamedTuple names and field types must have matching lengths
[...]
```
"""
function StructArrayNoSchema(::Type{T}, cols::C) where {T, C<:StructArrays.Tup}
N = isempty(cols) ? 1 : ndims(cols[1])
StructArrays.StructArray{T, N, typeof(cols)}(cols)
end


arraydist(D::Type, args...) = arraydist(D, args)
arraydist(D::Type, args::Tuple) = arraydist(StructArrayNoSchema(D, args))

make_logpdf_closure(::Type{D}) where {D} = (x, args...) -> logpdf(D(args...), x)

function Distributions.logpdf(dist::Product{<:Any,D,<:StructArrays.StructArray}, x::AbstractVector{<:Real}) where {D}
Copy link
Member

Choose a reason for hiding this comment

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

Product is deprecated.

f = make_logpdf_closure(D)
return sum(f.(x, StructArrays.components(dist.v)...))
end