omniopt2 7017__tar.gz → 7024__tar.gz

{omniopt2-7017 → omniopt2-7024}/.omniopt.py

@@ -531,7 +531,6 @@ class ConfigLoader:
     auto_exclude_defective_hosts: bool
     debug: bool
     num_restarts: int
-    batch_limit: int
     raw_samples: int
     show_generate_time_table: bool
     max_attempts_for_generation: int
@@ -662,7 +661,6 @@ class ConfigLoader:
         speed.add_argument('--raw_samples', help='raw_samples option for optimizer_options', type=int, default=1024)
         speed.add_argument('--no_transform_inputs', help='Disable input transformations', action='store_true', default=False)
         speed.add_argument('--no_normalize_y', help='Disable target normalization', action='store_true', default=False)
-        speed.add_argument('--batch_limit', help='batch_limit option for optimizer_options (limits number of parallel candidates per restart)', type=int, default=32)
 
         slurm.add_argument('--num_parallel_jobs', help='Number of parallel SLURM jobs (default: 20)', type=int, default=20)
         slurm.add_argument('--worker_timeout', help='Timeout for SLURM jobs (i.e. for each single point to be optimized)', type=int, default=30)
@@ -2956,11 +2954,13 @@ def find_file_paths(_text: str) -> List[str]:
 @beartype
 def check_file_info(file_path: str) -> str:
     if not os.path.exists(file_path):
-        print(f"check_file_info: The file {file_path} does not exist.")
+        if not args.tests:
+            print(f"check_file_info: The file {file_path} does not exist.")
         return ""
 
     if not os.access(file_path, os.R_OK):
-        print(f"check_file_info: The file {file_path} is not readable.")
+        if not args.tests:
+            print(f"check_file_info: The file {file_path} is not readable.")
         return ""
 
     file_stat = os.stat(file_path)
@@ -4063,7 +4063,8 @@ def plot_sixel_imgs() -> None:
 def get_crf() -> str:
     crf = get_current_run_folder()
     if crf in ["", None]:
-        console.print("[red]Could not find current run folder[/]")
+        if not args.tests:
+            console.print("[red]Could not find current run folder[/]")
         return ""
     return crf
 
@@ -5660,7 +5661,6 @@ def insert_jobs_from_csv(this_csv_file_path: str, experiment_parameters: Optiona
     with console.status("[bold green]Loading existing jobs into ax_client...") as __status:
         i = 0
         for arm_params, result in zip(arm_params_list, results_list):
-
             __status.update(f"[bold green]Loading existing jobs from {this_csv_file_path} into ax_client")
             arm_params = validate_and_convert_params(experiment_parameters, arm_params)
 
@@ -6439,23 +6439,20 @@ def handle_restart(stdout_path: str, trial_index: int) -> None:
     else:
         print(f"Could not determine parameters from outfile {stdout_path} for restarting job")
 
-@beartype
-def check_alternate_path(path: str) -> str:
-    if os.path.exists(path):
-        return path
-
-    if path.endswith('.out'):
-        alt_path = path[:-4] + '.err'
-    elif path.endswith('.err'):
-        alt_path = path[:-4] + '.out'
-    else:
-        alt_path = None
-
-    if alt_path and os.path.exists(alt_path):
-        return alt_path
-
-    # Wenn auch der alternative Pfad nicht existiert, gib den Originalpfad zurück
-    return path
+#@beartype
+#def check_alternate_path(path: str) -> str:
+#    if os.path.exists(path):
+#        return path
+#    if path.endswith('.out'):
+#        alt_path = path[:-4] + '.err'
+#    elif path.endswith('.err'):
+#        alt_path = path[:-4] + '.out'
+#    else:
+#        alt_path = None
+#    if alt_path and os.path.exists(alt_path):
+#        return alt_path
+#    # Wenn auch der alternative Pfad nicht existiert, gib den Originalpfad zurück
+#    return path
 
 @beartype
 def handle_restart_on_different_node(stdout_path: str, hostname_from_out_file: Union[None, str], trial_index: int) -> None:
@@ -6471,7 +6468,7 @@ def handle_restart_on_different_node(stdout_path: str, hostname_from_out_file: U
 
 @beartype
 def _orchestrate(stdout_path: str, trial_index: int) -> None:
-    stdout_path = check_alternate_path(stdout_path)
+    #stdout_path = check_alternate_path(stdout_path)
 
     behavs = check_orchestrator(stdout_path, trial_index)
 
@@ -6951,9 +6948,6 @@ def get_model_gen_kwargs() -> dict:
                 "num_restarts": args.num_restarts,
                 "raw_samples": args.raw_samples,
                 # "sequential": False, # TODO, when https://github.com/facebook/Ax/issues/3819 is solved
-                "options": {
-                    "batch_limit": args.batch_limit,
-                },
             },
         },
         "fallback_to_sample_polytope": True,
@@ -9250,7 +9244,7 @@ def main() -> None:
     write_files_and_show_overviews()
 
     for existing_run in args.load_data_from_existing_jobs:
-        insert_jobs_from_csv(f"{existing_run}/results.csv", experiment_parameters)
+        insert_jobs_from_csv(f"{existing_run}/results.csv".replace("//", "/"), experiment_parameters)
 
         set_global_generation_strategy()
 

{omniopt2-7017 → omniopt2-7024}/PKG-INFO

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

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

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