diff --git a/.github/workflows/Benchmarking.yml b/.github/workflows/Benchmarking.yml index 291723cce..bf188059f 100644 --- a/.github/workflows/Benchmarking.yml +++ b/.github/workflows/Benchmarking.yml @@ -18,6 +18,8 @@ jobs: with: version: '1' + - uses: julia-actions/cache@v2 + - name: Install Dependencies run: julia --project=benchmarks/ -e 'using Pkg; Pkg.instantiate()' diff --git a/benchmarks/Project.toml b/benchmarks/Project.toml index 3d14d03ff..7e7b9f7cb 100644 --- a/benchmarks/Project.toml +++ b/benchmarks/Project.toml @@ -26,6 +26,6 @@ DynamicPPL = "0.37" ForwardDiff = "0.10.38, 1" LogDensityProblems = "2.1.2" Mooncake = "0.4" -PrettyTables = "2.4.0" +PrettyTables = "3" ReverseDiff = "1.15.3" StableRNGs = "1" diff --git a/benchmarks/benchmarks.jl b/benchmarks/benchmarks.jl index b733d810c..dfcdcc271 100644 --- a/benchmarks/benchmarks.jl +++ b/benchmarks/benchmarks.jl @@ -2,7 +2,7 @@ using Pkg using DynamicPPLBenchmarks: Models, make_suite, model_dimension using BenchmarkTools: @benchmark, median, run -using PrettyTables: PrettyTables, ft_printf +using PrettyTables: pretty_table, fmt__printf using StableRNGs: StableRNG rng = StableRNG(23) @@ -85,18 +85,13 @@ end table_matrix = hcat(Iterators.map(collect, zip(results_table...))...) header = [ - "Model", - "Dimension", - "AD Backend", - "VarInfo Type", - "Linked", - "Eval Time / Ref Time", - "AD Time / Eval Time", + "Model", "Dim", "AD Backend", "VarInfo", "Linked", "t(eval)/t(ref)", "t(grad)/t(eval)" ] -PrettyTables.pretty_table( +pretty_table( table_matrix; - header=header, - tf=PrettyTables.tf_markdown, - formatters=ft_printf("%.1f", [6, 7]), - crop=:none, # Always print the whole table, even if it doesn't fit in the terminal. + column_labels=header, + backend=:text, + formatters=[fmt__printf("%.1f", [6, 7])], + fit_table_in_display_horizontally=false, + fit_table_in_display_vertically=false, )