omniopt2 7327__py3-none-any.whl → 7333__py3-none-any.whl

.omniopt.py

@@ -44,7 +44,7 @@ joined_valid_occ_types: str = ", ".join(valid_occ_types)
 SUPPORTED_MODELS: list = ["SOBOL", "FACTORIAL", "SAASBO", "BOTORCH_MODULAR", "UNIFORM", "BO_MIXED", "RANDOMFOREST", "EXTERNAL_GENERATOR", "PSEUDORANDOM", "TPE"]
 joined_supported_models: str = ", ".join(SUPPORTED_MODELS)
 
-special_col_names: list = ["arm_name", "generation_method", "trial_index", "trial_status", "generation_node", "idxs"]
+special_col_names: list = ["arm_name", "generation_method", "trial_index", "trial_status", "generation_node", "idxs", "trial_index", "start_time", "end_time", "run_time", "exit_code", "program_string", "signal", "hostname"]
 IGNORABLE_COLUMNS: list = ["start_time", "end_time", "hostname", "signal", "exit_code", "run_time", "program_string"] + special_col_names
 
 uncontinuable_models: list = ["RANDOMFOREST", "EXTERNAL_GENERATOR", "TPE", "PSEUDORANDOM", "HUMAN_INTERVENTION_MINIMUM"]
@@ -1847,6 +1847,48 @@ def try_saving_to_db() -> None:
     except Exception as e:
         print_debug(f"Failed trying to save sqlite3-DB: {e}")
 
+@beartype
+@beartype
+def merge_with_job_infos(pd_frame: pd.DataFrame) -> pd.DataFrame:
+    """
+    Merge pd_frame with job_infos.csv on 'trial_index'.
+    Add new columns from job_infos.csv directly after 'trial_index'.
+    """
+    job_infos_path = os.path.join(get_current_run_folder(), "job_infos.csv")
+    if not os.path.exists(job_infos_path):
+        return pd_frame
+
+    job_df = pd.read_csv(job_infos_path)
+
+    if 'trial_index' not in pd_frame.columns or 'trial_index' not in job_df.columns:
+        raise ValueError("Both DataFrames must contain a 'trial_index' column.")
+
+    # Filter job_df nur auf trial_index, die in pd_frame sind
+    job_df_filtered = job_df[job_df['trial_index'].isin(pd_frame['trial_index'])]
+
+    # Neue Spalten (außer trial_index), die noch nicht in pd_frame sind
+    new_cols = [col for col in job_df_filtered.columns if col != 'trial_index' and col not in pd_frame.columns]
+
+    # job_df nur mit trial_index und den neuen Spalten
+    job_df_reduced = job_df_filtered[['trial_index'] + new_cols]
+
+    # Merge (left join) auf trial_index
+    merged = pd.merge(pd_frame, job_df_reduced, on='trial_index', how='left')
+
+    # Spaltenreihenfolge neu anordnen:
+    # 1) trial_index
+    # 2) neue Spalten aus job_infos.csv
+    # 3) alle anderen Spalten aus pd_frame außer trial_index
+
+    # Alle Spalten aus pd_frame außer trial_index
+    old_cols = [col for col in pd_frame.columns if col != 'trial_index']
+
+    new_order = ['trial_index'] + new_cols + old_cols
+
+    merged = merged[new_order]
+
+    return merged
+
 @beartype
 def save_results_csv() -> Optional[str]:
     if args.dryrun:
@@ -1867,6 +1909,9 @@ def save_results_csv() -> Optional[str]:
         ax_client.experiment.fetch_data()
 
         pd_frame = ax_client.get_trials_data_frame()
+
+        pd_frame = merge_with_job_infos(pd_frame)
+
         pd_frame.to_csv(pd_csv, index=False, float_format="%.30f")
 
         json_snapshot = ax_client.to_json_snapshot()

{omniopt2-7327.data → omniopt2-7333.data}/data/bin/.omniopt.py

@@ -44,7 +44,7 @@ joined_valid_occ_types: str = ", ".join(valid_occ_types)
 SUPPORTED_MODELS: list = ["SOBOL", "FACTORIAL", "SAASBO", "BOTORCH_MODULAR", "UNIFORM", "BO_MIXED", "RANDOMFOREST", "EXTERNAL_GENERATOR", "PSEUDORANDOM", "TPE"]
 joined_supported_models: str = ", ".join(SUPPORTED_MODELS)
 
-special_col_names: list = ["arm_name", "generation_method", "trial_index", "trial_status", "generation_node", "idxs"]
+special_col_names: list = ["arm_name", "generation_method", "trial_index", "trial_status", "generation_node", "idxs", "trial_index", "start_time", "end_time", "run_time", "exit_code", "program_string", "signal", "hostname"]
 IGNORABLE_COLUMNS: list = ["start_time", "end_time", "hostname", "signal", "exit_code", "run_time", "program_string"] + special_col_names
 
 uncontinuable_models: list = ["RANDOMFOREST", "EXTERNAL_GENERATOR", "TPE", "PSEUDORANDOM", "HUMAN_INTERVENTION_MINIMUM"]
@@ -1847,6 +1847,48 @@ def try_saving_to_db() -> None:
     except Exception as e:
         print_debug(f"Failed trying to save sqlite3-DB: {e}")
 
+@beartype
+@beartype
+def merge_with_job_infos(pd_frame: pd.DataFrame) -> pd.DataFrame:
+    """
+    Merge pd_frame with job_infos.csv on 'trial_index'.
+    Add new columns from job_infos.csv directly after 'trial_index'.
+    """
+    job_infos_path = os.path.join(get_current_run_folder(), "job_infos.csv")
+    if not os.path.exists(job_infos_path):
+        return pd_frame
+
+    job_df = pd.read_csv(job_infos_path)
+
+    if 'trial_index' not in pd_frame.columns or 'trial_index' not in job_df.columns:
+        raise ValueError("Both DataFrames must contain a 'trial_index' column.")
+
+    # Filter job_df nur auf trial_index, die in pd_frame sind
+    job_df_filtered = job_df[job_df['trial_index'].isin(pd_frame['trial_index'])]
+
+    # Neue Spalten (außer trial_index), die noch nicht in pd_frame sind
+    new_cols = [col for col in job_df_filtered.columns if col != 'trial_index' and col not in pd_frame.columns]
+
+    # job_df nur mit trial_index und den neuen Spalten
+    job_df_reduced = job_df_filtered[['trial_index'] + new_cols]
+
+    # Merge (left join) auf trial_index
+    merged = pd.merge(pd_frame, job_df_reduced, on='trial_index', how='left')
+
+    # Spaltenreihenfolge neu anordnen:
+    # 1) trial_index
+    # 2) neue Spalten aus job_infos.csv
+    # 3) alle anderen Spalten aus pd_frame außer trial_index
+
+    # Alle Spalten aus pd_frame außer trial_index
+    old_cols = [col for col in pd_frame.columns if col != 'trial_index']
+
+    new_order = ['trial_index'] + new_cols + old_cols
+
+    merged = merged[new_order]
+
+    return merged
+
 @beartype
 def save_results_csv() -> Optional[str]:
     if args.dryrun:
@@ -1867,6 +1909,9 @@ def save_results_csv() -> Optional[str]:
         ax_client.experiment.fetch_data()
 
         pd_frame = ax_client.get_trials_data_frame()
+
+        pd_frame = merge_with_job_infos(pd_frame)
+
         pd_frame.to_csv(pd_csv, index=False, float_format="%.30f")
 
         json_snapshot = ax_client.to_json_snapshot()

{omniopt2-7327.dist-info → omniopt2-7333.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7327
+Version: 7333
 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-7327.dist-info → omniopt2-7333.dist-info}/RECORD

@@ -3,7 +3,7 @@
 .general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
 .gitignore,sha256=OMaFWOR6wxjAlI85rF3euQcjQFFAl1F34abZkltKnaU,3714
 .helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-.omniopt.py,sha256=pTeNdXT9Jk_LBnzJr2KY4WBn7MCtLDKlO7QJSzMchhI,403521
+.omniopt.py,sha256=_dpoeqUmcAR1OCwej0E-rp9TxSWTnYqbrGOsQ_1j23k,405225
 .omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
 .omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
 .omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
@@ -26,44 +26,44 @@ omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
 omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
 omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
 omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-pyproject.toml,sha256=1bs0Qc5wiy5UlrkWH3V79IXcZwmCTJmG3gOf0ir9uyE,397
+pyproject.toml,sha256=FDZUg-McrX0S5yw0DN4Igd3EridRU-_qDcEBZS6g5lM,397
 requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
-omniopt2-7327.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
-omniopt2-7327.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7327.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-omniopt2-7327.data/data/bin/.omniopt.py,sha256=pTeNdXT9Jk_LBnzJr2KY4WBn7MCtLDKlO7QJSzMchhI,403521
-omniopt2-7327.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7327.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7327.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7327.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7327.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7327.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7327.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7327.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7327.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7327.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7327.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7327.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
-omniopt2-7327.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
-omniopt2-7327.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7327.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7327.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
-omniopt2-7327.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7327.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7327.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7327.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-omniopt2-7327.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
-omniopt2-7327.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7327.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
-omniopt2-7327.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=1HbZK0KjNu3QDiYuYSKpz5QIqSZAuzExJ45vN0yQ-88,5902
+omniopt2-7333.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
+omniopt2-7333.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7333.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
+omniopt2-7333.data/data/bin/.omniopt.py,sha256=_dpoeqUmcAR1OCwej0E-rp9TxSWTnYqbrGOsQ_1j23k,405225
+omniopt2-7333.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7333.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7333.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7333.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7333.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7333.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7333.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7333.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7333.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7333.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7333.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7333.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
+omniopt2-7333.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
+omniopt2-7333.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7333.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7333.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
+omniopt2-7333.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7333.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7333.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7333.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
+omniopt2-7333.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
+omniopt2-7333.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7333.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
+omniopt2-7333.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=DUS7oEwBEx1VJsilb67BXuaxKozDO2KGhfORak64qUk,5902
 omniopt2.egg-info/SOURCES.txt,sha256=N-HtSaaqFRsd4XqAfeWVSp__3I-sw0d7cknJgyewRwQ,778
 omniopt2.egg-info/dependency_links.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 omniopt2.egg-info/requires.txt,sha256=zqX3ukwAugAeeTE49b6azubs1Gx8T-8D_fJEsKl_cBY,807
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7327.dist-info/METADATA,sha256=1HbZK0KjNu3QDiYuYSKpz5QIqSZAuzExJ45vN0yQ-88,5902
-omniopt2-7327.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7327.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7327.dist-info/RECORD,,
+omniopt2-7333.dist-info/METADATA,sha256=DUS7oEwBEx1VJsilb67BXuaxKozDO2KGhfORak64qUk,5902
+omniopt2-7333.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7333.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7333.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7327
+Version: 7333
 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

pyproject.toml

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