From 0369ba33bb84405550446bc8e8dfde177e3e3e28 Mon Sep 17 00:00:00 2001
From: Qing <lanking520@live.com>
Date: Tue, 24 Jul 2018 14:27:59 -0700
Subject: [PATCH] add depreciate and example changes

---
 .../core/src/main/scala/org/apache/mxnet/IO.scala     |  2 ++
 .../mxnetexamples/imclassification/TrainMnist.scala   |  8 ++++++--
 .../org/apache/mxnetexamples/multitask/Data.scala     | 11 ++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/IO.scala b/scala-package/core/src/main/scala/org/apache/mxnet/IO.scala
index 57eca2140664..c3d0b43cd77c 100644
--- a/scala-package/core/src/main/scala/org/apache/mxnet/IO.scala
+++ b/scala-package/core/src/main/scala/org/apache/mxnet/IO.scala
@@ -354,9 +354,11 @@ abstract class DataIter extends Iterator[DataBatch] {
   def getIndex(): IndexedSeq[Long]
 
   // The name and shape of data provided by this iterator
+  @deprecated
   def provideData: ListMap[String, Shape]
 
   // The name and shape of label provided by this iterator
+  @deprecated
   def provideLabel: ListMap[String, Shape]
 
   // Provide type:DataDesc of the data
diff --git a/scala-package/examples/src/main/scala/org/apache/mxnetexamples/imclassification/TrainMnist.scala b/scala-package/examples/src/main/scala/org/apache/mxnetexamples/imclassification/TrainMnist.scala
index b0ecc7d29ccf..d8b79dc2b730 100644
--- a/scala-package/examples/src/main/scala/org/apache/mxnetexamples/imclassification/TrainMnist.scala
+++ b/scala-package/examples/src/main/scala/org/apache/mxnetexamples/imclassification/TrainMnist.scala
@@ -77,7 +77,9 @@ object TrainMnist {
       "shuffle" -> "True",
       "flat" -> flat,
       "num_parts" -> kv.numWorkers.toString,
-      "part_index" -> kv.`rank`.toString))
+      "part_index" -> kv.`rank`.toString,
+      "dataLayout" -> "NT",
+      "labelLayout" -> "N"))
 
     val eval = IO.MNISTIter(Map(
       "image" -> (dataDir + "t10k-images-idx3-ubyte"),
@@ -87,7 +89,9 @@ object TrainMnist {
       "batch_size" -> batchSize.toString,
       "flat" -> flat,
       "num_parts" -> kv.numWorkers.toString,
-      "part_index" -> kv.`rank`.toString))
+      "part_index" -> kv.`rank`.toString,
+      "dataLayout" -> "NT",
+      "labelLayout" -> "N"))
 
     (train, eval)
   }
diff --git a/scala-package/examples/src/main/scala/org/apache/mxnetexamples/multitask/Data.scala b/scala-package/examples/src/main/scala/org/apache/mxnetexamples/multitask/Data.scala
index bb17046b8b2b..2b0a20b40e76 100644
--- a/scala-package/examples/src/main/scala/org/apache/mxnetexamples/multitask/Data.scala
+++ b/scala-package/examples/src/main/scala/org/apache/mxnetexamples/multitask/Data.scala
@@ -21,9 +21,6 @@ import org.apache.mxnet.Shape
 import org.apache.mxnet.IO
 import org.apache.mxnet.DataIter
 
-/**
- * @author Depeng Liang
- */
 object Data {
 
   // return train and val iterators for mnist
@@ -35,7 +32,9 @@ object Data {
       "input_shape" -> inputShape.toString(),
       "batch_size" -> s"$batchSize",
       "shuffle" -> "True",
-      "flat" -> flat
+      "flat" -> flat,
+      "dataLayout" -> "NT",
+      "labelLayout" -> "N"
     )
     val trainDataIter = IO.MNISTIter(trainParams)
     val testParams = Map(
@@ -43,7 +42,9 @@ object Data {
       "label" -> s"$dataPath/t10k-labels-idx1-ubyte",
       "input_shape" -> inputShape.toString(),
       "batch_size" -> s"$batchSize",
-      "flat" -> flat
+      "flat" -> flat,
+      "dataLayout" -> "NT",
+      "labelLayout" -> "N"
     )
     val testDataIter = IO.MNISTIter(testParams)
     (trainDataIter, testDataIter)