Merge pull request #56 from automl/development

Version 1.1.1
automl · Jun 28, 2023 · 6986515 · 6986515
2 parents 5869474 + 4caac3b
commit 6986515
Show file tree

Hide file tree

Showing 25 changed files with 518 additions and 256 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/Makefile b/Makefile
@@ -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
 
@@ -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}'"

diff --git a/deepcave/__init__.py b/deepcave/__init__.py
@@ -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"]

diff --git a/logs/BOHB/bohb_1/configspace.json b/logs/BOHB/bohb_1/configspace.json
@@ -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",
@@ -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",
@@ -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": [

diff --git a/logs/BOHB/bohb_2/configspace.json b/logs/BOHB/bohb_2/configspace.json
@@ -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",
@@ -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",
@@ -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": [

diff --git a/logs/DeepCAVE/digits_sklearn/run_1/configspace.json b/logs/DeepCAVE/digits_sklearn/run_1/configspace.json
@@ -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",

diff --git a/logs/DeepCAVE/digits_sklearn/run_2/configspace.json b/logs/DeepCAVE/digits_sklearn/run_2/configspace.json
@@ -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",

diff --git a/logs/DeepCAVE/digits_sklearn/run_3/configspace.json b/logs/DeepCAVE/digits_sklearn/run_3/configspace.json
@@ -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",

diff --git a/logs/DeepCAVE/minimal/run_1/configspace.json b/logs/DeepCAVE/minimal/run_1/configspace.json
@@ -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": [],