Skip to content

Commit 535a41e

Browse files
bartzbeielsteinbartzbeielstein
committed
0.9.9
set_control_key arguments hyperdict cleanup
1 parent bdcf3e5 commit 535a41e

5 files changed

Lines changed: 82 additions & 270 deletions

File tree

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
77

88
[project]
99
name = "spotPython"
10-
version = "0.9.8"
10+
version = "0.9.9"
1111
authors = [
1212
{ name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
1313
]

‎src/spotPython/hyperdict/light_hyper_dict.json‎

Lines changed: 50 additions & 238 deletions
Original file line numberDiff line numberDiff line change
@@ -1,234 +1,80 @@
1-
{
2-
"NetLightRegression":
3-
{
1+
{
2+
"NetLightRegression": {
43
"l1": {
54
"type": "int",
65
"default": 3,
76
"transform": "transform_power_2_int",
87
"lower": 3,
9-
"upper": 8},
8+
"upper": 8
9+
},
1010
"epochs": {
11-
"type": "int",
12-
"default": 4,
13-
"transform": "transform_power_2_int",
14-
"lower": 4,
15-
"upper": 9},
16-
"batch_size": {
17-
"type": "int",
18-
"default": 4,
19-
"transform": "transform_power_2_int",
20-
"lower": 1,
21-
"upper": 4},
22-
"act_fn": {
23-
"levels": ["Sigmoid",
24-
"Tanh",
25-
"ReLU",
26-
"LeakyReLU",
27-
"ELU",
28-
"Swish"],
29-
"type": "factor",
30-
"default": "ReLU",
31-
"transform": "None",
32-
"class_name": "spotPython.torch.activation",
33-
"core_model_parameter_type": "instance()",
34-
"lower": 0,
35-
"upper": 5},
36-
"optimizer": {
37-
"levels": ["Adadelta",
38-
"Adagrad",
39-
"Adam",
40-
"AdamW",
41-
"SparseAdam",
42-
"Adamax",
43-
"ASGD",
44-
"NAdam",
45-
"RAdam",
46-
"RMSprop",
47-
"Rprop",
48-
"SGD"],
49-
"type": "factor",
50-
"default": "SGD",
51-
"transform": "None",
52-
"class_name": "torch.optim",
53-
"core_model_parameter_type": "str",
54-
"lower": 0,
55-
"upper": 11},
56-
"dropout_prob": {
57-
"type": "float",
58-
"default": 0.01,
59-
"transform": "None",
60-
"lower": 0.0,
61-
"upper": 0.25},
62-
"lr_mult": {
63-
"type": "float",
64-
"default": 1.0,
65-
"transform": "None",
66-
"lower": 0.1,
67-
"upper": 10.0},
68-
"patience": {
6911
"type": "int",
70-
"default": 2,
12+
"default": 4,
7113
"transform": "transform_power_2_int",
72-
"lower": 2,
73-
"upper": 6
14+
"lower": 4,
15+
"upper": 9
7416
},
75-
"initialization": {
76-
"levels": ["Default", "Kaiming", "Xavier"],
77-
"type": "factor",
78-
"default": "Default",
79-
"transform": "None",
80-
"core_model_parameter_type": "str",
81-
"lower": 0,
82-
"upper": 2}
83-
},
84-
"NetLinearBase":
85-
{
86-
"l1": {
87-
"type": "int",
88-
"default": 3,
89-
"transform": "transform_power_2_int",
90-
"lower": 3,
91-
"upper": 8},
92-
"epochs": {
17+
"batch_size": {
9318
"type": "int",
9419
"default": 4,
9520
"transform": "transform_power_2_int",
96-
"lower": 4,
97-
"upper": 9},
98-
"batch_size": {
99-
"type": "int",
100-
"default": 4,
101-
"transform": "transform_power_2_int",
102-
"lower": 1,
103-
"upper": 4},
104-
"act_fn": {
105-
"levels": ["Sigmoid",
106-
"Tanh",
107-
"ReLU",
108-
"LeakyReLU",
109-
"ELU",
110-
"Swish"],
21+
"lower": 1,
22+
"upper": 4
23+
},
24+
"act_fn": {
25+
"levels": [
26+
"Sigmoid",
27+
"Tanh",
28+
"ReLU",
29+
"LeakyReLU",
30+
"ELU",
31+
"Swish"
32+
],
11133
"type": "factor",
11234
"default": "ReLU",
11335
"transform": "None",
11436
"class_name": "spotPython.torch.activation",
11537
"core_model_parameter_type": "instance()",
11638
"lower": 0,
117-
"upper": 5},
118-
"optimizer": {
119-
"levels": ["Adadelta",
120-
"Adagrad",
121-
"Adam",
122-
"AdamW",
123-
"SparseAdam",
124-
"Adamax",
125-
"ASGD",
126-
"NAdam",
127-
"RAdam",
128-
"RMSprop",
129-
"Rprop",
130-
"SGD"],
131-
"type": "factor",
132-
"default": "SGD",
133-
"transform": "None",
134-
"class_name": "torch.optim",
135-
"core_model_parameter_type": "str",
136-
"lower": 0,
137-
"upper": 11},
138-
"dropout_prob": {
139-
"type": "float",
140-
"default": 0.01,
141-
"transform": "None",
142-
"lower": 0.0,
143-
"upper": 0.25},
144-
"lr_mult": {
145-
"type": "float",
146-
"default": 1.0,
147-
"transform": "None",
148-
"lower": 0.1,
149-
"upper": 10.0},
150-
"patience": {
151-
"type": "int",
152-
"default": 2,
153-
"transform": "transform_power_2_int",
154-
"lower": 2,
155-
"upper": 6
156-
},
157-
"initialization": {
158-
"levels": ["Default", "Kaiming", "Xavier"],
159-
"type": "factor",
160-
"default": "Default",
161-
"transform": "None",
162-
"core_model_parameter_type": "str",
163-
"lower": 0,
164-
"upper": 2}
165-
},
166-
"NetLightBase":
167-
{
168-
"l1": {
169-
"type": "int",
170-
"default": 3,
171-
"transform": "transform_power_2_int",
172-
"lower": 3,
173-
"upper": 8},
174-
"epochs": {
175-
"type": "int",
176-
"default": 4,
177-
"transform": "transform_power_2_int",
178-
"lower": 4,
179-
"upper": 9},
180-
"batch_size": {
181-
"type": "int",
182-
"default": 4,
183-
"transform": "transform_power_2_int",
184-
"lower": 1,
185-
"upper": 4},
186-
"act_fn": {
187-
"levels": ["Sigmoid",
188-
"Tanh",
189-
"ReLU",
190-
"LeakyReLU",
191-
"ELU",
192-
"Swish"],
193-
"type": "factor",
194-
"default": "ReLU",
195-
"transform": "None",
196-
"class_name": "spotPython.torch.activation",
197-
"core_model_parameter_type": "instance()",
198-
"lower": 0,
199-
"upper": 5},
39+
"upper": 5
40+
},
20041
"optimizer": {
201-
"levels": ["Adadelta",
202-
"Adagrad",
203-
"Adam",
204-
"AdamW",
205-
"SparseAdam",
206-
"Adamax",
207-
"ASGD",
208-
"NAdam",
209-
"RAdam",
210-
"RMSprop",
211-
"Rprop",
212-
"SGD"],
42+
"levels": [
43+
"Adadelta",
44+
"Adagrad",
45+
"Adam",
46+
"AdamW",
47+
"SparseAdam",
48+
"Adamax",
49+
"ASGD",
50+
"NAdam",
51+
"RAdam",
52+
"RMSprop",
53+
"Rprop",
54+
"SGD"
55+
],
21356
"type": "factor",
21457
"default": "SGD",
21558
"transform": "None",
21659
"class_name": "torch.optim",
21760
"core_model_parameter_type": "str",
21861
"lower": 0,
219-
"upper": 11},
62+
"upper": 11
63+
},
22064
"dropout_prob": {
22165
"type": "float",
22266
"default": 0.01,
22367
"transform": "None",
22468
"lower": 0.0,
225-
"upper": 0.25},
69+
"upper": 0.25
70+
},
22671
"lr_mult": {
22772
"type": "float",
22873
"default": 1.0,
22974
"transform": "None",
23075
"lower": 0.1,
231-
"upper": 10.0},
76+
"upper": 10.0
77+
},
23278
"patience": {
23379
"type": "int",
23480
"default": 2,
@@ -237,51 +83,17 @@
23783
"upper": 6
23884
},
23985
"initialization": {
240-
"levels": ["Default", "Kaiming", "Xavier"],
86+
"levels": [
87+
"Default",
88+
"Kaiming",
89+
"Xavier"
90+
],
24191
"type": "factor",
24292
"default": "Default",
24393
"transform": "None",
24494
"core_model_parameter_type": "str",
24595
"lower": 0,
246-
"upper": 2}
247-
},
248-
"LitModel":
249-
{
250-
"l1": {
251-
"type": "int",
252-
"default": 3,
253-
"transform": "transform_power_2_int",
254-
"lower": 3,
255-
"upper": 8},
256-
"epochs": {
257-
"type": "int",
258-
"default": 4,
259-
"transform": "transform_power_2_int",
260-
"lower": 4,
261-
"upper": 9},
262-
"batch_size": {
263-
"type": "int",
264-
"default": 4,
265-
"transform": "transform_power_2_int",
266-
"lower": 1,
267-
"upper": 4},
268-
"act_fn": {
269-
"levels": ["ReLU"],
270-
"type": "factor",
271-
"default": "ReLU",
272-
"transform": "None",
273-
"class_name": "torch.nn",
274-
"core_model_parameter_type": "instance()",
275-
"lower": 0,
276-
"upper": 0},
277-
"optimizer": {
278-
"levels": ["Adadelta", "Adagrad", "Adam", "AdamW", "SparseAdam", "Adamax", "ASGD", "NAdam", "RAdam", "RMSprop", "Rprop", "SGD"],
279-
"type": "factor",
280-
"default": "SGD",
281-
"transform": "None",
282-
"class_name": "torch.optim",
283-
"core_model_parameter_type": "str",
284-
"lower": 0,
285-
"upper": 11}
96+
"upper": 2
97+
}
28698
}
287-
}
99+
}

0 commit comments

Comments
 (0)