PyPI - omniopt2 - Versions diffs - 7018__py3-none-any.whl → 7024__py3-none-any.whl - Mend

omniopt2 7018py3-none-any.whl → 7024py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

.omniopt.py CHANGED Viewed

@@ -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)
@@ -6948,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,
@@ -9247,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-7018.data → omniopt2-7024.data}/data/bin/.omniopt.py RENAMED Viewed

@@ -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)
@@ -6948,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,
@@ -9247,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-7018.dist-info → omniopt2-7024.dist-info}/METADATA RENAMED Viewed

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

@@ -3,7 +3,7 @@
 .general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
 .gitignore,sha256=OMaFWOR6wxjAlI85rF3euQcjQFFAl1F34abZkltKnaU,3714
 .helpers.py,sha256=srrRn0QBzG8JpNbHAYG2k1rQY6JYrUrNdTj-tDMJSyg,30526
-.omniopt.py,sha256=zVDv7PsvFP68XEgFBKTh_2lX3irOlPMMNnPja6cVSSQ,372670
+.omniopt.py,sha256=kHVrafvaD-9u3Zs9HlY-FDZqyNBtWLj-mbZa_5Dt7b0,372493
 .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
@@ -25,43 +25,43 @@ omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
 omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
 omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
 omniopt_share,sha256=7g5I7YdoWcA6_GDwWwq0xPf23qiVc_VDrm9ySLH7SH0,14051
-pyproject.toml,sha256=EdQRF7D2szxmgL6zPYvjkUBQL1kyE4NeNB05xKPp5Bs,397
+pyproject.toml,sha256=oo5DxjITOUe5Qf98lSJilK2Qk_QZ7HDx80i7gDXrkgo,397
 requirements.txt,sha256=gj9r1kqJK9w1q6YJuViWlq7U0GZf5SOYVO1Ndcy24L0,280
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=dnCbKmKalrVzNZ_-iQWf1xCxcnDsdGuhbDAr9XlGm-U,477
-omniopt2-7018.data/data/bin/.colorfunctions.sh,sha256=CDlgjwrsrHR_E6c-Qak5wZlotArXm-nf9sVvXePzGZA,1083
-omniopt2-7018.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7018.data/data/bin/.helpers.py,sha256=srrRn0QBzG8JpNbHAYG2k1rQY6JYrUrNdTj-tDMJSyg,30526
-omniopt2-7018.data/data/bin/.omniopt.py,sha256=zVDv7PsvFP68XEgFBKTh_2lX3irOlPMMNnPja6cVSSQ,372670
-omniopt2-7018.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7018.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7018.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7018.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7018.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7018.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7018.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7018.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7018.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7018.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7018.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7018.data/data/bin/.shellscript_functions,sha256=7IjirQJpC7TCRPuRj1dO2W6A8h5cHt0dVzj6eH_2EiQ,14664
-omniopt2-7018.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7018.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7018.data/data/bin/omniopt,sha256=RIi0yZALrZGefiejun1fkDJ0LX95WymXd2xZFlglMsQ,48072
-omniopt2-7018.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7018.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7018.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7018.data/data/bin/omniopt_share,sha256=7g5I7YdoWcA6_GDwWwq0xPf23qiVc_VDrm9ySLH7SH0,14051
-omniopt2-7018.data/data/bin/requirements.txt,sha256=gj9r1kqJK9w1q6YJuViWlq7U0GZf5SOYVO1Ndcy24L0,280
-omniopt2-7018.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7018.data/data/bin/test_requirements.txt,sha256=dnCbKmKalrVzNZ_-iQWf1xCxcnDsdGuhbDAr9XlGm-U,477
-omniopt2-7018.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=14vb6FAPaOdj7WTw0MFL9GrVo451CmK0ZNaa70EYbdY,5792
+omniopt2-7024.data/data/bin/.colorfunctions.sh,sha256=CDlgjwrsrHR_E6c-Qak5wZlotArXm-nf9sVvXePzGZA,1083
+omniopt2-7024.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7024.data/data/bin/.helpers.py,sha256=srrRn0QBzG8JpNbHAYG2k1rQY6JYrUrNdTj-tDMJSyg,30526
+omniopt2-7024.data/data/bin/.omniopt.py,sha256=kHVrafvaD-9u3Zs9HlY-FDZqyNBtWLj-mbZa_5Dt7b0,372493
+omniopt2-7024.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7024.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7024.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7024.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7024.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7024.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7024.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7024.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7024.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7024.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7024.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7024.data/data/bin/.shellscript_functions,sha256=7IjirQJpC7TCRPuRj1dO2W6A8h5cHt0dVzj6eH_2EiQ,14664
+omniopt2-7024.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7024.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7024.data/data/bin/omniopt,sha256=RIi0yZALrZGefiejun1fkDJ0LX95WymXd2xZFlglMsQ,48072
+omniopt2-7024.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7024.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7024.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7024.data/data/bin/omniopt_share,sha256=7g5I7YdoWcA6_GDwWwq0xPf23qiVc_VDrm9ySLH7SH0,14051
+omniopt2-7024.data/data/bin/requirements.txt,sha256=gj9r1kqJK9w1q6YJuViWlq7U0GZf5SOYVO1Ndcy24L0,280
+omniopt2-7024.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7024.data/data/bin/test_requirements.txt,sha256=dnCbKmKalrVzNZ_-iQWf1xCxcnDsdGuhbDAr9XlGm-U,477
+omniopt2-7024.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=KyBh2HUexv30teWUFc0SBiO0oxG0ExhBtRa4HvVJ5qw,5792
 omniopt2.egg-info/SOURCES.txt,sha256=kXBlYs2_3BE6tKUH1egGFa_9X5w8EQ5pm9dKgPEvdhY,770
 omniopt2.egg-info/dependency_links.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 omniopt2.egg-info/requires.txt,sha256=rH_jC1LI0Ch8b5iWYh7EFq1ylyc9uswwZnyPZnlp9Qo,757
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7018.dist-info/METADATA,sha256=14vb6FAPaOdj7WTw0MFL9GrVo451CmK0ZNaa70EYbdY,5792
-omniopt2-7018.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7018.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7018.dist-info/RECORD,,
+omniopt2-7024.dist-info/METADATA,sha256=KyBh2HUexv30teWUFc0SBiO0oxG0ExhBtRa4HvVJ5qw,5792
+omniopt2-7024.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7024.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7024.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO CHANGED Viewed

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

pyproject.toml CHANGED Viewed

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