From 0ac66831f01642fea42c995a96622a56edd7d51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juli=C3=A1n=20Tachella?= Date: Mon, 31 Aug 2026 10:12:11 +0200 Subject: [PATCH 1/2] remove spuriours plot --- .../benchmarks/plots/deepinv_boxplot.py | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 deepinv_bench/benchmarks/plots/deepinv_boxplot.py diff --git a/deepinv_bench/benchmarks/plots/deepinv_boxplot.py b/deepinv_bench/benchmarks/plots/deepinv_boxplot.py deleted file mode 100644 index 4e2479d..0000000 --- a/deepinv_bench/benchmarks/plots/deepinv_boxplot.py +++ /dev/null @@ -1,45 +0,0 @@ -from benchopt.plotting.base import BasePlot - -UNITS = { - "PSNR": "dB", -} - - -class Plot(BasePlot): - name = "Deepinv Boxplot" - type = "boxplot" - options = { - "metric": [ - "PSNR", - "LPIPS", - ], - } - - def get_metadata(self, df, metric): - unit = UNITS.get(metric, None) - if unit is not None: - unit = f" ({unit})" - return { - "title": f"Deblurring on Div2K\nMetric: {metric}", - "xlabel": "Solver", - "ylabel": f"{metric}{unit}", - } - - def plot(self, df, metric): - plot_data = [] - for solver, df_solver in df.groupby("solver_name"): - mean = df_solver[f"objective_{metric}"].mean() - std = df_solver[f"objective_{metric}_std"].mean() - y = [[mean - std, mean, mean + std]] - x = [solver] - - plot_data.append( - { - "x": x, - "y": y, - "label": solver, - "color": self.get_style(solver)["color"], - } - ) - - return plot_data From edc494ca6c0abcc709365952f9feda63f2e5ece0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juli=C3=A1n=20Tachella?= Date: Mon, 31 Aug 2026 16:27:45 +0200 Subject: [PATCH 2/2] refactor plot to base --- deepinv_bench/base/plots.py | 45 +++++++++++++++++++ .../plots/deepinv_boxplot.py | 2 +- .../plots/deepinv_boxplot.py | 2 +- .../plots/deepinv_boxplot.py | 2 +- .../plots/deepinv_boxplot.py | 2 +- .../plots/deepinv_boxplot.py | 2 +- 6 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 deepinv_bench/base/plots.py diff --git a/deepinv_bench/base/plots.py b/deepinv_bench/base/plots.py new file mode 100644 index 0000000..6cb7712 --- /dev/null +++ b/deepinv_bench/base/plots.py @@ -0,0 +1,45 @@ +from benchopt.plotting.base import BasePlot + +UNITS = { + "PSNR": "dB", +} + + +class Plot(BasePlot): + name = "Deepinv Boxplot" + type = "boxplot" + options = { + "metric": [ + "PSNR", + "LPIPS", + ], + } + + def get_metadata(self, df, metric): + unit = UNITS.get(metric, None) + if unit is not None: + unit = f" ({unit})" + return { + "title": f"Deblurring on Div2K\nMetric: {metric}", + "xlabel": "Solver", + "ylabel": f"{metric}{unit}", + } + + def plot(self, df, metric): + plot_data = [] + for solver, df_solver in df.groupby("solver_name"): + mean = df_solver[f"objective_{metric}"].mean() + std = df_solver[f"objective_{metric}_std"].mean() + y = [[mean - std, mean, mean + std]] + x = [solver] + + plot_data.append( + { + "x": x, + "y": y, + "label": solver, + "color": self.get_style(solver)["color"], + } + ) + + return plot_data \ No newline at end of file diff --git a/deepinv_bench/benchmarks/benchmark_template/plots/deepinv_boxplot.py b/deepinv_bench/benchmarks/benchmark_template/plots/deepinv_boxplot.py index 161079d..8e625eb 100644 --- a/deepinv_bench/benchmarks/benchmark_template/plots/deepinv_boxplot.py +++ b/deepinv_bench/benchmarks/benchmark_template/plots/deepinv_boxplot.py @@ -1,4 +1,4 @@ -from deepinv_bench.benchmarks.plots.deepinv_boxplot import Plot as _Plot +from deepinv_bench.base.plots.deepinv_boxplot import Plot as _Plot class Plot(_Plot): diff --git a/deepinv_bench/benchmarks/cbsd68_gaussian_denoising/plots/deepinv_boxplot.py b/deepinv_bench/benchmarks/cbsd68_gaussian_denoising/plots/deepinv_boxplot.py index 161079d..8e625eb 100644 --- a/deepinv_bench/benchmarks/cbsd68_gaussian_denoising/plots/deepinv_boxplot.py +++ b/deepinv_bench/benchmarks/cbsd68_gaussian_denoising/plots/deepinv_boxplot.py @@ -1,4 +1,4 @@ -from deepinv_bench.benchmarks.plots.deepinv_boxplot import Plot as _Plot +from deepinv_bench.base.plots.deepinv_boxplot import Plot as _Plot class Plot(_Plot): diff --git a/deepinv_bench/benchmarks/div2k_gaussian_deblurring/plots/deepinv_boxplot.py b/deepinv_bench/benchmarks/div2k_gaussian_deblurring/plots/deepinv_boxplot.py index 161079d..8e625eb 100644 --- a/deepinv_bench/benchmarks/div2k_gaussian_deblurring/plots/deepinv_boxplot.py +++ b/deepinv_bench/benchmarks/div2k_gaussian_deblurring/plots/deepinv_boxplot.py @@ -1,4 +1,4 @@ -from deepinv_bench.benchmarks.plots.deepinv_boxplot import Plot as _Plot +from deepinv_bench.base.plots.deepinv_boxplot import Plot as _Plot class Plot(_Plot): diff --git a/deepinv_bench/benchmarks/div2k_inpainting_easy/plots/deepinv_boxplot.py b/deepinv_bench/benchmarks/div2k_inpainting_easy/plots/deepinv_boxplot.py index 161079d..8e625eb 100644 --- a/deepinv_bench/benchmarks/div2k_inpainting_easy/plots/deepinv_boxplot.py +++ b/deepinv_bench/benchmarks/div2k_inpainting_easy/plots/deepinv_boxplot.py @@ -1,4 +1,4 @@ -from deepinv_bench.benchmarks.plots.deepinv_boxplot import Plot as _Plot +from deepinv_bench.base.plots.deepinv_boxplot import Plot as _Plot class Plot(_Plot): diff --git a/deepinv_bench/benchmarks/div2k_super_resolution_2x/plots/deepinv_boxplot.py b/deepinv_bench/benchmarks/div2k_super_resolution_2x/plots/deepinv_boxplot.py index 161079d..8e625eb 100644 --- a/deepinv_bench/benchmarks/div2k_super_resolution_2x/plots/deepinv_boxplot.py +++ b/deepinv_bench/benchmarks/div2k_super_resolution_2x/plots/deepinv_boxplot.py @@ -1,4 +1,4 @@ -from deepinv_bench.benchmarks.plots.deepinv_boxplot import Plot as _Plot +from deepinv_bench.base.plots.deepinv_boxplot import Plot as _Plot class Plot(_Plot):