move dlframe SharedParamsApater to AZ and roll back to OptimizerV1 (i…

…ntel-analytics#3137)
dding3 · Jul 2, 2021 · f42465f · f42465f
1 parent b70343a
commit f42465f
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 1,690 deletions.
diff --git a/bigdl/common/utils/src/main/scala/com/intel/analytics/bigdl/utils/Engine.scala b/bigdl/common/utils/src/main/scala/com/intel/analytics/bigdl/utils/Engine.scala
@@ -225,10 +225,10 @@ object Engine {
 
   /**
    * Notice: Please use property bigdl.optimizerVersion to set optimizerVersion.
-   * Default version is OptimizerV2
+   * Default version is OptimizerV1
    */
   private var optimizerVersion: OptimizerVersion = {
-    System.getProperty("bigdl.optimizerVersion", "optimizerv2").toLowerCase(Locale.ROOT) match {
+    System.getProperty("bigdl.optimizerVersion", "optimizerv1").toLowerCase(Locale.ROOT) match {
       case "optimizerv1" => OptimizerV1
       case "optimizerv2" => OptimizerV2
       case optimizerVersion => throw new IllegalArgumentException(s"Unknown type $optimizerVersion")

diff --git a/.../main/scala/com/intel/analytics/bigdl/dllib/example/treeLSTMSentiment/README.md b/.../main/scala/com/intel/analytics/bigdl/dllib/example/treeLSTMSentiment/README.md
@@ -65,6 +65,6 @@ Next just run the following command to run the code:
              --regRate           # number of L2 regularization rate, default is 1e-4
              --p                 # number of dropout probability rate, default is 0.5
              --epoch             # number of epochs, default is 5
-             --optimizerVersion  # option to set DistriOptimizer version, default is "optimizerV2"
+             --optimizerVersion  # option to set DistriOptimizer version, default is "optimizerV1"
     ```
 
diff --git a/bigdl/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/models/resnet/README.md b/bigdl/dllib/src/main/scala/com/intel/analytics/bigdl/dllib/models/resnet/README.md
@@ -73,7 +73,7 @@ We support Local and Spark versions of training. Users can define <code>env</cod
     --weightDecay   [default 1e-4]
     --dampening     [default 0.0]
     --nesterov      [default true]
-    --optimizerVersion  [distriOptimizer version, default "optimizerV2"]
+    --optimizerVersion  [distriOptimizer version, default "optimizerV1"]
 ```
 ## Train ResNet on ImageNet
 This example shows the best practise we've experimented in multi-node training

diff --git a/spark/dl/src/main/scala/com/intel/analytics/bigdl/dlframes/DLClassifier.scala b/spark/dl/src/main/scala/com/intel/analytics/bigdl/dlframes/DLClassifier.scala