From cf8c0972b7a6ae78cf4777cc772118fbcdbb2479 Mon Sep 17 00:00:00 2001 From: sebhrusen Date: Mon, 5 Feb 2024 18:36:45 +0100 Subject: [PATCH] revert model type detection in AutoML SE support --- .../src/main/java/ai/h2o/automl/AutoMLBuildSpec.java | 2 +- .../automl/modeling/StackedEnsembleStepsProvider.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/h2o-automl/src/main/java/ai/h2o/automl/AutoMLBuildSpec.java b/h2o-automl/src/main/java/ai/h2o/automl/AutoMLBuildSpec.java index e46a53efaa18..4b8685edbe26 100644 --- a/h2o-automl/src/main/java/ai/h2o/automl/AutoMLBuildSpec.java +++ b/h2o-automl/src/main/java/ai/h2o/automl/AutoMLBuildSpec.java @@ -181,7 +181,7 @@ public static final class AutoMLBuildModels extends Iced { public double exploitation_ratio = -1; public AutoMLCustomParameters algo_parameters = new AutoMLCustomParameters(); public PreprocessingStepDefinition[] preprocessing; - public boolean _pipelineEnabled = true; // currently used for testing until ready: to be removed + public boolean _pipelineEnabled = false; // currently used for testing until ready: to be removed } public static final class AutoMLCustomParameters extends Iced { diff --git a/h2o-automl/src/main/java/ai/h2o/automl/modeling/StackedEnsembleStepsProvider.java b/h2o-automl/src/main/java/ai/h2o/automl/modeling/StackedEnsembleStepsProvider.java index 86c537f761c8..fd8e15c5a461 100644 --- a/h2o-automl/src/main/java/ai/h2o/automl/modeling/StackedEnsembleStepsProvider.java +++ b/h2o-automl/src/main/java/ai/h2o/automl/modeling/StackedEnsembleStepsProvider.java @@ -128,13 +128,13 @@ protected boolean hasDoppelganger(Key[] baseModelsKeys) { protected String getModelType(Key key) { ModelingStep step = aml().session().getModelingStep(key); - if (step == null) { // dirty case +// if (step != null) { // fixme: commenting out this for now, as it interprets XRT as a DRF (which it is) and breaks legacy tests. We might want to reconsider this distinction as XRT is often very similar to DRF and doesn't bring much diversity to SEs, and the best_of SEs currently almost always have these 2. +// return step.getAlgo().name(); +// } else { // dirty case String keyStr = key.toString(); - int lookupStart = keyStr.startsWith(PIPELINE_KEY_PREFIX) ? PIPELINE_KEY_PREFIX.length() : 0; + int lookupStart = keyStr.startsWith(PIPELINE_KEY_PREFIX) ? PIPELINE_KEY_PREFIX.length() : 0; return keyStr.substring(lookupStart, keyStr.indexOf('_', lookupStart)); - } else { - return step.getAlgo().name(); - } +// } } protected boolean isStackedEnsemble(Key key) {