diff --git a/bbopt-source/constants.coco b/bbopt-source/constants.coco index eec35ff..fe4d617 100644 --- a/bbopt-source/constants.coco +++ b/bbopt-source/constants.coco @@ -5,7 +5,7 @@ Constants for use across all of BBopt. # Installation constants: name = "bbopt" -version = "1.1.6" +version = "1.1.7" description = "The easiest hyperparameter optimization you'll ever do." long_description = """ See BBopt's GitHub_ for more information. @@ -26,9 +26,9 @@ requirements = ( "matplotlib>=2.0", "portalocker>=1.4", "scikit-optimize>=0.5.2", - "hyperopt>=0.1.2", - # fixes an error in hyperopt 0.1 with networkx>=2.0 - "networkx>=1.0,<2.0", + "hyperopt>=0.2.1", + # fixes an issue with bson which is used by hyperopt + "pymongo>=3.9", ) extra_requirements = { ":python_version<'3'": ( diff --git a/bbopt/__coconut__.py b/bbopt/__coconut__.py index d5aa1b8..9cd54f7 100644 --- a/bbopt/__coconut__.py +++ b/bbopt/__coconut__.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # type: ignore -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """Built-in Coconut utilities.""" @@ -124,7 +124,7 @@ def _coconut_reduce_partial(self): py_chr, py_hex, py_input, py_int, py_map, py_object, py_oct, py_open, py_print, py_range, py_str, py_zip, py_filter, py_reversed, py_enumerate, py_repr = chr, hex, input, int, map, object, oct, open, print, range, str, zip, filter, reversed, enumerate, repr _coconut_str = str class _coconut(object): - import collections, copy, functools, types, itertools, operator, threading, weakref + import collections, copy, functools, types, itertools, operator, threading, weakref, os if _coconut_sys.version_info < (3, 2): try: from backports.functools_lru_cache import lru_cache @@ -146,7 +146,7 @@ class typing(object): @staticmethod def NamedTuple(name, fields): return _coconut.collections.namedtuple(name, [x for x, t in fields]) - Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, repr, bytearray = Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, staticmethod(repr), bytearray + Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, repr, bytearray = Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, staticmethod(repr), bytearray _coconut_sentinel = _coconut.object() class MatchError(Exception): """Pattern-matching error. Has attributes .pattern and .value.""" diff --git a/bbopt/__init__.py b/bbopt/__init__.py index 2a10dc9..26925de 100644 --- a/bbopt/__init__.py +++ b/bbopt/__init__.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x754305b2 +# __coconut_hash__ = 0xd8adaf06 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ BBopt black box optimization frontend diff --git a/bbopt/__main__.py b/bbopt/__main__.py index ca6c85b..8b43cab 100644 --- a/bbopt/__main__.py +++ b/bbopt/__main__.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x63f9d0fe +# __coconut_hash__ = 0x9ad6315f -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ Endpoint for the BBopt CLI. diff --git a/bbopt/backends/__init__.py b/bbopt/backends/__init__.py index 281728e..ccac3fe 100644 --- a/bbopt/backends/__init__.py +++ b/bbopt/backends/__init__.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x905ecfe5 +# __coconut_hash__ = 0xd9597a6 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ Backends contains all of bbopt's different backends. diff --git a/bbopt/backends/hyperopt.py b/bbopt/backends/hyperopt.py index a37637d..605d28c 100644 --- a/bbopt/backends/hyperopt.py +++ b/bbopt/backends/hyperopt.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x821ae89c +# __coconut_hash__ = 0xc3fad784 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The hyperopt backend. Does black box optimization using hyperopt. diff --git a/bbopt/backends/mixture.py b/bbopt/backends/mixture.py index f01d109..8e268d8 100644 --- a/bbopt/backends/mixture.py +++ b/bbopt/backends/mixture.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x18531269 +# __coconut_hash__ = 0x4e767ac9 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The mixture backend. Lets you specify a distribution over different possible algorithms. diff --git a/bbopt/backends/random.py b/bbopt/backends/random.py index b205e49..17c75fd 100644 --- a/bbopt/backends/random.py +++ b/bbopt/backends/random.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xd0fa5eb0 +# __coconut_hash__ = 0xa49efebf -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The random backend. Does not use existing data, simply spits out random valid values. diff --git a/bbopt/backends/serving.py b/bbopt/backends/serving.py index 052179e..a21a00e 100644 --- a/bbopt/backends/serving.py +++ b/bbopt/backends/serving.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xe8b86f0 +# __coconut_hash__ = 0x56361441 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The serving backend. Selects the best existing data point. diff --git a/bbopt/backends/skopt.py b/bbopt/backends/skopt.py index aed3400..c60ff35 100644 --- a/bbopt/backends/skopt.py +++ b/bbopt/backends/skopt.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x3b0e5e92 +# __coconut_hash__ = 0x4abda7fe -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The scikit-optimize backend. Does black box optimization using scikit-optimize. diff --git a/bbopt/backends/util.py b/bbopt/backends/util.py index 3fcdad4..c25480f 100644 --- a/bbopt/backends/util.py +++ b/bbopt/backends/util.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x80ca3ec7 +# __coconut_hash__ = 0x891167fd -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ Utilities for use in BBopt backends. diff --git a/bbopt/cli.py b/bbopt/cli.py index a42349c..eefb739 100644 --- a/bbopt/cli.py +++ b/bbopt/cli.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xa8d96df3 +# __coconut_hash__ = 0x651d92a3 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ BBopt command line interface. diff --git a/bbopt/constants.py b/bbopt/constants.py index 20e41d7..e450c2d 100644 --- a/bbopt/constants.py +++ b/bbopt/constants.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x30737416 +# __coconut_hash__ = 0x44fe4a95 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ Constants for use across all of BBopt. @@ -29,7 +29,7 @@ # Installation constants: name = "bbopt" -version = "1.1.6" +version = "1.1.7" description = "The easiest hyperparameter optimization you'll ever do." long_description = """ See BBopt's GitHub_ for more information. @@ -40,7 +40,7 @@ author = "Evan Hubinger" author_email = "evanjhub@gmail.com" classifiers = ("Development Status :: 5 - Production/Stable", "License :: OSI Approved :: Apache Software License", "Topic :: Software Development :: Libraries :: Python Modules", "Operating System :: OS Independent",) -requirements = ("numpy>=1.0", "matplotlib>=2.0", "portalocker>=1.4", "scikit-optimize>=0.5.2", "hyperopt>=0.1.2", "networkx>=1.0,<2.0",) +requirements = ("numpy>=1.0", "matplotlib>=2.0", "portalocker>=1.4", "scikit-optimize>=0.5.2", "hyperopt>=0.2.1", "pymongo>=3.9",) extra_requirements = {":python_version<'3'": ("futures>=3.2",), "examples": ("keras", "scikit-learn",)} extra_requirements["dev"] = (extra_requirements["examples"] + ("coconut-develop", "pytest>=3.0",)) diff --git a/bbopt/optimizer.py b/bbopt/optimizer.py index f71b878..d06ed9b 100644 --- a/bbopt/optimizer.py +++ b/bbopt/optimizer.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x89ecf4ca +# __coconut_hash__ = 0xb7e90c88 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The main BBopt interface. diff --git a/bbopt/params.py b/bbopt/params.py index 7c1935b..2521f4f 100644 --- a/bbopt/params.py +++ b/bbopt/params.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xa71a390 +# __coconut_hash__ = 0x94aa3a3a -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ Handles standardizing param calls to use standard library random functions. diff --git a/bbopt/registry.py b/bbopt/registry.py index 89a63cd..ac47c23 100644 --- a/bbopt/registry.py +++ b/bbopt/registry.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xd017ca80 +# __coconut_hash__ = 0xed6da886 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ The backend and algorithm registries. diff --git a/bbopt/tests/__init__.py b/bbopt/tests/__init__.py index af85884..4ef7795 100644 --- a/bbopt/tests/__init__.py +++ b/bbopt/tests/__init__.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x196fb0ec +# __coconut_hash__ = 0xcdcba567 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] # Coconut Header: ------------------------------------------------------------- diff --git a/bbopt/tests/constants_test.py b/bbopt/tests/constants_test.py index 39e2743..a3d8c64 100644 --- a/bbopt/tests/constants_test.py +++ b/bbopt/tests/constants_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x2a5e4d27 +# __coconut_hash__ = 0xc6942916 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] # Coconut Header: ------------------------------------------------------------- diff --git a/bbopt/tests/examples_test.py b/bbopt/tests/examples_test.py index 0004c80..f8a6a3e 100644 --- a/bbopt/tests/examples_test.py +++ b/bbopt/tests/examples_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xbf0eca3b +# __coconut_hash__ = 0xdcc94701 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] # Coconut Header: ------------------------------------------------------------- diff --git a/bbopt/util.py b/bbopt/util.py index 2465eea..6caa901 100644 --- a/bbopt/util.py +++ b/bbopt/util.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0xc8ec1f45 +# __coconut_hash__ = 0xcc184c5d -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] """ Utilities for use across all of bbopt. diff --git a/setup.py b/setup.py index 2c9db58..60f137b 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# __coconut_hash__ = 0x7df44bc3 +# __coconut_hash__ = 0x46233645 -# Compiled with Coconut version 1.4.0-post_dev40 [Ernest Scribbler] +# Compiled with Coconut version 1.4.1-post_dev3 [Ernest Scribbler] # Coconut Header: ------------------------------------------------------------- @@ -122,7 +122,7 @@ def _coconut_reduce_partial(self): py_chr, py_hex, py_input, py_int, py_map, py_object, py_oct, py_open, py_print, py_range, py_str, py_zip, py_filter, py_reversed, py_enumerate, py_repr = chr, hex, input, int, map, object, oct, open, print, range, str, zip, filter, reversed, enumerate, repr _coconut_str = str class _coconut(object): - import collections, copy, functools, types, itertools, operator, threading, weakref + import collections, copy, functools, types, itertools, operator, threading, weakref, os if _coconut_sys.version_info < (3, 2): try: from backports.functools_lru_cache import lru_cache @@ -144,7 +144,7 @@ class typing(object): @staticmethod def NamedTuple(name, fields): return _coconut.collections.namedtuple(name, [x for x, t in fields]) - Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, repr, bytearray = Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, staticmethod(repr), bytearray + Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, repr, bytearray = Ellipsis, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, classmethod, dict, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, map, min, max, next, object, property, range, reversed, set, slice, str, sum, super, tuple, type, zip, staticmethod(repr), bytearray _coconut_sentinel = _coconut.object() class MatchError(Exception): """Pattern-matching error. Has attributes .pattern and .value."""