omniopt2 8731__tar.gz → 8749__tar.gz

{omniopt2-8731 → omniopt2-8749}/.omniopt.py

@@ -4999,7 +4999,7 @@ def abandon_job(job: Job, trial_index: int, reason: str) -> bool:
                 if _trial is None:
                     return False
 
-                mark_abandoned(_trial, reason)
+                mark_abandoned(_trial, reason, trial_index)
                 print_debug(f"abandon_job: removing job {job}, trial_index: {trial_index}")
                 global_vars["jobs"].remove((job, trial_index))
             else:
@@ -5487,20 +5487,9 @@ def check_equation(variables: list, equation: str) -> Union[str, bool]:
 def set_objectives() -> dict:
     objectives = {}
 
-    for rn in arg_result_names:
-        key, value = "", ""
-
-        if "=" in rn:
-            key, value = rn.split('=', 1)
-        else:
-            key = rn
-            value = ""
-
-        if value not in ["min", "max"]:
-            if value:
-                print_yellow(f"Value '{value}' for --result_names {rn} is not a valid value. Must be min or max. Will be set to min.")
-
-            value = "min"
+    k = 0
+    for key in arg_result_names:
+        value = arg_result_min_or_max[k]
 
         _min = True
 
@@ -5508,6 +5497,7 @@ def set_objectives() -> dict:
             _min = False
 
         objectives[key] = ObjectiveProperties(minimize=_min)
+        k = k + 1
 
     return objectives
 
@@ -8207,10 +8197,10 @@ def get_batched_arms(nr_of_jobs_to_get: int) -> list:
 
         #print_debug(f"get_batched_arms: Attempt {attempts + 1}: requesting 1 more arm")
 
-        #t0 = time.time()
-        pending_observations = get_pending_observation_features(experiment=ax_client.experiment)
-        #dt = time.time() - t0
-        #print_debug(f"got pending observations: {pending_observations} (took {dt:.2f} seconds)")
+        pending_observations = get_pending_observation_features(
+            experiment=ax_client.experiment,
+            include_out_of_design_points=True
+        )
 
         try:
             #print_debug("getting global_gs.gen() with n=1")
@@ -8307,10 +8297,12 @@ def generate_trials(n: int, recursion: bool) -> Tuple[Dict[int, Any], bool]:
 class TrialRejected(Exception):
     pass
 
-def mark_abandoned(trial: Any, reason: str) -> None:
-    print_debug(f"Marking trial {trial} as abandoned. Reason: {reason}")
-
-    trial.mark_abandoned(reason=reason)
+def mark_abandoned(trial: Any, reason: str, trial_index: int) -> None:
+    try:
+        print_debug(f"[INFO] Marking trial {trial.index} ({trial.arm.name}) as abandoned, trial-index: {trial_index}. Reason: {reason}")
+        trial.mark_abandoned(reason)
+    except Exception as e:
+        print(f"[ERROR] Could not mark trial as abandoned: {e}")
 
 def create_and_handle_trial(arm: Any) -> Optional[Tuple[int, float, bool]]:
     if ax_client is None:
@@ -8337,7 +8329,7 @@ def create_and_handle_trial(arm: Any) -> Optional[Tuple[int, float, bool]]:
     arm = trial.arms[0]
     if deduplicated_arm(arm):
         print_debug(f"Duplicated arm: {arm}")
-        mark_abandoned(trial, "Duplication detected")
+        mark_abandoned(trial, "Duplication detected", trial_index)
         raise TrialRejected("Duplicate arm.")
 
     arms_by_name_for_deduplication[arm.name] = arm
@@ -8346,7 +8338,7 @@ def create_and_handle_trial(arm: Any) -> Optional[Tuple[int, float, bool]]:
 
     if not has_no_post_generation_constraints_or_matches_constraints(post_generation_constraints, params):
         print_debug(f"Trial {trial_index} does not meet post-generation constraints. Marking abandoned. Params: {params}, constraints: {post_generation_constraints}")
-        mark_abandoned(trial, "Post-Generation-Constraint failed")
+        mark_abandoned(trial, "Post-Generation-Constraint failed", trial_index)
         abandoned_trial_indices.append(trial_index)
         raise TrialRejected("Post-generation constraints not met.")
 

{omniopt2-8731 → omniopt2-8749}/.tests/pylint.rc

@@ -103,10 +103,6 @@ recursive=no
 # source root.
 source-roots=
 
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
-
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no

{omniopt2-8731 → omniopt2-8749}/PKG-INFO

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

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

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