Update docs for dev (build 3912)

Author: Circle CI

dev/_downloads/07fcc19ba03226cd3d83d4e40ec44385/auto_examples_python.zip

@@ -9,8 +9,8 @@
 import matplotlib.pyplot as plt
 from benchopt import run_benchmark
 from benchopt.benchmark import Benchmark
-from benchopt.plotting import plot_benchmark, PLOT_KINDS
-from benchopt.plotting.helpers import reset_solver_styles_idx
+from benchopt.plotting import plot_benchmark
+from benchopt.plotting.helpers import reset_solver_styles
 
 
 BENCHMARK_PATH = Path().resolve().parent / 'benchmarks' / 'benchmark_lasso'
@@ -32,10 +32,9 @@
     plot_result=False, show_progress=False
 )
 
+reset_solver_styles()
 
-kinds = list(PLOT_KINDS.keys())
-reset_solver_styles_idx()
 figs = plot_benchmark(
-    save_file, benchmark=Benchmark(BENCHMARK_PATH), kinds=kinds, html=False
+    save_file, benchmark=Benchmark(BENCHMARK_PATH), html=False
 )
 plt.show()

dev/_downloads/46d3545d2de3fcee6756b7d2ee7fb39f/plot_run_benchmark_python_R.py

@@ -15,7 +15,7 @@
       },
       "outputs": [],
       "source": [
-        "from pathlib import Path\nimport matplotlib.pyplot as plt\nfrom benchopt import run_benchmark\nfrom benchopt.benchmark import Benchmark\nfrom benchopt.plotting import plot_benchmark, PLOT_KINDS\nfrom benchopt.plotting.helpers import reset_solver_styles_idx\n\n\nBENCHMARK_PATH = (\n    Path().resolve().parent / 'benchmarks' / 'benchmark_logreg_l2'\n)\n\n\ntry:\n\n    _, save_file = run_benchmark(\n        BENCHMARK_PATH,\n        solver_names=['sklearn[liblinear]', 'sklearn[newton-cg]', 'lightning'],\n        dataset_names=[\"Simulated[n_features=500,n_samples=200]\"],\n        objective_filters=['L2 Logistic Regression[lmbd=1.0]'],\n        max_runs=100, timeout=20, n_repetitions=15,\n        plot_result=False, show_progress=True\n    )\n\nexcept RuntimeError:\n    raise RuntimeError(\n        \"This example can only work when Logreg-l2 benchmark is cloned in a \"\n        \"`benchmarks` folder. Please run:\\n\"\n        \"$ git clone https://github.com/benchopt/benchmark_logreg_l2 \"\n        f\"{BENCHMARK_PATH.resolve()}\"\n    )\n\n\nkinds = list(PLOT_KINDS.keys())\nreset_solver_styles_idx()\nfigs = plot_benchmark(save_file, benchmark=Benchmark(BENCHMARK_PATH),\n                      kinds=kinds, html=False)\nplt.show()"
+        "from pathlib import Path\nimport matplotlib.pyplot as plt\nfrom benchopt import run_benchmark\nfrom benchopt.benchmark import Benchmark\nfrom benchopt.plotting import plot_benchmark\nfrom benchopt.plotting.helpers import reset_solver_styles\n\n\nBENCHMARK_PATH = (\n    Path().resolve().parent / 'benchmarks' / 'benchmark_logreg_l2'\n)\n\ntry:\n\n    _, save_file = run_benchmark(\n        BENCHMARK_PATH,\n        solver_names=['sklearn[liblinear]', 'sklearn[newton-cg]', 'lightning'],\n        dataset_names=[\"Simulated[n_features=500,n_samples=200]\"],\n        objective_filters=['L2 Logistic Regression[lmbd=1.0]'],\n        max_runs=100, timeout=20, n_repetitions=15,\n        plot_result=False, show_progress=True\n    )\n\nexcept RuntimeError:\n    raise RuntimeError(\n        \"This example can only work when Logreg-l2 benchmark is cloned in a \"\n        \"`benchmarks` folder. Please run:\\n\"\n        \"$ git clone https://github.com/benchopt/benchmark_logreg_l2 \"\n        f\"{BENCHMARK_PATH.resolve()}\"\n    )\n\nreset_solver_styles()\n\nfigs = plot_benchmark(\n    save_file, benchmark=Benchmark(BENCHMARK_PATH), html=False\n)\nplt.show()"
       ]
     }
   ],

dev/_downloads/6f1e7a639e0699d6164445b55e6c116d/auto_examples_jupyter.zip

@@ -9,15 +9,14 @@
 import matplotlib.pyplot as plt
 from benchopt import run_benchmark
 from benchopt.benchmark import Benchmark
-from benchopt.plotting import plot_benchmark, PLOT_KINDS
-from benchopt.plotting.helpers import reset_solver_styles_idx
+from benchopt.plotting import plot_benchmark
+from benchopt.plotting.helpers import reset_solver_styles
 
 
 BENCHMARK_PATH = (
     Path().resolve().parent / 'benchmarks' / 'benchmark_logreg_l2'
 )
 
-
 try:
 
     _, save_file = run_benchmark(
@@ -37,9 +36,9 @@
         f"{BENCHMARK_PATH.resolve()}"
     )
 
+reset_solver_styles()
 
-kinds = list(PLOT_KINDS.keys())
-reset_solver_styles_idx()
-figs = plot_benchmark(save_file, benchmark=Benchmark(BENCHMARK_PATH),
-                      kinds=kinds, html=False)
+figs = plot_benchmark(
+    save_file, benchmark=Benchmark(BENCHMARK_PATH), html=False
+)
 plt.show()

dev/_downloads/a3747ad75224b0e1c78c72c3113052a8/plot_run_benchmark_python_R.zip

@@ -15,7 +15,7 @@
       },
       "outputs": [],
       "source": [
-        "from pathlib import Path\nimport matplotlib.pyplot as plt\nfrom benchopt import run_benchmark\nfrom benchopt.benchmark import Benchmark\nfrom benchopt.plotting import plot_benchmark, PLOT_KINDS\nfrom benchopt.plotting.helpers import reset_solver_styles_idx\n\n\nBENCHMARK_PATH = Path().resolve().parent / 'benchmarks' / 'benchmark_lasso'\n\nif not BENCHMARK_PATH.exists():\n    raise RuntimeError(\n        \"This example can only work when Lasso benchmark is cloned in the \"\n        \"example folder. Please run:\\n\"\n        \"$ git clone https://github.com/benchopt/benchmark_lasso \"\n        f\"{BENCHMARK_PATH.resolve()}\"\n    )\n\n_, save_file = run_benchmark(\n    BENCHMARK_PATH,\n    solver_names=['Python-PGD[use_acceleration=False]', 'R-PGD'],\n    dataset_names=[\"Simulated[n_features=5000,n_samples=100,rho=0]\"],\n    objective_filters=['*[fit_intercept=False,reg=0.5]'],\n    max_runs=100, timeout=100, n_repetitions=5,\n    plot_result=False, show_progress=False\n)\n\n\nkinds = list(PLOT_KINDS.keys())\nreset_solver_styles_idx()\nfigs = plot_benchmark(\n    save_file, benchmark=Benchmark(BENCHMARK_PATH), kinds=kinds, html=False\n)\nplt.show()"
+        "from pathlib import Path\nimport matplotlib.pyplot as plt\nfrom benchopt import run_benchmark\nfrom benchopt.benchmark import Benchmark\nfrom benchopt.plotting import plot_benchmark\nfrom benchopt.plotting.helpers import reset_solver_styles\n\n\nBENCHMARK_PATH = Path().resolve().parent / 'benchmarks' / 'benchmark_lasso'\n\nif not BENCHMARK_PATH.exists():\n    raise RuntimeError(\n        \"This example can only work when Lasso benchmark is cloned in the \"\n        \"example folder. Please run:\\n\"\n        \"$ git clone https://github.com/benchopt/benchmark_lasso \"\n        f\"{BENCHMARK_PATH.resolve()}\"\n    )\n\n_, save_file = run_benchmark(\n    BENCHMARK_PATH,\n    solver_names=['Python-PGD[use_acceleration=False]', 'R-PGD'],\n    dataset_names=[\"Simulated[n_features=5000,n_samples=100,rho=0]\"],\n    objective_filters=['*[fit_intercept=False,reg=0.5]'],\n    max_runs=100, timeout=100, n_repetitions=5,\n    plot_result=False, show_progress=False\n)\n\nreset_solver_styles()\n\nfigs = plot_benchmark(\n    save_file, benchmark=Benchmark(BENCHMARK_PATH), html=False\n)\nplt.show()"
       ]
     }
   ],