reconstruct automl framework

Angel-ML · Dec 6, 2018 · 2744e62 · 2744e62
1 parent 6262f2a
commit 2744e62
Show file tree

Hide file tree

Showing 25 changed files with 78 additions and 42 deletions.
diff --git a/...n-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureCross.scala b/...n-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureCross.scala
@@ -0,0 +1,18 @@
+package com.tencent.angel.spark.ml.automl.feature
+
+import org.apache.spark.ml.Transformer
+import org.apache.spark.ml.param.ParamMap
+import org.apache.spark.ml.util.DefaultParamsWritable
+import org.apache.spark.sql.{DataFrame, Dataset}
+import org.apache.spark.sql.types.StructType
+
+class FeatureCross (override val uid: String)
+  extends Transformer with DefaultParamsWritable {
+
+  override def transform(dataset: Dataset[_]): DataFrame = ???
+
+  override def copy(extra: ParamMap): Transformer = ???
+
+  override def transformSchema(schema: StructType): StructType = ???
+
+}
diff --git a/...ngel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureSelector.scala b/...ngel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureSelector.scala
@@ -0,0 +1,18 @@
+package com.tencent.angel.spark.ml.automl.feature
+
+import org.apache.spark.ml.Transformer
+import org.apache.spark.ml.param.ParamMap
+import org.apache.spark.ml.util.DefaultParamsWritable
+import org.apache.spark.sql.{DataFrame, Dataset}
+import org.apache.spark.sql.types.StructType
+
+class FeatureSelector (override val uid: String)
+  extends Transformer with DefaultParamsWritable {
+
+  override def transform(dataset: Dataset[_]): DataFrame = ???
+
+  override def copy(extra: ParamMap): Transformer = ???
+
+  override def transformSchema(schema: StructType): StructType = ???
+
+}
diff --git a/...-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/PreProcessing.scala b/...-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/PreProcessing.scala
@@ -0,0 +1,17 @@
+package com.tencent.angel.spark.ml.automl.feature
+
+import org.apache.spark.ml.Transformer
+import org.apache.spark.ml.param.ParamMap
+import org.apache.spark.ml.util.DefaultParamsWritable
+import org.apache.spark.sql.{DataFrame, Dataset}
+import org.apache.spark.sql.types.StructType
+
+class PreProcessing (override val uid: String)
+  extends Transformer with DefaultParamsWritable {
+
+  override def transform(dataset: Dataset[_]): DataFrame = ???
+
+  override def copy(extra: ParamMap): Transformer = ???
+
+  override def transformSchema(schema: StructType): StructType = ???
+}
diff --git a/...a/com/tencent/angel/ml/auto/Example.scala → ...angel/spark/ml/automl/tuner/Example.scala b/...a/com/tencent/angel/ml/auto/Example.scala → ...angel/spark/ml/automl/tuner/Example.scala
@@ -1,22 +1,4 @@
-/*
- * Tencent is pleased to support the open source community by making Angel available.
- *
- * Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License. You may obtain a copy of the License at
- *
- * https://opensource.org/licenses/Apache-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- *
- */
-
-
-package com.tencent.angel.ml.auto
+package com.tencent.angel.spark.ml.automl.tuner
 
 import com.tencent.angel.ml.auto.acquisition.optimizer.{AcqOptimizer, RandomSearch}
 import com.tencent.angel.ml.auto.acquisition.{Acquisition, EI}
@@ -52,4 +34,4 @@ object Example extends App {
     sur.stop()
     println(s"Best configuration ${result._1.getStorage.getValues.mkString(",")}, best performance: ${result._2}")
   }
-}
+}
diff --git a/...gel/ml/auto/acquisition/Acquisition.scala → ...utoml/tuner/acquisition/Acquisition.scala b/...gel/ml/auto/acquisition/Acquisition.scala → ...utoml/tuner/acquisition/Acquisition.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.acquisition
+package com.tencent.angel.spark.ml.automl.tuner.acquisition
 
 import com.tencent.angel.ml.auto.surrogate.Surrogate
 import com.tencent.angel.ml.math2.vector.IntFloatVector

diff --git a/...encent/angel/ml/auto/acquisition/EI.scala → ...park/ml/automl/tuner/acquisition/EI.scala b/...encent/angel/ml/auto/acquisition/EI.scala → ...park/ml/automl/tuner/acquisition/EI.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.acquisition
+package com.tencent.angel.spark.ml.automl.tuner.acquisition
 
 import com.tencent.angel.ml.auto.surrogate.Surrogate
 import com.tencent.angel.ml.math2.storage.IntFloatDenseVectorStorage

diff --git a/.../acquisition/optimizer/AcqOptimizer.scala → .../acquisition/optimizer/AcqOptimizer.scala b/.../acquisition/optimizer/AcqOptimizer.scala → .../acquisition/optimizer/AcqOptimizer.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.acquisition.optimizer
+package com.tencent.angel.spark.ml.automl.tuner.acquisition.optimizer
 
 import com.tencent.angel.ml.auto.acquisition.Acquisition
 import com.tencent.angel.ml.auto.config.{Configuration,ConfigurationSpace}

diff --git a/...o/acquisition/optimizer/LocalSearch.scala → ...r/acquisition/optimizer/LocalSearch.scala b/...o/acquisition/optimizer/LocalSearch.scala → ...r/acquisition/optimizer/LocalSearch.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.acquisition.optimizer
+package com.tencent.angel.spark.ml.automl.tuner.acquisition.optimizer
 
 import com.tencent.angel.ml.auto.acquisition.Acquisition
 import com.tencent.angel.ml.auto.config.{Configuration, ConfigurationSpace}

diff --git a/.../acquisition/optimizer/RandomSearch.scala → .../acquisition/optimizer/RandomSearch.scala b/.../acquisition/optimizer/RandomSearch.scala → .../acquisition/optimizer/RandomSearch.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.acquisition.optimizer
+package com.tencent.angel.spark.ml.automl.tuner.acquisition.optimizer
 
 import com.tencent.angel.ml.auto.acquisition.Acquisition
 import com.tencent.angel.ml.auto.config.{Configuration, ConfigurationSpace}

diff --git a/.../angel/ml/auto/config/Configuration.scala → ...l/automl/tuner/config/Configuration.scala b/.../angel/ml/auto/config/Configuration.scala → ...l/automl/tuner/config/Configuration.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.config
+package com.tencent.angel.spark.ml.automl.tuner.config
 
 import com.tencent.angel.ml.math2.vector.IntFloatVector
 

diff --git a/...l/ml/auto/config/ConfigurationSpace.scala → ...oml/tuner/config/ConfigurationSpace.scala b/...l/ml/auto/config/ConfigurationSpace.scala → ...oml/tuner/config/ConfigurationSpace.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.config
+package com.tencent.angel.spark.ml.automl.tuner.config
 
 import com.tencent.angel.ml.auto.parameter.ParamSpace
 import com.tencent.angel.ml.math2.storage.IntFloatDenseVectorStorage

diff --git a/...l/ml/auto/parameter/ContinuousSpace.scala → ...oml/tuner/parameter/ContinuousSpace.scala b/...l/ml/auto/parameter/ContinuousSpace.scala → ...oml/tuner/parameter/ContinuousSpace.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.parameter
+package com.tencent.angel.spark.ml.automl.tuner.parameter
 
 import com.tencent.angel.ml.auto.utils.Distribution
 import org.apache.commons.logging.{Log, LogFactory}

diff --git a/...gel/ml/auto/parameter/DiscreteSpace.scala → ...utoml/tuner/parameter/DiscreteSpace.scala b/...gel/ml/auto/parameter/DiscreteSpace.scala → ...utoml/tuner/parameter/DiscreteSpace.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.parameter
+package com.tencent.angel.spark.ml.automl.tuner.parameter
 
 import scala.util.Random
 

diff --git a/.../angel/ml/auto/parameter/ParamSpace.scala → ...l/automl/tuner/parameter/ParamSpace.scala b/.../angel/ml/auto/parameter/ParamSpace.scala → ...l/automl/tuner/parameter/ParamSpace.scala
@@ -16,8 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.parameter
-
+package com.tencent.angel.spark.ml.automl.tuner.parameter
 
 /**
   * Base class of a single parameter's search space.

diff --git a/...ncent/angel/ml/auto/setting/Setting.scala → ...ark/ml/automl/tuner/setting/Setting.scala b/...ncent/angel/ml/auto/setting/Setting.scala → ...ark/ml/automl/tuner/setting/Setting.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.setting
+package com.tencent.angel.spark.ml.automl.tuner.setting
 
 class Setting {
 }

diff --git a/...tencent/angel/ml/auto/solver/Solver.scala → ...spark/ml/automl/tuner/solver/Solver.scala b/...tencent/angel/ml/auto/solver/Solver.scala → ...spark/ml/automl/tuner/solver/Solver.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.solver
+package com.tencent.angel.spark.ml.automl.tuner.solver
 
 import com.tencent.angel.ml.auto.acquisition.Acquisition
 import com.tencent.angel.ml.auto.acquisition.optimizer.AcqOptimizer

diff --git a/...ngel/ml/auto/solver/SolverWithTrail.scala → ...automl/tuner/solver/SolverWithTrail.scala b/...ngel/ml/auto/solver/SolverWithTrail.scala → ...automl/tuner/solver/SolverWithTrail.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.solver
+package com.tencent.angel.spark.ml.automl.tuner.solver
 
 import com.tencent.angel.ml.auto.config.Configuration
 import com.tencent.angel.ml.auto.trail.Trail

diff --git a/...angel/ml/auto/surrogate/RFSurrogate.scala → .../automl/tuner/surrogate/RFSurrogate.scala b/...angel/ml/auto/surrogate/RFSurrogate.scala → .../automl/tuner/surrogate/RFSurrogate.scala
@@ -16,7 +16,8 @@
  */
 
 
-package com.tencent.angel.ml.auto.surrogate
+package com.tencent.angel.spark.ml.automl.tuner.surrogate
+
 import com.tencent.angel.ml.auto.utils.DataUtils
 import com.tencent.angel.ml.math2.vector.IntFloatVector
 import org.apache.commons.logging.{Log, LogFactory}

diff --git a/...t/angel/ml/auto/surrogate/Surrogate.scala → ...ml/automl/tuner/surrogate/Surrogate.scala b/...t/angel/ml/auto/surrogate/Surrogate.scala → ...ml/automl/tuner/surrogate/Surrogate.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.surrogate
+package com.tencent.angel.spark.ml.automl.tuner.surrogate
 
 import com.tencent.angel.ml.math2.vector.IntFloatVector
 import org.apache.commons.logging.{Log, LogFactory}

diff --git a/...cent/angel/ml/auto/trail/TestRunner.scala → ...rk/ml/automl/tuner/trail/TestRunner.scala b/...cent/angel/ml/auto/trail/TestRunner.scala → ...rk/ml/automl/tuner/trail/TestRunner.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.trail
+package com.tencent.angel.spark.ml.automl.tuner.trail
 
 import com.tencent.angel.ml.auto.config.Configuration
 

diff --git a/...ncent/angel/ml/auto/trail/TestTrail.scala → ...ark/ml/automl/tuner/trail/TestTrail.scala b/...ncent/angel/ml/auto/trail/TestTrail.scala → ...ark/ml/automl/tuner/trail/TestTrail.scala
@@ -16,7 +16,8 @@
  */
 
 
-package com.tencent.angel.ml.auto.trail
+package com.tencent.angel.spark.ml.automl.tuner.trail
+
 import com.tencent.angel.ml.auto.config.Configuration
 
 class TestTrail extends Trail {

diff --git a/...m/tencent/angel/ml/auto/trail/Trail.scala → ...l/spark/ml/automl/tuner/trail/Trail.scala b/...m/tencent/angel/ml/auto/trail/Trail.scala → ...l/spark/ml/automl/tuner/trail/Trail.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.trail
+package com.tencent.angel.spark.ml.automl.tuner.trail
 
 import com.tencent.angel.ml.auto.config.Configuration
 

diff --git a/...ent/angel/ml/auto/trail/TrailRunner.scala → ...k/ml/automl/tuner/trail/TrailRunner.scala b/...ent/angel/ml/auto/trail/TrailRunner.scala → ...k/ml/automl/tuner/trail/TrailRunner.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.trail
+package com.tencent.angel.spark.ml.automl.tuner.trail
 
 import java.util.concurrent.Callable
 

diff --git a/...ncent/angel/ml/auto/utils/DataUtils.scala → ...gel/spark/ml/automl/utils/DataUtils.scala b/...ncent/angel/ml/auto/utils/DataUtils.scala → ...gel/spark/ml/automl/utils/DataUtils.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.utils
+package com.tencent.angel.spark.ml.automl.utils
 
 import com.tencent.angel.ml.math2.vector.IntFloatVector
 import org.apache.spark.mllib.linalg.{Vector, Vectors}

diff --git a/...nt/angel/ml/auto/utils/Distribution.scala → .../spark/ml/automl/utils/Distribution.scala b/...nt/angel/ml/auto/utils/Distribution.scala → .../spark/ml/automl/utils/Distribution.scala
@@ -16,7 +16,7 @@
  */
 
 
-package com.tencent.angel.ml.auto.utils
+package com.tencent.angel.spark.ml.automl.utils
 
 object Distribution extends Enumeration {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
      */
-    package com.tencent.angel.ml.auto.config
+    package com.tencent.angel.spark.ml.automl.tuner.config
     import com.tencent.angel.ml.math2.vector.IntFloatVector
@@ Expand Down @@