Skip to content

Commit

Permalink
Merge pull request #149 from biaslab/dev-matrix-correction-tools
Browse files Browse the repository at this point in the history
Update for the new version of ReactiveMP
  • Loading branch information
bvdmitri authored Sep 27, 2023
2 parents d16cfb5 + 06ab0b8 commit 4aaab0b
Show file tree
Hide file tree
Showing 6 changed files with 2,589 additions and 1,628 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ examples_init:

dev_examples_init:
$(RM) $(EXAMPLES_MANIFEST_FILE)
julia --startup-file=no --project=examples/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "ReactiveMP.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "GraphPPL.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "Rocket.jl"))); Pkg.update(); Pkg.precompile();'
julia --startup-file=no --project=examples/ -e 'using Pkg; Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "ReactiveMP.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "GraphPPL.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "Rocket.jl"))); Pkg.develop(PackageSpec(path=pwd())); Pkg.update(); Pkg.precompile();'

examples: scripts_init examples_init ## Precompile examples and put them in the `docs/src/examples` folder (use specific="<pattern>" to compile a specific example)
julia --startup-file=no --project=scripts/ scripts/examples.jl $(specific)
Expand All @@ -57,7 +57,7 @@ doc_init:

dev_doc_init:
$(RM) $(EXAMPLES_MANIFEST_FILE)
julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "ReactiveMP.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "GraphPPL.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "Rocket.jl"))); Pkg.update(); Pkg.precompile();'
julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "ReactiveMP.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "GraphPPL.jl"))); Pkg.develop(PackageSpec(path=joinpath(Pkg.devdir(), "Rocket.jl"))); Pkg.develop(PackageSpec(path=pwd())); Pkg.update(); Pkg.precompile();'

docs: doc_init ## Generate documentation
julia --startup-file=no --project=docs/ docs/make.jl
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "RxInfer"
uuid = "86711068-29c9-4ff7-b620-ae75d7495b3d"
authors = ["Bagaev Dmitry <[email protected]> and contributors"]
# Do not forget to update the version in the `codemeta.json` too
version = "2.12.0"
version = "2.13.0"

[deps]
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Expand All @@ -27,7 +27,7 @@ GraphPPL = "3.1.0"
MacroTools = "0.5.6"
Optim = "1.0.0"
ProgressMeter = "1.0.0"
ReactiveMP = "~3.10.0"
ReactiveMP = "~3.11.0"
Reexport = "1.2.0"
Rocket = "1.7.0"
TupleTools = "1.2.0"
Expand Down
4 changes: 2 additions & 2 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"downloadUrl": "https://github.com/biaslab/RxInfer.jl/releases",
"issueTracker": "https://github.com/biaslab/RxInfer.jl/issues",
"name": "RxInfer.jl",
"version": "2.12.0",
"version": "2.13.0",
"description": "Julia package for automated, scalable and efficient Bayesian inference on factor graphs with reactive message passing. ",
"applicationCategory": "Statistics",
"developmentStatus": "active",
"readme": "https://biaslab.github.io/RxInfer.jl/stable/",
"softwareVersion": "2.12.0",
"softwareVersion": "2.13.0",
"keywords": [
"Bayesian inference",
"message passing",
Expand Down
790 changes: 367 additions & 423 deletions examples/advanced_examples/GP Regression by SSM.ipynb

Large diffs are not rendered by default.

3,411 changes: 2,214 additions & 1,197 deletions examples/problem_specific/Autoregressive Models.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/models/aliases/test_aliases_normal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ end
@testset "aliases for `Normal` family of distributions" begin
result = normal_aliases_inference()
# Here we simply test that it ran and gave some output
@test first(mean(result.posteriors[:x1])) 0.03030314940197132
@test first(result.free_energy) 2.6823450222125444
@test first(mean(result.posteriors[:x1])) 0.04182509505703423
@test first(result.free_energy) 2.319611135721246
end

end

2 comments on commit 4aaab0b

@bvdmitri
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/92505

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v2.13.0 -m "<description of version>" 4aaab0b8731b268de8132b03e6f4e89ce5f9a7df
git push origin v2.13.0

Please sign in to comment.