Change usage of Reshape in cpp-package

cpp-package/example/charRNN.cpp

@@ -115,7 +115,7 @@ Symbol LSTMUnroll(int num_lstm_layer, int sequence_length, int input_dim,
 
   auto label = Symbol::Variable("softmax_label");
   label = transpose(label);
-  label = Reshape(label, Shape(), false, false, Shape(-1));  // -1: infer from graph
+  label = Reshape(label, Shape(), false, Shape(-1), false);  // -1: infer from graph
   auto sm = SoftmaxOutput("softmax", pred, label);
   if (isTrain)
     return sm;
@@ -141,7 +141,7 @@ Symbol LSTMWithBuiltInRNNOp(int num_lstm_layer, int sequence_length, int input_d
   auto label = Symbol::Variable("softmax_label");
   label = transpose(label);
   label = Reshape(label, Shape(), false,
-                  false, Shape(-1));  // FullyConnected requires one dimension
+                  Shape(-1), false);  // FullyConnected requires one dimension
   if (!TIME_MAJOR && isTrain)
     embed = SwapAxis(embed, 0, 1);  // Change to time-major as cuDNN requires
 
@@ -151,7 +151,7 @@ Symbol LSTMWithBuiltInRNNOp(int num_lstm_layer, int sequence_length, int input_d
   auto rnn_params = Symbol::Variable("LSTM_parameters");  // See explanations near RNNXavier class
   auto rnn = RNN(embed, rnn_params, rnn_h_init, rnn_c_init, num_hidden, num_lstm_layer,
       RNNMode::lstm, false, dropout, !isTrain);
-  auto hidden = Reshape(rnn[0], Shape(), false, false, Shape(-1, num_hidden));
+  auto hidden = Reshape(rnn[0], Shape(), false, Shape(-1, num_hidden), false);
 
   auto cls_weight = Symbol::Variable("cls_weight");
   auto cls_bias = Symbol::Variable("cls_bias");

src/operator/tensor/matrix_op-inl.h

@@ -32,10 +32,6 @@ struct ReshapeParam : public dmlc::Parameter<ReshapeParam> {
     DMLC_DECLARE_FIELD(shape)
     .set_default(nnvm::Tuple<int>())
     .describe("The target shape");
-    DMLC_DECLARE_FIELD(keep_highest).set_default(false)
-    .describe("(Deprecated! Use ``shape`` instead.) Whether keep the highest dim unchanged."
-              "If set to true, then the first dim in target_shape is ignored,"
-              "and always fixed as input");
     DMLC_DECLARE_FIELD(reverse)
     .set_default(false)
     .describe("If true then the special values are inferred from right to left");
@@ -44,6 +40,10 @@ struct ReshapeParam : public dmlc::Parameter<ReshapeParam> {
     .describe("(Deprecated! Use ``shape`` instead.) "
               "Target new shape. One and only one dim can be 0, "
               "in which case it will be inferred from the rest of dims");
+    DMLC_DECLARE_FIELD(keep_highest).set_default(false)
+    .describe("(Deprecated! Use ``shape`` instead.) Whether keep the highest dim unchanged."
+              "If set to true, then the first dim in target_shape is ignored,"
+              "and always fixed as input");
   }
 };