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

CompatHelper: bump compat for Turing to 0.20, (keep existing compat) #45

Merged
Merged
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: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
run: julia -e 'using CompatHelper; CompatHelper.main(; bump_version=true)'
run: julia -e 'using CompatHelper; CompatHelper.main(; bump_version=true, subdirs=["test", "docs"])'
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Turkie"
uuid = "8156cc02-0533-41cd-9345-13411ebe105f"
authors = ["Theo Galy-Fajou <[email protected]> and contributors"]
version = "0.1.10"
version = "0.1.11"

[deps]
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
Expand All @@ -17,7 +17,7 @@ ColorSchemes = "3"
Colors = "0.12"
KernelDensity = "0.6"
MCMCChains = "4, 5"
Makie = "0.15"
Makie = "0.15, 0.16"
OnlineStats = "1.5"
Turing = "0.15, 0.16, 0.17, 0.18, 0.19"
julia = "1.6"
Turing = "0.20"
julia = "1.6"
2 changes: 1 addition & 1 deletion src/Turkie.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Turkie

using Makie: Makie, Figure, Axis, Point2f0
using Makie: barplot!, lines!, scatter! # Plotting tools
using Makie: Observable, Node, lift, on # Observable tools
using Makie: Observable, lift, on # Observable tools
using Makie: recordframe! # Recording tools
using Makie.MakieLayout # Layouting tool
using Colors, ColorSchemes # Colors tools
Expand Down
2 changes: 1 addition & 1 deletion src/live_sampling/online_stats_plots.jl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function onlineplot!(axis, stat::KHist, stats, iter, data, iterations, i, j)
on(iter) do _
stat[] = fit!(stat[], last(value(data[])))
end
hist_vals = Node(Point2f0.(collect(range(0f0, 1f0, length=nbins)), zeros(Float32, nbins)))
hist_vals = Observable(Point2f0.(collect(range(0f0, 1f0, length=nbins)), zeros(Float32, nbins)))
push!(stats, stat)
on(stat) do h
edges, weights = OnlineStats.xy(h)
Expand Down
4 changes: 2 additions & 2 deletions src/live_sampling/turkie_callback.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ function TurkieCallback(vars::NamedTuple, params::Dict)
get!(params, :refresh, false)
params[:t0] = 0
iter = Observable(0)
data = Dict{Symbol, Observable{MovingWindow}}(:iter => Node(MovingWindow(window, Int)))
data = Dict{Symbol, Observable{MovingWindow}}(:iter => Observable(MovingWindow(window, Int)))
axis_dict = Dict()
stats_dict = Dict()
for (i, variable) in enumerate(keys(vars))
plots = vars[variable]
data[variable] = Node(MovingWindow(window, Float32))
data[variable] = Observable(MovingWindow(window, Float32))
axis_dict[(variable, :varname)] = fig[i, 1, Left()] = Label(fig, string(variable), textsize = 30)
axis_dict[(variable, :varname)].padding = (0, 60, 0, 0)
onlineplot!(fig, axis_dict, plots, stats_dict, iter, data, variable, i)
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0"
CairoMakie = "0.6"
ColorSchemes = "3"
OnlineStats = "1"
Turing = "0.15, 0.16, 0.17, 0.18, 0.19"
Turing = "0.20"