Skip to content

Commit

Permalink
Merge pull request #56 from automl/development
Browse files Browse the repository at this point in the history
Version 1.1.1
  • Loading branch information
sarah-segel authored Jun 28, 2023
2 parents 5869474 + 4caac3b commit 6986515
Show file tree
Hide file tree
Showing 25 changed files with 518 additions and 256 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Version 1.1.1

## Bug-Fixes
- Put in missing "q" values into configspaces to allow using newer ConfigSpace versions.
- Fix minimal configspace version.
- Fixes in make publish command.

# Version 1.1

## Converters
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# These have been configured to only really run short tasks. Longer form tasks
# are usually completed in github actions.

SHELL := /bin/bash
VERSION := 1.1.1

NAME := DeepCAVE
PACKAGE_NAME := deepcave

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

$(PIP) install twine
$(PYTHON) -m twine upload --repository testpypi ${DIST}/*
@echo
@echo "Test with the following:"
@echo "* Create a new virtual environment to install the uplaoded distribution into"
@echo "* Run the following:"
@echo "--- pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ ${NAME}"
@echo "--- pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ ${PACKAGE_NAME}==${VERSION}"
@echo
@echo "* Run this to make sure it can import correctly, plus whatever else you'd like to test:"
@echo "--- python -c 'import ${PACKAGE_NAME}'"
Expand Down
2 changes: 1 addition & 1 deletion deepcave/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Source Code": "https://github.com/automl/deepcave",
}
copyright = f"Copyright {datetime.date.today().strftime('%Y')}, {author}"
version = "1.1"
version = "1.1.1"

_exec_file = sys.argv[0]
_exec_files = ["server.py", "worker.py", "sphinx-build"]
Expand Down
30 changes: 20 additions & 10 deletions logs/BOHB/bohb_1/configspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,44 @@
"log": true,
"lower": 16,
"upper": 128,
"default": 64
"default": 64,
"q": null
},
{
"name": "dropout",
"type": "uniform_float",
"log": false,
"lower": 0.0,
"upper": 0.5,
"default": 0.0
"default": 0.0,
"q": null
},
{
"name": "kernel_size",
"type": "uniform_int",
"log": true,
"lower": 2,
"upper": 16,
"default": 8
"default": 8,
"q": null
},
{
"name": "l2_decay",
"type": "uniform_float",
"log": true,
"lower": 1e-09,
"upper": 0.0001,
"default": 1e-05
"default": 1e-05,
"q": null
},
{
"name": "learning_rate",
"type": "uniform_float",
"log": true,
"lower": 0.0001,
"upper": 0.01,
"default": 0.001
"default": 0.001,
"q": null
},
{
"name": "lr_scheduler",
Expand All @@ -56,23 +61,26 @@
"log": false,
"lower": 50,
"upper": 150,
"default": 100
"default": 100,
"q": null
},
{
"name": "num_channels",
"type": "uniform_int",
"log": true,
"lower": 32,
"upper": 512,
"default": 64
"default": 64,
"q": null
},
{
"name": "num_levels",
"type": "uniform_int",
"log": false,
"lower": 1,
"upper": 5,
"default": 3
"default": 3,
"q": null
},
{
"name": "use_augmentation",
Expand All @@ -90,15 +98,17 @@
"log": true,
"lower": 1e-09,
"upper": 0.0001,
"default": 1e-05
"default": 1e-05,
"q": null
},
{
"name": "lr_scheduler_tmult",
"type": "uniform_int",
"log": false,
"lower": 1,
"upper": 5,
"default": 1
"default": 1,
"q": null
}
],
"conditions": [
Expand Down
30 changes: 20 additions & 10 deletions logs/BOHB/bohb_2/configspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,44 @@
"log": true,
"lower": 16,
"upper": 128,
"default": 64
"default": 64,
"q": null
},
{
"name": "dropout",
"type": "uniform_float",
"log": false,
"lower": 0.0,
"upper": 0.5,
"default": 0.0
"default": 0.0,
"q": null
},
{
"name": "kernel_size",
"type": "uniform_int",
"log": true,
"lower": 2,
"upper": 16,
"default": 8
"default": 8,
"q": null
},
{
"name": "l2_decay",
"type": "uniform_float",
"log": true,
"lower": 1e-09,
"upper": 0.0001,
"default": 1e-05
"default": 1e-05,
"q": null
},
{
"name": "learning_rate",
"type": "uniform_float",
"log": true,
"lower": 0.0001,
"upper": 0.01,
"default": 0.001
"default": 0.001,
"q": null
},
{
"name": "lr_scheduler",
Expand All @@ -56,23 +61,26 @@
"log": false,
"lower": 50,
"upper": 150,
"default": 100
"default": 100,
"q": null
},
{
"name": "num_channels",
"type": "uniform_int",
"log": true,
"lower": 32,
"upper": 512,
"default": 64
"default": 64,
"q": null
},
{
"name": "num_levels",
"type": "uniform_int",
"log": false,
"lower": 1,
"upper": 5,
"default": 3
"default": 3,
"q": null
},
{
"name": "use_augmentation",
Expand All @@ -90,15 +98,17 @@
"log": true,
"lower": 1e-09,
"upper": 0.0001,
"default": 1e-05
"default": 1e-05,
"q": null
},
{
"name": "lr_scheduler_tmult",
"type": "uniform_int",
"log": false,
"lower": 1,
"upper": 5,
"default": 1
"default": 1,
"q": null
}
],
"conditions": [
Expand Down
12 changes: 8 additions & 4 deletions logs/DeepCAVE/digits_sklearn/run_1/configspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,35 @@
"log": false,
"lower": 1,
"upper": 100,
"default": 50
"default": 50,
"q": null
},
{
"name": "learning_rate",
"type": "uniform_float",
"log": true,
"lower": 0.0001,
"upper": 0.1,
"default": 0.0031622777
"default": 0.0031622777,
"q": null
},
{
"name": "num_neurons_layer1",
"type": "uniform_int",
"log": false,
"lower": 5,
"upper": 100,
"default": 52
"default": 52,
"q": null
},
{
"name": "num_neurons_layer2",
"type": "uniform_int",
"log": false,
"lower": 5,
"upper": 100,
"default": 52
"default": 52,
"q": null
},
{
"name": "solver",
Expand Down
12 changes: 8 additions & 4 deletions logs/DeepCAVE/digits_sklearn/run_2/configspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,35 @@
"log": false,
"lower": 1,
"upper": 100,
"default": 50
"default": 50,
"q": null
},
{
"name": "learning_rate",
"type": "uniform_float",
"log": true,
"lower": 0.0001,
"upper": 0.1,
"default": 0.0031622777
"default": 0.0031622777,
"q": null
},
{
"name": "num_neurons_layer1",
"type": "uniform_int",
"log": false,
"lower": 5,
"upper": 100,
"default": 52
"default": 52,
"q": null
},
{
"name": "num_neurons_layer2",
"type": "uniform_int",
"log": false,
"lower": 5,
"upper": 100,
"default": 52
"default": 52,
"q": null
},
{
"name": "solver",
Expand Down
12 changes: 8 additions & 4 deletions logs/DeepCAVE/digits_sklearn/run_3/configspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,35 @@
"log": false,
"lower": 1,
"upper": 100,
"default": 50
"default": 50,
"q": null
},
{
"name": "learning_rate",
"type": "uniform_float",
"log": true,
"lower": 0.0001,
"upper": 0.1,
"default": 0.0031622777
"default": 0.0031622777,
"q": null
},
{
"name": "num_neurons_layer1",
"type": "uniform_int",
"log": false,
"lower": 5,
"upper": 100,
"default": 52
"default": 52,
"q": null
},
{
"name": "num_neurons_layer2",
"type": "uniform_int",
"log": false,
"lower": 5,
"upper": 100,
"default": 52
"default": 52,
"q": null
},
{
"name": "solver",
Expand Down
9 changes: 6 additions & 3 deletions logs/DeepCAVE/minimal/run_1/configspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,26 @@
"log": false,
"lower": 0.0,
"upper": 1.0,
"default": 0.5
"default": 0.5,
"q": null
},
{
"name": "beta",
"type": "uniform_float",
"log": false,
"lower": 0.0,
"upper": 1.0,
"default": 0.5
"default": 0.5,
"q": null
},
{
"name": "gamma",
"type": "uniform_float",
"log": false,
"lower": 0.0,
"upper": 1.0,
"default": 0.5
"default": 0.5,
"q": null
}
],
"conditions": [],
Expand Down
Loading

0 comments on commit 6986515

Please sign in to comment.