From fdf42a519d4f72bcc6a0ceb2cd0fe1c8a3ba2fba Mon Sep 17 00:00:00 2001 From: ekarvou Date: Fri, 31 Oct 2025 20:39:15 +0200 Subject: [PATCH 1/6] Rename keyword argument only_ddpl to only_dppl and bump patch version --- .idea/.gitignore | 8 ++++++++ .idea/DynamicPPL.jl.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Project.toml | 2 +- ext/DynamicPPLJETExt.jl | 10 +++++----- src/experimental.jl | 10 +++++----- test/ext/DynamicPPLJETExt.jl | 2 +- 9 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/DynamicPPL.jl.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/DynamicPPL.jl.iml b/.idea/DynamicPPL.jl.iml new file mode 100644 index 000000000..d6ebd4805 --- /dev/null +++ b/.idea/DynamicPPL.jl.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..31e1ebce6 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..646c1a429 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Project.toml b/Project.toml index 0773bbe04..0ee50d493 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DynamicPPL" uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8" -version = "0.38.4" +version = "0.38.5" [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" diff --git a/ext/DynamicPPLJETExt.jl b/ext/DynamicPPLJETExt.jl index e0163bb35..cb35c5ffb 100644 --- a/ext/DynamicPPLJETExt.jl +++ b/ext/DynamicPPLJETExt.jl @@ -4,12 +4,12 @@ using DynamicPPL: DynamicPPL using JET: JET function DynamicPPL.Experimental.is_suitable_varinfo( - model::DynamicPPL.Model, varinfo::DynamicPPL.AbstractVarInfo; only_ddpl::Bool=true + model::DynamicPPL.Model, varinfo::DynamicPPL.AbstractVarInfo; only_dppl::Bool=true ) f, argtypes = DynamicPPL.DebugUtils.gen_evaluator_call_with_types(model, varinfo) # If specified, we only check errors originating somewhere in the DynamicPPL.jl. # This way we don't just fall back to untyped if the user's code is the issue. - result = if only_ddpl + result = if only_dppl JET.report_call(f, argtypes; target_modules=(JET.AnyFrameModule(DynamicPPL),)) else JET.report_call(f, argtypes) @@ -18,7 +18,7 @@ function DynamicPPL.Experimental.is_suitable_varinfo( end function DynamicPPL.Experimental._determine_varinfo_jet( - model::DynamicPPL.Model; only_ddpl::Bool=true + model::DynamicPPL.Model; only_dppl::Bool=true ) # Generate a typed varinfo to test model type stability with varinfo = DynamicPPL.typed_varinfo(model) @@ -26,7 +26,7 @@ function DynamicPPL.Experimental._determine_varinfo_jet( # Check type stability of evaluation (i.e. DefaultContext) model = DynamicPPL.setleafcontext(model, DynamicPPL.DefaultContext()) eval_issuccess, eval_result = DynamicPPL.Experimental.is_suitable_varinfo( - model, varinfo; only_ddpl + model, varinfo; only_dppl ) if !eval_issuccess @debug "Evaluation with typed varinfo failed with the following issues:" @@ -36,7 +36,7 @@ function DynamicPPL.Experimental._determine_varinfo_jet( # Check type stability of initialisation (i.e. InitContext) model = DynamicPPL.setleafcontext(model, DynamicPPL.InitContext()) init_issuccess, init_result = DynamicPPL.Experimental.is_suitable_varinfo( - model, varinfo; only_ddpl + model, varinfo; only_dppl ) if !init_issuccess @debug "Initialisation with typed varinfo failed with the following issues:" diff --git a/src/experimental.jl b/src/experimental.jl index 974912957..8c82dca68 100644 --- a/src/experimental.jl +++ b/src/experimental.jl @@ -16,7 +16,7 @@ Check if the `model` supports evaluation using the provided `varinfo`. - `varinfo`: The varinfo to verify the support for. # Keyword Arguments -- `only_ddpl`: If `true`, only consider error reports occuring in the tilde pipeline. Default: `true`. +- `only_dppl`: If `true`, only consider error reports occuring in the tilde pipeline. Default: `true`. # Returns - `issuccess`: `true` if the model supports the varinfo, otherwise `false`. @@ -28,7 +28,7 @@ function is_suitable_varinfo end function _determine_varinfo_jet end """ - determine_suitable_varinfo(model; only_ddpl::Bool=true) + determine_suitable_varinfo(model; only_dppl::Bool=true) Return a suitable varinfo for the given `model`. @@ -42,7 +42,7 @@ See also: [`DynamicPPL.Experimental.is_suitable_varinfo`](@ref). - `model`: The model for which to determine the varinfo. # Keyword Arguments -- `only_ddpl`: If `true`, only consider error reports within DynamicPPL.jl. +- `only_dppl`: If `true`, only consider error reports within DynamicPPL.jl. # Examples @@ -83,10 +83,10 @@ julia> vi isa typeof(DynamicPPL.typed_varinfo(model_with_static_support())) true ``` """ -function determine_suitable_varinfo(model::DynamicPPL.Model; only_ddpl::Bool=true) +function determine_suitable_varinfo(model::DynamicPPL.Model; only_dppl::Bool=true) # If JET.jl has been loaded, and thus `determine_varinfo` has been defined, we use that. return if Base.get_extension(DynamicPPL, :DynamicPPLJETExt) !== nothing - _determine_varinfo_jet(model; only_ddpl) + _determine_varinfo_jet(model; only_dppl) else # Warn the user. @warn "JET.jl is not loaded. Assumes the model is compatible with typed varinfo." diff --git a/test/ext/DynamicPPLJETExt.jl b/test/ext/DynamicPPLJETExt.jl index 8ed29e0c7..c74beefdb 100644 --- a/test/ext/DynamicPPLJETExt.jl +++ b/test/ext/DynamicPPLJETExt.jl @@ -56,7 +56,7 @@ DynamicPPL.NTVarInfo # Should fail if we're including errors in the model body. @test DynamicPPL.Experimental.determine_suitable_varinfo( - demo5(); only_ddpl=false + demo5(); only_dppl=false ) isa DynamicPPL.UntypedVarInfo end From 134c79aaa6944d5a5c07630c1d18ff65edfc74f3 Mon Sep 17 00:00:00 2001 From: ekarvou Date: Tue, 4 Nov 2025 21:06:23 +0200 Subject: [PATCH 2/6] Remove .idea files from repository --- .gitignore | Bin 68 -> 90 bytes .idea/.gitignore | 8 -------- .idea/DynamicPPL.jl.iml | 9 --------- .idea/misc.xml | 6 ------ .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 6 files changed, 37 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/DynamicPPL.jl.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 198907c73c41df7a292aa9f706a303b77cc56bf3..a10529cc0482a8d32d4ca60112db61f75d2827d2 100644 GIT binary patch literal 90 zcmdPW%gWKy(o4=S gy3)LqeBF|w)YLklN`_2^6oyoWL - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 31e1ebce6..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 646c1a429..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 573320b76e1afa5a5b03452ee961c4561988ce93 Mon Sep 17 00:00:00 2001 From: ekarvou Date: Tue, 4 Nov 2025 21:13:22 +0200 Subject: [PATCH 3/6] Update HISTORY.md with rename of only_ddpl to only_dppl --- HISTORY.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 4b8f5980e..9fc168033 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # DynamicPPL Changelog +## 0.38.5 +Renamed keyword argument `only_ddpl` to `only_dppl`. +Bumped patch version + ## 0.38.4 Improve performance of VarNamedVector. It should now be very nearly on par with Metadata for all models we've benchmarked on. From b3a27747c29d2e3d09f0a942c89f976f6b2c547f Mon Sep 17 00:00:00 2001 From: Markus Hauru Date: Wed, 5 Nov 2025 08:05:25 +0000 Subject: [PATCH 4/6] Stop tracking .gitignore --- .gitignore | Bin 90 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a10529cc0482a8d32d4ca60112db61f75d2827d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmdPW%gWKy(o4=S gy3)LqeBF|w)YLklN`_2^6oyoWL Date: Wed, 5 Nov 2025 08:06:06 +0000 Subject: [PATCH 5/6] Bump patch version to 0.38.6 --- HISTORY.md | 6 ++++-- Project.toml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 2aa8d1de2..fd3e1c106 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,8 +1,10 @@ # DynamicPPL Changelog +## 0.38.6 + +Renamed keyword argument `only_ddpl` to `only_dppl` for `Experimental.is_suitable_varinfo`. + ## 0.38.5 -Renamed keyword argument `only_ddpl` to `only_dppl`. -Bumped patch version Improve performance of VarNamedVector, mostly by changing how it handles contiguification. diff --git a/Project.toml b/Project.toml index 0ee50d493..8ced1d425 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DynamicPPL" uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8" -version = "0.38.5" +version = "0.38.6" [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" From 72cc65716b69e7629c9225d208e2f2715b9a07ab Mon Sep 17 00:00:00 2001 From: Markus Hauru Date: Wed, 5 Nov 2025 08:07:31 +0000 Subject: [PATCH 6/6] Restore .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..198907c73 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.jl.*.cov +*.jl.cov +*.jl.mem +.DS_Store +Manifest.toml +**.~undo-tree~