omniopt2 7010__tar.gz → 7014__tar.gz

{omniopt2-7010 → omniopt2-7014}/.helpers.py

@@ -842,7 +842,11 @@ def can_be_plotted(path: str) -> bool:
 
     return len(lines) == 1
 
-def die_if_cannot_be_plotted(run_dir: str) -> None:
+def die_if_cannot_be_plotted(run_dir: Optional[str]) -> None:
+    if run_dir is None:
+        log_error("run_dir was empty")
+        sys.exit(2)
+
     if not can_be_plotted(run_dir):
         log_error(f"{run_dir} contains multiple RESULTS and thus can only be plotted by parallel plot")
         sys.exit(2)

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_cpu_ram_usage.py

@@ -39,6 +39,7 @@ def load_helpers(script_dir: str) -> None:
 parser = argparse.ArgumentParser(description='Plotting tool for analyzing CPU and RAM usage data.')
 parser.add_argument('--save_to_file', nargs='?', const='plot', type=str, help='Path to save the plot(s)')
 parser.add_argument('--run_dir', type=str, help='Path to a CSV file', required=True)
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
 args = parser.parse_args()
 
@@ -113,4 +114,10 @@ def main() -> None:
         update_graph(csv_path)
 
 if __name__ == "__main__":
-    main()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        main()

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_general.py

@@ -41,6 +41,7 @@ def parse_arguments() -> Any:
     parser.add_argument('--max', type=float, help='Maximum value for result filtering')
     parser.add_argument('--save_to_file', nargs='?', const='plot', type=str, help='Path to save the plot(s)')
     parser.add_argument('--run_dir', type=str, help='Path to a CSV file', required=True)
+    parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
     parser.add_argument('--bins', type=int, help='Number of bins for distribution of results', default=10)
     parser.add_argument('--alpha', type=float, help='Transparency of plot bars', default=0.5)
     parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
@@ -138,4 +139,10 @@ if __name__ == "__main__":
         logging.error("Specified --run_dir does not exist")
         sys.exit(1)
 
-    update_graph()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        update_graph()

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_gpu_usage.py

@@ -20,7 +20,7 @@ from beartype import beartype
 
 parser = argparse.ArgumentParser(description='Process some integers.')
 parser.add_argument('--run_dir', type=str, help='Directory where to search for CSV files')
-
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--no_legend', help='Disables legend (useless here)', action='store_true', default=False)
 parser.add_argument('--save_to_file', nargs='?', const='plot', type=str, help='Path to save the plot(s)')
 parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
@@ -140,10 +140,16 @@ def save_to_file_or_show_canvas() -> None:
                 plt.show()
 
 if __name__ == "__main__":
-    args = parser.parse_args()
-    try:
-        plot_gpu_usage(args.run_dir)
-    except UnicodeDecodeError:
-        if not os.environ.get("PLOT_TESTS"):
-            print(f"{args.run_dir}/results.csv seems to be invalid utf8.")
-        sys.exit(7)
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        args = parser.parse_args()
+        try:
+            plot_gpu_usage(args.run_dir)
+        except UnicodeDecodeError:
+            if not os.environ.get("PLOT_TESTS"):
+                print(f"{args.run_dir}/results.csv seems to be invalid utf8.")
+            sys.exit(7)

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_kde.py

@@ -42,6 +42,7 @@ parser = argparse.ArgumentParser(description='Plotting tool for analyzing trial
 parser.add_argument('--run_dir', type=str, help='Path to a run dir', required=True)
 parser.add_argument('--bins', type=int, help='Number of bins for distribution of results', default=10)
 parser.add_argument('--alpha', type=float, help='Transparency of plot bars (between 0 and 1)', default=0.5)
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--no_legend', help='Disables legend', action='store_true', default=False)
 parser.add_argument('--save_to_file', type=str, help='Save the plot to the specified file', default=None)
 parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
@@ -190,4 +191,10 @@ if __name__ == "__main__":
         logging.error("Specified --run_dir does not exist")
         sys.exit(1)
 
-    update_graph()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        update_graph()

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_scatter_generation_method.py

@@ -34,6 +34,7 @@ else:
 parser = argparse.ArgumentParser(description='Plotting tool for analyzing trial data.')
 parser.add_argument('--min', type=float, help='Minimum value for result filtering')
 parser.add_argument('--max', type=float, help='Maximum value for result filtering')
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--save_to_file', nargs='?', const='plot', type=str, help='Path to save the plot(s)')
 parser.add_argument('--run_dir', type=str, help='Path to a CSV file', required=True)
 parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
@@ -115,4 +116,10 @@ if __name__ == "__main__":
 
     helpers.die_if_cannot_be_plotted(args.run_dir)
 
-    update_graph()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        update_graph()

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_time_and_exit_code.py

@@ -38,9 +38,8 @@ else:
 
 parser = argparse.ArgumentParser(description='Plot worker usage from CSV file')
 parser.add_argument('--run_dir', type=str, help='Directory containing worker usage CSV file')
-
 parser.add_argument('--save_to_file', type=str, help='Save the plot to the specified file', default=None)
-
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--bins', type=int, help='Number of bins for distribution of results (useless here)', default=10)
 parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
 args = parser.parse_args()
@@ -158,4 +157,10 @@ def main() -> None:
         print("df was empty")
 
 if __name__ == "__main__":
-    main()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        main()

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_trial_index_result.py

@@ -41,6 +41,7 @@ parser = argparse.ArgumentParser(description='Plotting tool for analyzing trial
 parser.add_argument('--min', type=float, help='Minimum value for result filtering')
 parser.add_argument('--max', type=float, help='Maximum value for result filtering')
 parser.add_argument('--save_to_file', nargs='?', const='plot', type=str, help='Path to save the plot(s)')
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--run_dir', type=str, help='Path to a CSV file', required=True)
 parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
 args = parser.parse_args()
@@ -121,4 +122,10 @@ if __name__ == "__main__":
         logging.error("Specified --run_dir does not exist")
         sys.exit(1)
 
-    update_graph()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        update_graph()

{omniopt2-7010 → omniopt2-7014}/.omniopt_plot_worker.py

@@ -12,13 +12,20 @@ import os
 import sys
 import traceback
 from datetime import datetime, timezone
-from typing import Any
 
 import matplotlib.pyplot as plt
 import pandas as pd
 
 from beartype import beartype
 
+parser = argparse.ArgumentParser(description='Plot worker usage from CSV file')
+parser.add_argument('--run_dir', type=str, help='Directory containing worker usage CSV file')
+parser.add_argument('--debug', action='store_true', help='Enable debug mode')
+parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
+parser.add_argument('--save_to_file', type=str, help='Save the plot to the specified file', default=None)
+parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
+args = parser.parse_args()
+
 script_dir = os.path.dirname(os.path.realpath(__file__))
 helpers_file = f"{script_dir}/.helpers.py"
 spec = importlib.util.spec_from_file_location(
@@ -32,7 +39,7 @@ else:
     raise ImportError(f"Could not load module from {helpers_file}")
 
 @beartype
-def plot_worker_usage(args: Any, pd_csv: str) -> None:
+def plot_worker_usage(pd_csv: str) -> None:
     try:
         data = pd.read_csv(pd_csv, names=['time', 'num_parallel_jobs', 'nr_current_workers', 'percentage'])
 
@@ -93,15 +100,6 @@ def plot_worker_usage(args: Any, pd_csv: str) -> None:
         print(traceback.format_exc(), file=sys.stderr)
 
 def main() -> None:
-    parser = argparse.ArgumentParser(description='Plot worker usage from CSV file')
-    parser.add_argument('--run_dir', type=str, help='Directory containing worker usage CSV file')
-    parser.add_argument('--debug', action='store_true', help='Enable debug mode')
-
-    parser.add_argument('--save_to_file', type=str, help='Save the plot to the specified file', default=None)
-
-    parser.add_argument('--no_plt_show', help='Disable showing the plot', action='store_true', default=False)
-    args = parser.parse_args()
-
     if args.debug:
         print(f"Debug mode enabled. Run directory: {args.run_dir}")
 
@@ -111,7 +109,7 @@ def main() -> None:
         worker_usage_csv = os.path.join(args.run_dir, "worker_usage.csv")
         if os.path.exists(worker_usage_csv):
             try:
-                plot_worker_usage(args, worker_usage_csv)
+                plot_worker_usage(worker_usage_csv)
             except Exception as e:
                 helpers.log_error(f"Error: {e}")
                 sys.exit(3)
@@ -120,4 +118,10 @@ def main() -> None:
             sys.exit(19)
 
 if __name__ == "__main__":
-    main()
+    theme = "fast"
+
+    if args is not None and args.darkmode:
+        theme = "dark_background"
+
+    with plt.style.context(theme):
+        main()

{omniopt2-7010/omniopt2.egg-info → omniopt2-7014}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7010
+Version: 7014
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-7010 → omniopt2-7014/omniopt2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7010
+Version: 7014
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-7010 → omniopt2-7014}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {email = "norman.koch@tu-dresden.de"},
   {name = "Norman Koch"}
 ]
-version = "7010"
+version = "7014"
 
 readme = "README.md"
 dynamic = ["dependencies"]