v1

Author: jacobdenobel

modcma/c_maes/__init__.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from dataclasses import dataclass
 
 from .cmaescpp import (
     constants,
@@ -20,6 +21,8 @@
 
 from .cmaescpp.parameters import Settings, Modules # pyright: ignore[reportMissingModuleSource]
 
+from ConfigSpace import ConfigurationSpace, Categorical, Integer, Float, NormalIntegerHyperparameter, NormalFloatHyperparameter
+
 
 def get_module_options(name: str) -> tuple:
     if not hasattr(Modules, name):
@@ -29,13 +32,13 @@ def get_module_options(name: str) -> tuple:
     if isinstance(default_value, bool):
         return (default_value, not default_value)
 
-    if issubclass(default_value.__class__, Enum):
+    module_class = default_value.__class__
+    if issubclass(module_class, Enum):
         other_values = [
-            x for x in default_value.__members__.items() 
+            x for x in module_class.__members__.values() 
             if x is not default_value
         ]
         return tuple([default_value] + other_values)
-    breakpoint()
     raise TypeError(f"{name} has a unparsable type {type(default_value)}")
 
 def get_all_module_options() -> dict:
@@ -44,3 +47,41 @@ def get_all_module_options() -> dict:
         for name in dir(Modules) 
         if not name.startswith("_")
     }
+
+def make_numeric_parameter(name: str, dim: int, lb: float = 0, ub: float = float("inf")) -> NormalIntegerHyperparameter | NormalFloatHyperparameter:
+    settings = Parameters(Settings(dim))
+    default = getattr(settings.weights, name, None)
+    print(name, default)
+
+    
+
+
+def get_all_numeric_options(dim: int) -> dict[str, NormalIntegerHyperparameter | NormalFloatHyperparameter]:
+    return {
+        "sigma0": make_numeric_parameter("sigma0", dim),
+        "lambda0": make_numeric_parameter("lambda0", dim, 4),
+        "mu0": make_numeric_parameter("mu0", dim, 4),
+        "cs": make_numeric_parameter("cs",  dim, 0, 1.0),
+        "cc": make_numeric_parameter("cc", dim, 0, 1.0),
+        "cmu": make_numeric_parameter("cmu", dim, 0, 1.0),
+        "c1": make_numeric_parameter("c1", dim, 0, 1.0),
+        "damps": make_numeric_parameter("damps", dim, 0, 10.0),
+        "acov": make_numeric_parameter("acov", dim, 0, 10.0),
+    }
+
+def get_configspace(dim: int = None, only_modules: bool = False) -> ConfigurationSpace:
+    cspace = ConfigurationSpace()
+    for name, options in get_all_module_options().items():
+        cspace.add(Categorical(name, options, default=options[0]))
+
+    if only_modules:
+        return cspace
+    
+    if dim is None:
+        print("warning")
+        dim = 1
+        
+    for name, options in get_all_numeric_options(dim).items():
+        cspace.add()
+
+    return cspace

modcma/c_maes/cmaescpp/options.pyi

@@ -75,6 +75,7 @@ class SampleTranformerType:
 class CenterPlacement:
     __members__: ClassVar[dict] = ...  # read-only
     UNIFORM: ClassVar[CenterPlacement] = ...
+    CENTER: ClassVar[CenterPlacement] = ...
     X0: ClassVar[CenterPlacement] = ...
     ZERO: ClassVar[CenterPlacement] = ...
     __entries: ClassVar[dict] = ...

pyproject.toml

@@ -1,13 +1,13 @@
 [build-system]
 requires = [
-    "setuptools>=42",
-    "wheel",
-    "pybind11>=2.6.0",
+    "configspace",
     "ioh>=0.3.14",
     "numpy>=1.18.5, <2.0.0",
     "mypy",
     "pybind11>=2.6.0",
+    "setuptools>=42",
     "scipy>=1.5.1",
+    "wheel",
 ]
 
 build-backend = "setuptools.build_meta"

scripts/tuning/tuning_smac.py

@@ -93,7 +93,8 @@ def cc(lambda_, mu, weight_option):
 
     if use_learning_rates:
         cs_param = NormalFloatHyperparameter(
-            "cs", lower=0.0, upper=1.5, default_value=0.3, mu=0.3, sigma=0.2)
+            "cs", lower=0.0, upper=1.5, default_value=0.3, mu=0.3, sigma=0.2
+        )
 
         # Define the conditional normal float hyperparameter
         c1_param = MultiConditionalNormalFloatHyperparameter("c1", ["lambda_", "mu", "weights_option"], c1, lambda lambda_, mu, weight_option: 0.1, lower=0.0001, upper=1.0, default_value=c1(default_lambda, default_lambda // 2, "default"))

src/interface.cpp

@@ -627,7 +627,6 @@ void define_parameters(py::module &main)
 			 py::arg("acov") = std::nullopt,
 			 py::arg("verbose") = false,
 			 py::arg("always_compute_eigv") = false
-
 			 )
 		.def_readonly("dim", &Settings::dim)
 		.def_readonly("modules", &Settings::modules)

tests/test_c_tuning.py

@@ -4,7 +4,24 @@
 
 class TestTuning(unittest.TestCase):
     def test_module_options(self):
-        self.assertIsInstance(c_maes.get_all_module_options(), dict)
+        options = c_maes.get_all_module_options()
+        self.assertIsInstance(options, dict)
+        self.assertEqual(options, options | {"active": (False, True)})
+        self.assertEqual(options, options | {"elitist": (False, True)})
+        self.assertEqual(options, options | {"orthogonal": (False, True)})
+        self.assertEqual(options, options | {"sequential_selection": (False, True)})
+        self.assertEqual(options, options | {"threshold_convergence": (False, True)})
+        self.assertEqual(options, options | {"sample_sigma": (False, True)})
+        self.assertEqual(options, options | {"repelling_restart": (False, True)})
+
+    def test_numeric_options(self):
+        options = c_maes.get_all_numeric_options()
+        self.assertIsInstance(options, dict)
+
+    def test_configspace(self):
+        cspace = c_maes.get_configspace()
+        print(cspace)
+
 
 if __name__ == "__main__":
     unittest.main()