Move Orion Search space to Sample-Space (#6)

Epistimio · Mar 3, 2022 · 419ed4d · 419ed4d
1 parent 80b81de
commit 419ed4d
Show file tree

Hide file tree

Showing 21 changed files with 5,230 additions and 22 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -6,6 +6,7 @@
 
    space
    conditional
+   orion/index
 
 
 .. toctree::

diff --git a/docs/orion/builder.rst b/docs/orion/builder.rst
@@ -0,0 +1,5 @@
+Space Builder
+=============
+
+.. automodule:: sspace.orion.builder
+   :members:
diff --git a/docs/orion/index.rst b/docs/orion/index.rst
@@ -0,0 +1,10 @@
+Orion
+=====
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Modules
+
+    builder
+    space
+    transformer
diff --git a/docs/orion/space.rst b/docs/orion/space.rst
@@ -0,0 +1,6 @@
+Space search
+============
+
+.. automodule:: sspace.orion.space
+   :members:
+
diff --git a/docs/orion/transformer.rst b/docs/orion/transformer.rst
@@ -0,0 +1,5 @@
+Dimension transformations
+=========================
+
+.. automodule:: sspace.orion.transformer
+   :members:
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 ConfigSpace
-orion
+scipy
+numpy
diff --git a/sspace/backends/ospace.py b/sspace/backends/ospace.py
@@ -1,22 +1,13 @@
-import_error = None
+import functools
 
-try:
-    import functools
+from sspace.orion.builder import SpaceBuilder, DimensionBuilder
+import sspace.orion.space as OrionSpace
 
-    from orion.core.io.space_builder import SpaceBuilder, DimensionBuilder
-    import orion.algo.space as OrionSpace
-
-    from sspace.utils import sort_dict
-
-except ImportError as e:
-    import_error = e
+from sspace.utils import sort_dict
 
 
 class _OrionSpaceBuilder:
     def __init__(self):
-        if import_error:
-            raise import_error
-
         self.builder = DimensionBuilder()
         self.dim_leaves = {
             'uniform': self.uniform,

diff --git a/sspace/convert.py b/sspace/convert.py
@@ -4,13 +4,12 @@
     import ConfigSpace as cs
     import ConfigSpace.hyperparameters as csh
 
-    from orion.core.io.space_builder import SpaceBuilder, DimensionBuilder
-    import orion.algo.space as OrionSpace
+    from sspace.orion.builder import SpaceBuilder, DimensionBuilder
+    import sspace.orion.space as OrionSpace
     import functools
 
     from sspace.utils import sort_dict
 
-
 except ImportError as e:
     import_error = e
 

diff --git a/sspace/orion/__init__.py b/sspace/orion/__init__.py