Deprecate Backprop and Pretrain options when configuring ComputationGraph and MultiLayer (deeplearning4j#6296)

* Deprecate Backprop and Pretrain options when configuring ComputationGraph and MultiLayer

* Deprecate Backprop and Pretrain options when configuring ComputationGraph and MultiLayer

Author: treo

deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/ComputationGraphConfiguration.java

@@ -28,10 +28,11 @@
 import org.deeplearning4j.nn.conf.layers.samediff.SameDiffVertex;
 import org.deeplearning4j.nn.conf.memory.MemoryReport;
 import org.deeplearning4j.nn.conf.memory.NetworkMemoryReport;
-import org.deeplearning4j.nn.layers.samediff.SameDiffGraphVertex;
 import org.nd4j.base.Preconditions;
 import org.nd4j.linalg.activations.Activation;
 import org.nd4j.linalg.activations.IActivation;
+import org.nd4j.linalg.dataset.api.MultiDataSet;
+import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
 import org.nd4j.shade.jackson.databind.JsonNode;
 import org.nd4j.shade.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -597,7 +598,9 @@ public static class GraphBuilder {
         protected List<InputType> networkInputTypes = new ArrayList<>();
         protected List<String> networkOutputs = new ArrayList<>();
 
+        @Deprecated
         protected boolean pretrain = false;
+        @Deprecated
         protected boolean backprop = true;
         protected BackpropType backpropType = BackpropType.Standard;
         protected int tbpttFwdLength = DEFAULT_TBPTT_LENGTH;
@@ -649,8 +652,11 @@ public GraphBuilder inputPreProcessor(String layer, InputPreProcessor processor)
         /**
          * Whether to do back prop (standard supervised learning) or not
          *
+         * @deprecated doesn't affect training any more. Use {@link org.deeplearning4j.nn.graph.ComputationGraph#fit(MultiDataSet)} when training for backprop.
+         *
          * @param backprop whether to do back prop or not
          */
+        @Deprecated
         public GraphBuilder backprop(boolean backprop) {
             this.backprop = backprop;
             return this;
@@ -659,8 +665,11 @@ public GraphBuilder backprop(boolean backprop) {
         /**
          * Whether to do layerwise pre training or not
          *
+         * @deprecated doesn't affect training any more. Use {@link org.deeplearning4j.nn.graph.ComputationGraph#pretrain(MultiDataSetIterator)} when training for layerwise pretraining.
+         *
          * @param pretrain whether to do pre train or not
          */
+        @Deprecated
         public GraphBuilder pretrain(boolean pretrain) {
             this.pretrain = pretrain;
             return this;

deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/MultiLayerConfiguration.java

@@ -25,7 +25,6 @@
 import org.deeplearning4j.nn.conf.memory.LayerMemoryReport;
 import org.deeplearning4j.nn.conf.memory.MemoryReport;
 import org.deeplearning4j.nn.conf.memory.NetworkMemoryReport;
-import org.deeplearning4j.nn.layers.AbstractLayer;
 import org.nd4j.linalg.activations.Activation;
 import org.nd4j.linalg.activations.IActivation;
 import org.nd4j.linalg.factory.Nd4j;
@@ -389,7 +388,9 @@ public static class Builder {
         protected List<NeuralNetConfiguration> confs = new ArrayList<>();
         protected double dampingFactor = 100;
         protected Map<Integer, InputPreProcessor> inputPreProcessors = new HashMap<>();
+        @Deprecated
         protected boolean pretrain = false;
+        @Deprecated
         protected boolean backprop = true;
         protected BackpropType backpropType = BackpropType.Standard;
         protected int tbpttFwdLength = DEFAULT_TBPTT_LENGTH;
@@ -419,9 +420,13 @@ public Builder inputPreProcessors(Map<Integer, InputPreProcessor> processors) {
 
         /**
          * Whether to do back prop or not
+         *
+         * @deprecated doesn't affect training any more. Use {@link org.deeplearning4j.nn.multilayer.MultiLayerNetwork#fit(DataSetIterator)} when training for backprop.
+         *
          * @param backprop whether to do back prop or not
          * @return
          */
+        @Deprecated
         public Builder backprop(boolean backprop) {
             this.backprop = backprop;
             return this;
@@ -506,9 +511,13 @@ public Builder tBPTTBackwardLength(int backwardLength) {
 
         /**
          * Whether to do pre train or not
+         *
+         * @deprecated doesn't affect training any more. Use {@link org.deeplearning4j.nn.multilayer.MultiLayerNetwork#pretrain(DataSetIterator)} when training for layerwise pretraining.
+         *
          * @param pretrain whether to do pre train or not
          * @return builder pattern
          */
+        @Deprecated
         public Builder pretrain(boolean pretrain) {
             this.pretrain = pretrain;
             return this;