From 9d5899d91a2e9538a55315a6fdd0f6e5b90a25fe Mon Sep 17 00:00:00 2001 From: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:27:12 +0200 Subject: [PATCH] Fix tests for TimerOutputs (#31) --- Project.toml | 2 +- test/test_timers.jl | 52 ++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Project.toml b/Project.toml index bad08e4..211dc47 100644 --- a/Project.toml +++ b/Project.toml @@ -14,7 +14,7 @@ TrixiBaseMPIExt = "MPI" [compat] MPI = "0.20" -TimerOutputs = "0.5" +TimerOutputs = "0.5.25" julia = "1.8" [extras] diff --git a/test/test_timers.jl b/test/test_timers.jl index 70f9a3f..86862d6 100644 --- a/test/test_timers.jl +++ b/test/test_timers.jl @@ -6,14 +6,14 @@ TrixiBase.TimerOutputs.reset_timer!(timer()) timer_output = """ - ──────────────────────────────────────────────────────────────────── - Time Allocations - ─────────────────────── ──────────────────────── - Tot / % measured: 91.5s / 0.0% 5.43MiB / 0.0% - - Section ncalls time %tot avg alloc %tot avg - ──────────────────────────────────────────────────────────────────── - ──────────────────────────────────────────────────────────────────── + ──────────────────────────────────────────────────────────────────── + Time Allocations + ─────────────────────── ──────────────────────── + Tot / % measured: 91.5s / 0.0% 5.43MiB / 0.0% + + Section ncalls time %tot avg alloc %tot avg + ──────────────────────────────────────────────────────────────────── + ──────────────────────────────────────────────────────────────────── """ # Remove "Tot / % measured" line and trailing white spaces expected = replace(timer_output, r"Tot / % measured: .*" => "", @@ -34,15 +34,15 @@ @trixi_timeit timer() "test timer" sin(0.0) timer_output = """ - ─────────────────────────────────────────────────────────────────────── - Time Allocations - ─────────────────────── ──────────────────────── - Tot / % measured: 61.4ms / 99.2% 5.60MiB / 99.6% - - Section ncalls time %tot avg alloc %tot avg - ─────────────────────────────────────────────────────────────────────── - test timer 2 60.9ms 100.0% 60.9ms 5.57MiB 100.0% 5.57MiB - ─────────────────────────────────────────────────────────────────────── + ─────────────────────────────────────────────────────────────────────── + Time Allocations + ─────────────────────── ──────────────────────── + Tot / % measured: 61.4ms / 99.2% 5.60MiB / 99.6% + + Section ncalls time %tot avg alloc %tot avg + ─────────────────────────────────────────────────────────────────────── + test timer 2 60.9ms 100.0% 60.9ms 5.57MiB 100.0% 5.57MiB + ─────────────────────────────────────────────────────────────────────── """ # Remove "Tot / % measured" line and trailing white spaces and replace # the "test timer" line (but don't remove it, we want to check that it's there). @@ -77,15 +77,15 @@ println(timer()) timer_output = """ - ───────────────────────────────────────────────────────────────────────── - Time Allocations - ─────────────────────── ──────────────────────── - Tot / % measured: 23.7ms / 0.0% 1.00MiB / 0.0% - - Section ncalls time %tot avg alloc %tot avg - ───────────────────────────────────────────────────────────────────────── - test timer 2 1 875ns 100.0% 875ns 48.0B 100.0% 48.0B - ───────────────────────────────────────────────────────────────────────── + ───────────────────────────────────────────────────────────────────────── + Time Allocations + ─────────────────────── ──────────────────────── + Tot / % measured: 23.7ms / 0.0% 1.00MiB / 0.0% + + Section ncalls time %tot avg alloc %tot avg + ───────────────────────────────────────────────────────────────────────── + test timer 2 1 875ns 100.0% 875ns 48.0B 100.0% 48.0B + ───────────────────────────────────────────────────────────────────────── """ # Remove "Tot / % measured" line and trailing white spaces and replace # the "test timer" line (but don't remove it, we want to check that it's there).