Add Multivariate TPE to Katib UI (#1625)

* Add Multivariate TPE to Katib UI * Modify Experiment params
kubeflow · Aug 17, 2021 · 2bd9b5e · 2bd9b5e
1 parent 7439a37
commit 2bd9b5e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/pkg/new-ui/v1beta1/frontend/src/app/constants/algorithms-settings.const.ts b/pkg/new-ui/v1beta1/frontend/src/app/constants/algorithms-settings.const.ts
@@ -78,6 +78,8 @@ export const TPESettings: AlgorithmSetting[] = [
   },
 ];
 
+export const MultivariateTPESettings: AlgorithmSetting[] = [];
+
 export const CMAESSettings: AlgorithmSetting[] = [
   {
     name: 'random_state',
@@ -249,6 +251,7 @@ export const AlgorithmSettingsMap: { [key: string]: AlgorithmSetting[] } = {
   [AlgorithmsEnum.HYPERBAND]: HyperbandSettings,
   [AlgorithmsEnum.BAYESIAN_OPTIMIZATION]: BayesianOptimizationSettings,
   [AlgorithmsEnum.TPE]: TPESettings,
+  [AlgorithmsEnum.MULTIVARIATE_TPE]: MultivariateTPESettings,
   [AlgorithmsEnum.CMAES]: CMAESSettings,
   [AlgorithmsEnum.SOBOL]: SOBOLSettings,
   [AlgorithmsEnum.ENAS]: ENASSettings,

diff --git a/pkg/new-ui/v1beta1/frontend/src/app/constants/algorithms-types.const.ts b/pkg/new-ui/v1beta1/frontend/src/app/constants/algorithms-types.const.ts
@@ -9,6 +9,7 @@ export const AlgorithmNames = {
   [AlgorithmsEnum.HYPERBAND]: 'Hyperband',
   [AlgorithmsEnum.BAYESIAN_OPTIMIZATION]: 'Bayesian Optimization',
   [AlgorithmsEnum.TPE]: 'Tree of Parzen Estimators',
+  [AlgorithmsEnum.MULTIVARIATE_TPE]: 'Multivariate Tree of Parzen Estimators',
   [AlgorithmsEnum.CMAES]: 'Covariance Matrix Adaptation: Evolution Strategy',
   [AlgorithmsEnum.SOBOL]: 'Sobol Quasirandom Sequence',
 };

diff --git a/pkg/new-ui/v1beta1/frontend/src/app/enumerations/algorithms.enum.ts b/pkg/new-ui/v1beta1/frontend/src/app/enumerations/algorithms.enum.ts
@@ -4,6 +4,7 @@ export enum AlgorithmsEnum {
   HYPERBAND = 'hyperband',
   BAYESIAN_OPTIMIZATION = 'bayesianoptimization',
   TPE = 'tpe',
+  MULTIVARIATE_TPE = 'multivariate-tpe',
   CMAES = 'cmaes',
   SOBOL = 'sobol',
   ENAS = 'enas',

diff --git a/pkg/new-ui/v1beta1/frontend/src/app/services/experiment-form.service.ts b/pkg/new-ui/v1beta1/frontend/src/app/services/experiment-form.service.ts
@@ -1,26 +1,17 @@
-import {
-  FormBuilder,
-  Validators,
-  FormGroup,
-  FormArray,
-  FormControl,
-} from '@angular/forms';
+import { FormBuilder, Validators, FormGroup, FormArray } from '@angular/forms';
 import { Injectable } from '@angular/core';
-import { ObjectiveTypeEnum } from '../enumerations/objective-type.enum';
 import {
   AlgorithmsEnum,
   EarlyStoppingAlgorithmsEnum,
 } from '../enumerations/algorithms.enum';
-import { BehaviorSubject } from 'rxjs';
 import { createParameterGroup, createNasOperationGroup } from '../shared/utils';
-import { K8sObject, SnackBarService, SnackType } from 'kubeflow';
-import { dump, load } from 'js-yaml';
+import { SnackBarService, SnackType } from 'kubeflow';
+import { load } from 'js-yaml';
 import {
   ObjectiveSpec,
   AlgorithmSpec,
   ParameterSpec,
   FeasibleSpaceMinMax,
-  GraphConfig,
   NasOperation,
   AlgorithmSetting,
 } from '../models/experiment.k8s.model';
@@ -53,9 +44,9 @@ export class ExperimentFormService {
     return this.builder.group({
       type: 'maximize',
       goal: 0.99,
-      metricName: 'accuracy',
+      metricName: 'Validation-accuracy',
       metricStrategy: 'max',
-      additionalMetricNames: this.builder.array(['train-accuracy']),
+      additionalMetricNames: this.builder.array(['Train-accuracy']),
       metricStrategies: this.builder.array([]),
       setStrategies: this.builder.control(false),
     });
@@ -99,7 +90,7 @@ export class ExperimentFormService {
       createParameterGroup({
         name: 'optimizer',
         parameterType: 'categorical',
-        feasibleSpace: { list: ['sgd', 'adams', 'ftrl'] },
+        feasibleSpace: { list: ['sgd', 'adam', 'ftrl'] },
       }),
     ]);
   }