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

…3137)
intel-analytics · Jul 2, 2021 · 8162f18 · 8162f18
1 parent ff9430b
commit 8162f18
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 1,696 deletions.
diff --git a/pyspark/bigdl/examples/keras/README.md b/pyspark/bigdl/examples/keras/README.md
@@ -50,4 +50,4 @@ ${SPARK_HOME}/bin/spark-submit \
 ```
 * ```--batchSize``` an option that can be used to set batch size.
 * ```--max_epoch``` an option that can be used to set how many epochs for which the model is to be trained.
-* ```--optimizerVersion``` an option that can be used to set DistriOptimizer version, the default value is "optimizerV2".
+* ```--optimizerVersion``` an option that can be used to set DistriOptimizer version, the default value is "optimizerV1".
diff --git a/pyspark/bigdl/examples/keras/imdb_cnn_lstm.py b/pyspark/bigdl/examples/keras/imdb_cnn_lstm.py
@@ -65,7 +65,7 @@ def build_keras_model():
     parser = OptionParser()
     parser.add_option("-b", "--batchSize", type=int, dest="batchSize", default="32")
     parser.add_option("-m", "--max_epoch", type=int, dest="max_epoch", default="2")
-    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV2")
+    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV1")
     (options, args) = parser.parse_args(sys.argv)
 
     keras_model = build_keras_model()
@@ -103,4 +103,4 @@ def build_keras_model():
         trigger=EveryEpoch(),
         val_method=[Top1Accuracy()]
     )
-    optimizer.optimize()
+    optimizer.optimize()
diff --git a/pyspark/bigdl/examples/keras/mnist_cnn.py b/pyspark/bigdl/examples/keras/mnist_cnn.py
@@ -78,7 +78,7 @@ def build_keras_model():
     parser.add_option("-b", "--batchSize", type=int, dest="batchSize", default="128")
     parser.add_option("-m", "--max_epoch", type=int, dest="max_epoch", default="12")
     parser.add_option("-d", "--dataPath", dest="dataPath", default="/tmp/mnist")
-    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV2")
+    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV1")
     (options, args) = parser.parse_args(sys.argv)
 
     keras_model = build_keras_model()

diff --git a/pyspark/bigdl/models/lenet/lenet5.py b/pyspark/bigdl/models/lenet/lenet5.py
@@ -60,7 +60,7 @@ def build_model(class_num):
     parser.add_option("-t", "--endTriggerType", dest="endTriggerType", default="epoch")
     parser.add_option("-n", "--endTriggerNum", type=int, dest="endTriggerNum", default="20")
     parser.add_option("-d", "--dataPath", dest="dataPath", default="/tmp/mnist")
-    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV2")
+    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV1")
 
     (options, args) = parser.parse_args(sys.argv)
 

diff --git a/pyspark/bigdl/models/textclassifier/textclassifier.py b/pyspark/bigdl/models/textclassifier/textclassifier.py
@@ -164,7 +164,7 @@ def train(sc, data_path,
     parser.add_option("--model", dest="model_type", default="cnn")
     parser.add_option("-p", "--p", dest="p", default="0.0")
     parser.add_option("-d", "--data_path", dest="data_path", default="/tmp/news20/")
-    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV2")
+    parser.add_option("--optimizerVersion", dest="optimizerVersion", default="optimizerV1")
 
     (options, args) = parser.parse_args(sys.argv)
     if options.action == "train":

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