Skip to content

Commit 6986515

Browse files
sarah-segelsarah-segel
authored
Merge pull request #56 from automl/development
Version 1.1.1
2 parents 5869474 + 4caac3b commit 6986515

File tree

25 files changed

+518
-256
lines changed

25 files changed

+518
-256
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# Version 1.1.1
2+
3+
## Bug-Fixes
4+
- Put in missing "q" values into configspaces to allow using newer ConfigSpace versions.
5+
- Fix minimal configspace version.
6+
- Fixes in make publish command.
7+
18
# Version 1.1
29

310
## Converters

‎Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# These have been configured to only really run short tasks. Longer form tasks
22
# are usually completed in github actions.
33

4+
SHELL := /bin/bash
5+
VERSION := 1.1.1
6+
47
NAME := DeepCAVE
58
PACKAGE_NAME := deepcave
69

@@ -111,15 +114,15 @@ build:
111114
# Will echo the commands to actually publish to be run to publish to actual PyPi
112115
# This is done to prevent accidental publishing but provide the same conveniences
113116
publish: clean build
114-
read -p "Did you update the version number?"
117+
read -p "Did you update the version number in Makefile and deepcave/__init__.py?"
115118

116119
$(PIP) install twine
117120
$(PYTHON) -m twine upload --repository testpypi ${DIST}/*
118121
@echo
119122
@echo "Test with the following:"
120123
@echo "* Create a new virtual environment to install the uplaoded distribution into"
121124
@echo "* Run the following:"
122-
@echo "--- pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ ${NAME}"
125+
@echo "--- pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ ${PACKAGE_NAME}==${VERSION}"
123126
@echo
124127
@echo "* Run this to make sure it can import correctly, plus whatever else you'd like to test:"
125128
@echo "--- python -c 'import ${PACKAGE_NAME}'"

‎deepcave/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Source Code": "https://github.com/automl/deepcave",
1818
}
1919
copyright = f"Copyright {datetime.date.today().strftime('%Y')}, {author}"
20-
version = "1.1"
20+
version = "1.1.1"
2121

2222
_exec_file = sys.argv[0]
2323
_exec_files = ["server.py", "worker.py", "sphinx-build"]

‎logs/BOHB/bohb_1/configspace.json

+20-10
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,44 @@
66
"log": true,
77
"lower": 16,
88
"upper": 128,
9-
"default": 64
9+
"default": 64,
10+
"q": null
1011
},
1112
{
1213
"name": "dropout",
1314
"type": "uniform_float",
1415
"log": false,
1516
"lower": 0.0,
1617
"upper": 0.5,
17-
"default": 0.0
18+
"default": 0.0,
19+
"q": null
1820
},
1921
{
2022
"name": "kernel_size",
2123
"type": "uniform_int",
2224
"log": true,
2325
"lower": 2,
2426
"upper": 16,
25-
"default": 8
27+
"default": 8,
28+
"q": null
2629
},
2730
{
2831
"name": "l2_decay",
2932
"type": "uniform_float",
3033
"log": true,
3134
"lower": 1e-09,
3235
"upper": 0.0001,
33-
"default": 1e-05
36+
"default": 1e-05,
37+
"q": null
3438
},
3539
{
3640
"name": "learning_rate",
3741
"type": "uniform_float",
3842
"log": true,
3943
"lower": 0.0001,
4044
"upper": 0.01,
41-
"default": 0.001
45+
"default": 0.001,
46+
"q": null
4247
},
4348
{
4449
"name": "lr_scheduler",
@@ -56,23 +61,26 @@
5661
"log": false,
5762
"lower": 50,
5863
"upper": 150,
59-
"default": 100
64+
"default": 100,
65+
"q": null
6066
},
6167
{
6268
"name": "num_channels",
6369
"type": "uniform_int",
6470
"log": true,
6571
"lower": 32,
6672
"upper": 512,
67-
"default": 64
73+
"default": 64,
74+
"q": null
6875
},
6976
{
7077
"name": "num_levels",
7178
"type": "uniform_int",
7279
"log": false,
7380
"lower": 1,
7481
"upper": 5,
75-
"default": 3
82+
"default": 3,
83+
"q": null
7684
},
7785
{
7886
"name": "use_augmentation",
@@ -90,15 +98,17 @@
9098
"log": true,
9199
"lower": 1e-09,
92100
"upper": 0.0001,
93-
"default": 1e-05
101+
"default": 1e-05,
102+
"q": null
94103
},
95104
{
96105
"name": "lr_scheduler_tmult",
97106
"type": "uniform_int",
98107
"log": false,
99108
"lower": 1,
100109
"upper": 5,
101-
"default": 1
110+
"default": 1,
111+
"q": null
102112
}
103113
],
104114
"conditions": [

‎logs/BOHB/bohb_2/configspace.json

+20-10
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,44 @@
66
"log": true,
77
"lower": 16,
88
"upper": 128,
9-
"default": 64
9+
"default": 64,
10+
"q": null
1011
},
1112
{
1213
"name": "dropout",
1314
"type": "uniform_float",
1415
"log": false,
1516
"lower": 0.0,
1617
"upper": 0.5,
17-
"default": 0.0
18+
"default": 0.0,
19+
"q": null
1820
},
1921
{
2022
"name": "kernel_size",
2123
"type": "uniform_int",
2224
"log": true,
2325
"lower": 2,
2426
"upper": 16,
25-
"default": 8
27+
"default": 8,
28+
"q": null
2629
},
2730
{
2831
"name": "l2_decay",
2932
"type": "uniform_float",
3033
"log": true,
3134
"lower": 1e-09,
3235
"upper": 0.0001,
33-
"default": 1e-05
36+
"default": 1e-05,
37+
"q": null
3438
},
3539
{
3640
"name": "learning_rate",
3741
"type": "uniform_float",
3842
"log": true,
3943
"lower": 0.0001,
4044
"upper": 0.01,
41-
"default": 0.001
45+
"default": 0.001,
46+
"q": null
4247
},
4348
{
4449
"name": "lr_scheduler",
@@ -56,23 +61,26 @@
5661
"log": false,
5762
"lower": 50,
5863
"upper": 150,
59-
"default": 100
64+
"default": 100,
65+
"q": null
6066
},
6167
{
6268
"name": "num_channels",
6369
"type": "uniform_int",
6470
"log": true,
6571
"lower": 32,
6672
"upper": 512,
67-
"default": 64
73+
"default": 64,
74+
"q": null
6875
},
6976
{
7077
"name": "num_levels",
7178
"type": "uniform_int",
7279
"log": false,
7380
"lower": 1,
7481
"upper": 5,
75-
"default": 3
82+
"default": 3,
83+
"q": null
7684
},
7785
{
7886
"name": "use_augmentation",
@@ -90,15 +98,17 @@
9098
"log": true,
9199
"lower": 1e-09,
92100
"upper": 0.0001,
93-
"default": 1e-05
101+
"default": 1e-05,
102+
"q": null
94103
},
95104
{
96105
"name": "lr_scheduler_tmult",
97106
"type": "uniform_int",
98107
"log": false,
99108
"lower": 1,
100109
"upper": 5,
101-
"default": 1
110+
"default": 1,
111+
"q": null
102112
}
103113
],
104114
"conditions": [

‎logs/DeepCAVE/digits_sklearn/run_1/configspace.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,35 @@
1717
"log": false,
1818
"lower": 1,
1919
"upper": 100,
20-
"default": 50
20+
"default": 50,
21+
"q": null
2122
},
2223
{
2324
"name": "learning_rate",
2425
"type": "uniform_float",
2526
"log": true,
2627
"lower": 0.0001,
2728
"upper": 0.1,
28-
"default": 0.0031622777
29+
"default": 0.0031622777,
30+
"q": null
2931
},
3032
{
3133
"name": "num_neurons_layer1",
3234
"type": "uniform_int",
3335
"log": false,
3436
"lower": 5,
3537
"upper": 100,
36-
"default": 52
38+
"default": 52,
39+
"q": null
3740
},
3841
{
3942
"name": "num_neurons_layer2",
4043
"type": "uniform_int",
4144
"log": false,
4245
"lower": 5,
4346
"upper": 100,
44-
"default": 52
47+
"default": 52,
48+
"q": null
4549
},
4650
{
4751
"name": "solver",

‎logs/DeepCAVE/digits_sklearn/run_2/configspace.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,35 @@
1717
"log": false,
1818
"lower": 1,
1919
"upper": 100,
20-
"default": 50
20+
"default": 50,
21+
"q": null
2122
},
2223
{
2324
"name": "learning_rate",
2425
"type": "uniform_float",
2526
"log": true,
2627
"lower": 0.0001,
2728
"upper": 0.1,
28-
"default": 0.0031622777
29+
"default": 0.0031622777,
30+
"q": null
2931
},
3032
{
3133
"name": "num_neurons_layer1",
3234
"type": "uniform_int",
3335
"log": false,
3436
"lower": 5,
3537
"upper": 100,
36-
"default": 52
38+
"default": 52,
39+
"q": null
3740
},
3841
{
3942
"name": "num_neurons_layer2",
4043
"type": "uniform_int",
4144
"log": false,
4245
"lower": 5,
4346
"upper": 100,
44-
"default": 52
47+
"default": 52,
48+
"q": null
4549
},
4650
{
4751
"name": "solver",

‎logs/DeepCAVE/digits_sklearn/run_3/configspace.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,35 @@
1717
"log": false,
1818
"lower": 1,
1919
"upper": 100,
20-
"default": 50
20+
"default": 50,
21+
"q": null
2122
},
2223
{
2324
"name": "learning_rate",
2425
"type": "uniform_float",
2526
"log": true,
2627
"lower": 0.0001,
2728
"upper": 0.1,
28-
"default": 0.0031622777
29+
"default": 0.0031622777,
30+
"q": null
2931
},
3032
{
3133
"name": "num_neurons_layer1",
3234
"type": "uniform_int",
3335
"log": false,
3436
"lower": 5,
3537
"upper": 100,
36-
"default": 52
38+
"default": 52,
39+
"q": null
3740
},
3841
{
3942
"name": "num_neurons_layer2",
4043
"type": "uniform_int",
4144
"log": false,
4245
"lower": 5,
4346
"upper": 100,
44-
"default": 52
47+
"default": 52,
48+
"q": null
4549
},
4650
{
4751
"name": "solver",

‎logs/DeepCAVE/minimal/run_1/configspace.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,26 @@
66
"log": false,
77
"lower": 0.0,
88
"upper": 1.0,
9-
"default": 0.5
9+
"default": 0.5,
10+
"q": null
1011
},
1112
{
1213
"name": "beta",
1314
"type": "uniform_float",
1415
"log": false,
1516
"lower": 0.0,
1617
"upper": 1.0,
17-
"default": 0.5
18+
"default": 0.5,
19+
"q": null
1820
},
1921
{
2022
"name": "gamma",
2123
"type": "uniform_float",
2224
"log": false,
2325
"lower": 0.0,
2426
"upper": 1.0,
25-
"default": 0.5
27+
"default": 0.5,
28+
"q": null
2629
}
2730
],
2831
"conditions": [],

0 commit comments

Comments
 (0)