omniopt2 7345__py3-none-any.whl → 7347__py3-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.
- .tpe.py +14 -7
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.tpe.py +14 -7
- {omniopt2-7345.dist-info → omniopt2-7347.dist-info}/METADATA +1 -1
- {omniopt2-7345.dist-info → omniopt2-7347.dist-info}/RECORD +35 -35
- omniopt2.egg-info/PKG-INFO +1 -1
- pyproject.toml +1 -1
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.colorfunctions.sh +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.general.sh +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.helpers.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_cpu_ram_usage.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_general.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_gpu_usage.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_kde.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_scatter.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_scatter_generation_method.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_scatter_hex.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_time_and_exit_code.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_trial_index_result.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_worker.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.random_generator.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/.shellscript_functions +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/LICENSE +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/apt-dependencies.txt +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/omniopt +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/omniopt_docker +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/omniopt_evaluate +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/omniopt_plot +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/omniopt_share +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/requirements.txt +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/setup.py +0 -0
- {omniopt2-7345.data → omniopt2-7347.data}/data/bin/test_requirements.txt +0 -0
- {omniopt2-7345.dist-info → omniopt2-7347.dist-info}/WHEEL +0 -0
- {omniopt2-7345.dist-info → omniopt2-7347.dist-info}/licenses/LICENSE +0 -0
- {omniopt2-7345.dist-info → omniopt2-7347.dist-info}/top_level.txt +0 -0
.tpe.py
CHANGED
@@ -6,6 +6,12 @@ from typing import Optional
|
|
6
6
|
try:
|
7
7
|
import optuna
|
8
8
|
from optuna.trial import create_trial
|
9
|
+
|
10
|
+
from optuna.distributions import (
|
11
|
+
BaseDistribution,
|
12
|
+
IntUniformDistribution,
|
13
|
+
FloatDistribution, # Optuna ≥3.6
|
14
|
+
)
|
9
15
|
except ModuleNotFoundError:
|
10
16
|
print("Optuna not found. Cannot continue.")
|
11
17
|
sys.exit(1)
|
@@ -121,8 +127,8 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
|
|
121
127
|
|
122
128
|
final_value = result_dict[result_key]
|
123
129
|
|
124
|
-
trial_params = {}
|
125
|
-
trial_distributions = {}
|
130
|
+
trial_params: dict[str, object] = {}
|
131
|
+
trial_distributions: dict[str, BaseDistribution] = {} # 👈 explicit & correct
|
126
132
|
|
127
133
|
for name, p in parameters.items():
|
128
134
|
value = param_dict[name]
|
@@ -131,26 +137,27 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
|
|
131
137
|
trial_params[name] = value
|
132
138
|
continue
|
133
139
|
|
140
|
+
dist: BaseDistribution
|
134
141
|
if p["parameter_type"] == "RANGE":
|
135
142
|
if p["type"] == "INT":
|
136
|
-
dist =
|
143
|
+
dist = IntUniformDistribution(p["range"][0], p["range"][1])
|
137
144
|
elif p["type"] == "FLOAT":
|
138
|
-
|
145
|
+
# pick the right class for your Optuna version
|
146
|
+
dist = FloatDistribution(p["range"][0], p["range"][1])
|
139
147
|
else:
|
140
148
|
continue
|
141
|
-
|
142
149
|
elif p["parameter_type"] == "CHOICE":
|
143
150
|
dist = optuna.distributions.CategoricalDistribution(p["values"])
|
144
151
|
else:
|
145
152
|
continue
|
146
153
|
|
147
154
|
trial_params[name] = value
|
148
|
-
trial_distributions[name] = dist
|
155
|
+
trial_distributions[name] = dist # keys are str, values are BaseDistribution
|
149
156
|
|
150
157
|
study.add_trial(
|
151
158
|
create_trial(
|
152
159
|
params=trial_params,
|
153
|
-
distributions=trial_distributions,
|
160
|
+
distributions=trial_distributions, # ✅ mypy is happy now
|
154
161
|
value=final_value
|
155
162
|
)
|
156
163
|
)
|
@@ -6,6 +6,12 @@ from typing import Optional
|
|
6
6
|
try:
|
7
7
|
import optuna
|
8
8
|
from optuna.trial import create_trial
|
9
|
+
|
10
|
+
from optuna.distributions import (
|
11
|
+
BaseDistribution,
|
12
|
+
IntUniformDistribution,
|
13
|
+
FloatDistribution, # Optuna ≥3.6
|
14
|
+
)
|
9
15
|
except ModuleNotFoundError:
|
10
16
|
print("Optuna not found. Cannot continue.")
|
11
17
|
sys.exit(1)
|
@@ -121,8 +127,8 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
|
|
121
127
|
|
122
128
|
final_value = result_dict[result_key]
|
123
129
|
|
124
|
-
trial_params = {}
|
125
|
-
trial_distributions = {}
|
130
|
+
trial_params: dict[str, object] = {}
|
131
|
+
trial_distributions: dict[str, BaseDistribution] = {} # 👈 explicit & correct
|
126
132
|
|
127
133
|
for name, p in parameters.items():
|
128
134
|
value = param_dict[name]
|
@@ -131,26 +137,27 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
|
|
131
137
|
trial_params[name] = value
|
132
138
|
continue
|
133
139
|
|
140
|
+
dist: BaseDistribution
|
134
141
|
if p["parameter_type"] == "RANGE":
|
135
142
|
if p["type"] == "INT":
|
136
|
-
dist =
|
143
|
+
dist = IntUniformDistribution(p["range"][0], p["range"][1])
|
137
144
|
elif p["type"] == "FLOAT":
|
138
|
-
|
145
|
+
# pick the right class for your Optuna version
|
146
|
+
dist = FloatDistribution(p["range"][0], p["range"][1])
|
139
147
|
else:
|
140
148
|
continue
|
141
|
-
|
142
149
|
elif p["parameter_type"] == "CHOICE":
|
143
150
|
dist = optuna.distributions.CategoricalDistribution(p["values"])
|
144
151
|
else:
|
145
152
|
continue
|
146
153
|
|
147
154
|
trial_params[name] = value
|
148
|
-
trial_distributions[name] = dist
|
155
|
+
trial_distributions[name] = dist # keys are str, values are BaseDistribution
|
149
156
|
|
150
157
|
study.add_trial(
|
151
158
|
create_trial(
|
152
159
|
params=trial_params,
|
153
|
-
distributions=trial_distributions,
|
160
|
+
distributions=trial_distributions, # ✅ mypy is happy now
|
154
161
|
value=final_value
|
155
162
|
)
|
156
163
|
)
|
@@ -16,7 +16,7 @@
|
|
16
16
|
.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
|
17
17
|
.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
|
18
18
|
.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
|
19
|
-
.tpe.py,sha256=
|
19
|
+
.tpe.py,sha256=sAG3Xf1mAyCmEIMwnNAXrVCdKgx-uTIYRd-piEisJkU,6817
|
20
20
|
LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
21
21
|
MANIFEST.in,sha256=L3QBXyL1TtyWxbAPsfjZdCfpeBrRuI5MSgdnvwdQ22Q,24
|
22
22
|
README.md,sha256=ImtT_VuWENewZKkJySRL_qpbHbs0pr6Xgs_n9HURg90,3332
|
@@ -26,44 +26,44 @@ omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
|
|
26
26
|
omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
|
27
27
|
omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
|
28
28
|
omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
|
29
|
-
pyproject.toml,sha256=
|
29
|
+
pyproject.toml,sha256=1ZnnbUcoG1ETdDECtWDJ7BcFCuwOc-GON3UZX7knytk,397
|
30
30
|
requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
|
31
31
|
setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
|
32
32
|
test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
|
33
|
-
omniopt2-
|
34
|
-
omniopt2-
|
35
|
-
omniopt2-
|
36
|
-
omniopt2-
|
37
|
-
omniopt2-
|
38
|
-
omniopt2-
|
39
|
-
omniopt2-
|
40
|
-
omniopt2-
|
41
|
-
omniopt2-
|
42
|
-
omniopt2-
|
43
|
-
omniopt2-
|
44
|
-
omniopt2-
|
45
|
-
omniopt2-
|
46
|
-
omniopt2-
|
47
|
-
omniopt2-
|
48
|
-
omniopt2-
|
49
|
-
omniopt2-
|
50
|
-
omniopt2-
|
51
|
-
omniopt2-
|
52
|
-
omniopt2-
|
53
|
-
omniopt2-
|
54
|
-
omniopt2-
|
55
|
-
omniopt2-
|
56
|
-
omniopt2-
|
57
|
-
omniopt2-
|
58
|
-
omniopt2-
|
59
|
-
omniopt2-
|
60
|
-
omniopt2-
|
61
|
-
omniopt2.egg-info/PKG-INFO,sha256=
|
33
|
+
omniopt2-7347.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
|
34
|
+
omniopt2-7347.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
|
35
|
+
omniopt2-7347.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
|
36
|
+
omniopt2-7347.data/data/bin/.omniopt.py,sha256=djK2lVN3k8_Di-aKx-sYcOrV6EhXtFnf4K7BBwLVZKw,408183
|
37
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
|
38
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
|
39
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
|
40
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
|
41
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
|
42
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
|
43
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
|
44
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
|
45
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
|
46
|
+
omniopt2-7347.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
|
47
|
+
omniopt2-7347.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
|
48
|
+
omniopt2-7347.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
|
49
|
+
omniopt2-7347.data/data/bin/.tpe.py,sha256=sAG3Xf1mAyCmEIMwnNAXrVCdKgx-uTIYRd-piEisJkU,6817
|
50
|
+
omniopt2-7347.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
51
|
+
omniopt2-7347.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
|
52
|
+
omniopt2-7347.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
|
53
|
+
omniopt2-7347.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
|
54
|
+
omniopt2-7347.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
|
55
|
+
omniopt2-7347.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
|
56
|
+
omniopt2-7347.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
|
57
|
+
omniopt2-7347.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
|
58
|
+
omniopt2-7347.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
|
59
|
+
omniopt2-7347.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
|
60
|
+
omniopt2-7347.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
61
|
+
omniopt2.egg-info/PKG-INFO,sha256=1s8UE2LvXqpTMlgj20QKI8Hrsi3GAojGyV0r9p2NVNY,5902
|
62
62
|
omniopt2.egg-info/SOURCES.txt,sha256=N-HtSaaqFRsd4XqAfeWVSp__3I-sw0d7cknJgyewRwQ,778
|
63
63
|
omniopt2.egg-info/dependency_links.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
64
64
|
omniopt2.egg-info/requires.txt,sha256=zqX3ukwAugAeeTE49b6azubs1Gx8T-8D_fJEsKl_cBY,807
|
65
65
|
omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
66
|
-
omniopt2-
|
67
|
-
omniopt2-
|
68
|
-
omniopt2-
|
69
|
-
omniopt2-
|
66
|
+
omniopt2-7347.dist-info/METADATA,sha256=1s8UE2LvXqpTMlgj20QKI8Hrsi3GAojGyV0r9p2NVNY,5902
|
67
|
+
omniopt2-7347.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
68
|
+
omniopt2-7347.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
69
|
+
omniopt2-7347.dist-info/RECORD,,
|
omniopt2.egg-info/PKG-INFO
CHANGED
pyproject.toml
CHANGED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{omniopt2-7345.data → omniopt2-7347.data}/data/bin/.omniopt_plot_scatter_generation_method.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|