refactor: Cleanup acquisition

automl · Jan 9, 2025 · 8bfc88b · 8bfc88b
1 parent ae8c29f
commit 8bfc88b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 225 deletions.
diff --git a/neps/optimizers/acquisition/base_acquisition.py b/neps/optimizers/acquisition/base_acquisition.py
diff --git a/neps/optimizers/acquisition/cost_cooling.py b/neps/optimizers/acquisition/cost_cooling.py
@@ -5,9 +5,7 @@
 import torch
 from botorch.acquisition.logei import partial
 
-from neps.optimizers.bayesian_optimization.acquisition_functions.weighted_acquisition import (  # noqa: E501
-    WeightedAcquisition,
-)
+from neps.optimizers.acquisition.weighted_acquisition import WeightedAcquisition
 
 if TYPE_CHECKING:
     from botorch.acquisition import AcquisitionFunction

diff --git a/neps/optimizers/acquisition/ei.py b/neps/optimizers/acquisition/ei.py
diff --git a/neps/optimizers/acquisition/pibo.py b/neps/optimizers/acquisition/pibo.py
@@ -18,9 +18,7 @@
 
 from botorch.acquisition.logei import partial
 
-from neps.optimizers.bayesian_optimization.acquisition_functions.weighted_acquisition import (  # noqa: E501
-    WeightedAcquisition,
-)
+from neps.optimizers.acquisition.weighted_acquisition import WeightedAcquisition
 
 if TYPE_CHECKING:
     from botorch.acquisition.acquisition import AcquisitionFunction

diff --git a/neps/optimizers/acquisition/ucb.py b/neps/optimizers/acquisition/ucb.py
diff --git a/neps/optimizers/models/__init__.py b/neps/optimizers/models/__init__.py
@@ -1,4 +1,4 @@
-from neps.optimizers.bayesian_optimization.models.ftpfn import FTPFNSurrogate
-from neps.optimizers.bayesian_optimization.models.gp import make_default_single_obj_gp
+from neps.optimizers.models.ftpfn import FTPFNSurrogate
+from neps.optimizers.models.gp import make_default_single_obj_gp
 
 __all__ = ["FTPFNSurrogate", "make_default_single_obj_gp"]
diff --git a/neps/optimizers/models/gp.py b/neps/optimizers/models/gp.py
@@ -20,10 +20,10 @@
 from gpytorch import ExactMarginalLogLikelihood
 from gpytorch.kernels import ScaleKernel
 
-from neps.optimizers.bayesian_optimization.acquisition_functions.cost_cooling import (
+from neps.optimizers.acquisition.cost_cooling import (
     cost_cooled_acq,
 )
-from neps.optimizers.bayesian_optimization.acquisition_functions.pibo import (
+from neps.optimizers.acquisition.pibo import (
     pibo_acquisition,
 )
 from neps.search_spaces.encoding import CategoricalToIntegerTransformer, ConfigEncoder