omniopt2 7010__tar.gz → 7015__tar.gz

{omniopt2-7010 → omniopt2-7015}/.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-7015}/.omniopt_plot_gpu_usage.py

@@ -20,7 +20,6 @@ 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('--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)

{omniopt2-7010 → omniopt2-7015}/.omniopt_plot_scatter.py

@@ -49,7 +49,6 @@ parser.add_argument('--run_dir', type=str, help='Path to a CSV file', required=T
 parser.add_argument('--save_to_file', type=str, help='Save the plot to the specified file', default=None)
 parser.add_argument('--max', type=float, help='Maximum value', default=None)
 parser.add_argument('--min', type=float, help='Minimum value', default=None)
-parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--bubblesize', type=int, help='Size of the bubbles', default=15)
 parser.add_argument('--merge_with_previous_runs', action='append', nargs='+', help="Run-Dirs to be merged with", default=[])
 parser.add_argument('--exclude_params', action='append', nargs='+', help="Params to be ignored", default=[])
@@ -214,12 +213,6 @@ def update_graph(csv_file_path: str, event: Any = None, _min: Union[int, float,
 
 if __name__ == "__main__":
     try:
-        theme = "fast"
-
-        if args is not None and args.darkmode:
-            theme = "dark_background"
-
-        with plt.style.context(theme):
-            main()
+        main()
     except KeyboardInterrupt:
         sys.exit(0)

{omniopt2-7010 → omniopt2-7015}/.omniopt_plot_scatter_hex.py

@@ -55,7 +55,6 @@ parser.add_argument('--run_dir', type=str, help='Path to a CSV file', required=T
 parser.add_argument('--save_to_file', type=str, help='Save the plot to the specified file', default=None)
 parser.add_argument('--max', type=float, help='Maximum value', default=None)
 parser.add_argument('--min', type=float, help='Minimum value', default=None)
-parser.add_argument('--darkmode', help='Enable darktheme', action='store_true', default=False)
 parser.add_argument('--merge_with_previous_runs', action='append', nargs='+', help="Run-Dirs to be merged with", default=[])
 parser.add_argument('--exclude_params', action='append', nargs='+', help="Params to be ignored", default=[])
 
@@ -266,12 +265,6 @@ def update_graph(csv_file_path: str, event: Any = None, _min: Union[int, float,
 
 if __name__ == "__main__":
     try:
-        theme = "fast"
-
-        if args is not None and args.darkmode:
-            theme = "dark_background"
-
-        with plt.style.context(theme):
-            main()
+        main()
     except KeyboardInterrupt:
         sys.exit(0)

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

@@ -38,9 +38,7 @@ 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('--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()

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

@@ -12,13 +12,19 @@ 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('--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 +38,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 +99,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 +108,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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7010
+Version: 7015
 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-7015/omniopt2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7010
+Version: 7015
 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-7015}/pyproject.toml

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