diff --git a/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureCross.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureCross.scala new file mode 100644 index 000000000..4c74de541 --- /dev/null +++ b/spark-on-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/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureSelector.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/FeatureSelector.scala new file mode 100644 index 000000000..7dec759ae --- /dev/null +++ b/spark-on-angel/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/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/PreProcessing.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/feature/PreProcessing.scala new file mode 100644 index 000000000..c20abcc9b --- /dev/null +++ b/spark-on-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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/Example.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/Example.scala similarity index 69% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/Example.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/Example.scala index b734fc3b5..0b7dc993d 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/Example.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/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}") } -} \ No newline at end of file +} diff --git a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/Acquisition.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/Acquisition.scala similarity index 95% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/Acquisition.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/Acquisition.scala index b6ab6e23b..3114e3c0c 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/Acquisition.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/EI.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/EI.scala similarity index 97% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/EI.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/EI.scala index ddfd4516d..e4cae1454 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/EI.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/AcqOptimizer.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/optimizer/AcqOptimizer.scala similarity index 95% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/AcqOptimizer.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/optimizer/AcqOptimizer.scala index 5d0f88fb6..590d3431c 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/AcqOptimizer.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/LocalSearch.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/optimizer/LocalSearch.scala similarity index 96% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/LocalSearch.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/optimizer/LocalSearch.scala index ef9349944..7fe88e3d3 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/LocalSearch.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/RandomSearch.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/optimizer/RandomSearch.scala similarity index 96% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/RandomSearch.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/acquisition/optimizer/RandomSearch.scala index e5bcc2571..4b3793d72 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/acquisition/optimizer/RandomSearch.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/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-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/config/Configuration.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/config/Configuration.scala similarity index 96% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/config/Configuration.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/config/Configuration.scala index 29425d613..efd4e4609 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/config/Configuration.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/config/ConfigurationSpace.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/config/ConfigurationSpace.scala similarity index 98% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/config/ConfigurationSpace.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/config/ConfigurationSpace.scala index 862a37b57..ea39a4b1f 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/config/ConfigurationSpace.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/ContinuousSpace.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/parameter/ContinuousSpace.scala similarity index 97% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/ContinuousSpace.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/parameter/ContinuousSpace.scala index 56bfe0320..0b39c6c93 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/ContinuousSpace.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/DiscreteSpace.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/parameter/DiscreteSpace.scala similarity index 96% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/DiscreteSpace.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/parameter/DiscreteSpace.scala index 9f5bea824..c4296a459 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/DiscreteSpace.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/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-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/ParamSpace.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/parameter/ParamSpace.scala similarity index 94% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/ParamSpace.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/parameter/ParamSpace.scala index cd7184ec9..55ab25e40 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/parameter/ParamSpace.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/setting/Setting.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/setting/Setting.scala similarity index 95% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/setting/Setting.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/setting/Setting.scala index 94f19f5ba..13de4d332 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/setting/Setting.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/solver/Solver.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/solver/Solver.scala similarity index 97% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/solver/Solver.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/solver/Solver.scala index 30ec39b6a..445b7f503 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/solver/Solver.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/solver/SolverWithTrail.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/solver/SolverWithTrail.scala similarity index 96% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/solver/SolverWithTrail.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/solver/SolverWithTrail.scala index 7dba25cfc..b3d6f25b6 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/solver/SolverWithTrail.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/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-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/surrogate/RFSurrogate.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/surrogate/RFSurrogate.scala similarity index 97% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/surrogate/RFSurrogate.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/surrogate/RFSurrogate.scala index 6dcc62eff..9127bf847 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/surrogate/RFSurrogate.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/surrogate/Surrogate.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/surrogate/Surrogate.scala similarity index 98% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/surrogate/Surrogate.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/surrogate/Surrogate.scala index f815c886a..95b77a46d 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/surrogate/Surrogate.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TestRunner.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/TestRunner.scala similarity index 94% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TestRunner.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/TestRunner.scala index 2aacf62f1..45f546eb4 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TestRunner.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TestTrail.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/TestTrail.scala similarity index 95% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TestTrail.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/TestTrail.scala index 3cdf3701e..6256854b1 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TestTrail.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/Trail.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/Trail.scala similarity index 94% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/Trail.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/Trail.scala index c00f24fc8..893cc8016 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/Trail.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TrailRunner.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/TrailRunner.scala similarity index 94% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TrailRunner.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/tuner/trail/TrailRunner.scala index 4a6deee94..bec0ce404 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/trail/TrailRunner.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/utils/DataUtils.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/utils/DataUtils.scala similarity index 97% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/utils/DataUtils.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/utils/DataUtils.scala index 9e1255db0..75d170f5f 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/utils/DataUtils.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/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/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/utils/Distribution.scala b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/utils/Distribution.scala similarity index 95% rename from angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/utils/Distribution.scala rename to spark-on-angel/mllib/src/main/scala/com/tencent/angel/spark/ml/automl/utils/Distribution.scala index af0f61274..fda53d886 100644 --- a/angel-ps/mllib/src/main/scala/com/tencent/angel/ml/auto/utils/Distribution.scala +++ b/spark-on-angel/mllib/src/main/scala/com/tencent/angel/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 {