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.

Sign up for GitHub

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

Mark Sampling context as not needing derivatives #556

Merged
merged 5 commits into from
Nov 21, 2023
Merged

Mark Sampling context as not needing derivatives #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1d1b35
Mark Sampling context as not needing derivatives
wsmoses Nov 8, 2023
9158c3e
Mark Sampling context as not needing derivatives
wsmoses Nov 8, 2023
8ac0f04
Fix format
devmotion Nov 21, 2023
80a18b2
Fix Project.toml
devmotion Nov 21, 2023
b3a3757
Qualify SamplingContext
devmotion Nov 21, 2023
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
4 changes: 4 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"

[weakdeps]
MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"

[extensions]
DynamicPPLMCMCChainsExt = ["MCMCChains"]
DynamicPPLEnzymeCoreExt = ["EnzymeCore"]

[compat]
AbstractMCMC = "5"
Expand All @@ -38,6 +40,7 @@ Compat = "4"
ConstructionBase = "1.5.4"
Distributions = "0.25"
DocStringExtensions = "0.9"
EnzymeCore = "0.6"
LogDensityProblems = "2"
MCMCChains = "6"
MacroTools = "0.5.6"
Expand All @@ -52,3 +55,4 @@ julia = "1.6"

[extras]
MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
13 changes: 13 additions & 0 deletions ext/DynamicPPLEnzymeCoreExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module DynamicPPLEnzymeCoreExt

if isdefined(Base, :get_extension)
using DynamicPPL: DynamicPPL
using EnzymeCore
else
using ..DynamicPPL: DynamicPPL
using ..EnzymeCore
end

@inline EnzymeCore.EnzymeRules.inactive_type(::Type{<:DynamicPPL.SamplingContext}) = true

end
3 changes: 3 additions & 0 deletions src/DynamicPPL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@
@require MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d" include(
"../ext/DynamicPPLMCMCChainsExt.jl"
)
@require EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" include(

Check warning on line 192 in src/DynamicPPL.jl

View check run for this annotation

Codecov / codecov/patch

src/DynamicPPL.jl#L192 

Added line #L192 was not covered by tests
"../ext/DynamicPPLEnzymeCoreExt.jl"
)
end
end

Expand Down
1 change: 1 addition & 0 deletions test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
DistributionsAD = "ced4e74d-a319-5a8a-b0ac-84af2272839c"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LogDensityProblems = "6fdf6af0-433a-55f7-b3ed-c6c6e0b8df7c"
Expand Down
3 changes: 3 additions & 0 deletions test/contexts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ using DynamicPPL:
hasconditioned_nested,
getconditioned_nested

using EnzymeCore

# Dummy context to test nested behaviors.
struct ParentContext{C<:AbstractContext} <: AbstractContext
context::C
Expand Down Expand Up @@ -252,6 +254,7 @@ end
@test SamplingContext(Random.default_rng(), DefaultContext()) == context
@test SamplingContext(SampleFromPrior(), DefaultContext()) == context
@test SamplingContext(SampleFromPrior(), DefaultContext()) == context
@test EnzymeCore.EnzymeRules.inactive_type(typeof(context))
end

@testset "FixedContext" begin
Expand Down
Loading