Updated versions & qNIPV

Author: hvarfner

ax/models/torch/utils.py

@@ -115,7 +115,6 @@ def _filter_X_observed(
         objective_weights=objective_weights,
         outcome_constraints=outcome_constraints,
     )
-<<<<<<< Updated upstream
     if not fit_out_of_design:
         # Filter to those that satisfy constraints.
         X_obs = filter_constraints_and_fixed_features(
@@ -124,20 +123,6 @@ def _filter_X_observed(
             linear_constraints=linear_constraints,
             fixed_features=fixed_features,
         )
-=======
-    # Filter to those that satisfy constraints.
-    # Addded the rounding here to ensure that very small numbers (rounding errors)
-    # caused by saving and loading does not run into issues with constraint evaluation
-    
-    X_obs = filter_constraints_and_fixed_features(
-        X=X_obs,
-        bounds=bounds,
-        linear_constraints=linear_constraints,
-        fixed_features=fixed_features,
-        legit_violation=1e-6,
-    )
-    
->>>>>>> Stashed changes
     if len(X_obs) > 0:
         return torch.as_tensor(X_obs)  # please the linter
 

ax/storage/botorch_modular_registry.py

@@ -23,14 +23,7 @@
     LogNoisyExpectedImprovement,
     NoisyExpectedImprovement,
 )
-from botorch.acquisition.bayesian_active_learning import (
-    qBayesianActiveLearningByDisagreement,
-    qBayesianQueryByComittee,
-    qStatisticalDistanceActiveLearning
-)
-from botorch.acquisition.diversity import (
-    qDistanceWeightedImprovementOverThreshold,
-)
+
 from botorch.acquisition.knowledge_gradient import (
     qKnowledgeGradient,
     qMultiFidelityKnowledgeGradient,
@@ -47,6 +40,7 @@
     qExpectedImprovement,
     qNoisyExpectedImprovement,
 )
+from botorch.acquisition.diversity import qDistanceWeightedImprovementOverThreshold
 from botorch.acquisition.multi_objective.logei import (
     qLogExpectedHypervolumeImprovement,
     qLogNoisyExpectedHypervolumeImprovement,
@@ -55,15 +49,10 @@
     qExpectedHypervolumeImprovement,
     qNoisyExpectedHypervolumeImprovement,
 )
-<<<<<<< Updated upstream
 from botorch.acquisition.multi_objective.parego import qLogNParEGO
 from botorch.acquisition.preference import AnalyticExpectedUtilityOfBestOption
-=======
-from botorch.acquisition.joint_entropy_search import qJointEntropySearch
-from botorch.acquisition.scorebo import qSelfCorrectingBayesianOptimization
-from botorch.acquisition.active_learning import qNegIntegratedPosteriorVariance
->>>>>>> Stashed changes
 from botorch.models import SaasFullyBayesianSingleTaskGP
+from botorch.acquisition.active_learning import qNegIntegratedPosteriorVariance
 from botorch.models.contextual import LCEAGP
 from botorch.models.fully_bayesian import FullyBayesianLinearSingleTaskGP
 from botorch.models.fully_bayesian_multitask import SaasFullyBayesianMultiTaskGP
@@ -158,17 +147,8 @@
     qNegIntegratedPosteriorVariance: "qNegIntegratedPosteriorVariance",
     qLogExpectedHypervolumeImprovement: "qLogExpectedHypervolumeImprovement",
     qLogNoisyExpectedHypervolumeImprovement: "qLogNoisyExpectedHypervolumeImprovement",
-<<<<<<< Updated upstream
     qLogNParEGO: "qLogNParEGO",
-=======
-    # info-theoretic acquisition functions
     qDistanceWeightedImprovementOverThreshold: "qDistanceWeightedImprovementOverThreshold",
-    qJointEntropySearch: "qJointEntropySearch",
-    qSelfCorrectingBayesianOptimization: "qSelfCorrectingBayesianOptimization",
-    qBayesianActiveLearningByDisagreement: "qBayesianActiveLearningByDisagreement",
-    qBayesianQueryByComittee: "qBayesianQueryByComittee",
-    qStatisticalDistanceActiveLearning: "qStatisticalDistanceActiveLearning",
->>>>>>> Stashed changes
 }
 
 
@@ -195,10 +175,7 @@
     Interval: "Interval",
     GammaPrior: "GammaPrior",
     LogNormalPrior: "LogNormalPrior",
-<<<<<<< Updated upstream
     SobolQMCNormalSampler: "SobolQMCNormalSampler",
-=======
->>>>>>> Stashed changes
 }
 
 """