[src] fixed copy-constructor bug RE test_mode option for DropoutComponent (#1845)

3 files changed, 18 insertions, 3 deletions

diff --git a/src/nnet3/nnet-component-itf.h b/src/nnet3/nnet-component-itf.h
index 060238203..f94228a1c 100644
--- a/src/nnet3/nnet-component-itf.h
+++ b/src/nnet3/nnet-component-itf.h
@@ -403,6 +403,9 @@ class RandomComponent: public Component {
   void SetTestMode(bool test_mode) { test_mode_ = test_mode; }
 
   RandomComponent(): test_mode_(false) { }
+
+  RandomComponent(const RandomComponent &other):
+      test_mode_(other.test_mode_) {}
  protected:
   CuRand<BaseFloat> random_generator_;
 
diff --git a/src/nnet3/nnet-simple-component.cc b/src/nnet3/nnet-simple-component.cc
index dff3b0497..a77da760c 100644
--- a/src/nnet3/nnet-simple-component.cc
+++ b/src/nnet3/nnet-simple-component.cc
@@ -88,6 +88,16 @@ void PnormComponent::Write(std::ostream &os, bool binary) const {
   WriteToken(os, binary, "</PnormComponent>");
 }
 
+DropoutComponent::DropoutComponent(const DropoutComponent &other):
+    RandomComponent(other),
+    dim_(other.dim_),
+    dropout_proportion_(other.dropout_proportion_),
+    dropout_per_frame_(other.dropout_per_frame_) { }
+
+Component* DropoutComponent::Copy() const {
+  DropoutComponent *ans = new DropoutComponent(*this);
+  return ans;
+}
 
 void DropoutComponent::Init(int32 dim, BaseFloat dropout_proportion,
                             bool dropout_per_frame) {
diff --git a/src/nnet3/nnet-simple-component.h b/src/nnet3/nnet-simple-component.h
index a10df8c88..5649d4e54 100644
--- a/src/nnet3/nnet-simple-component.h
+++ b/src/nnet3/nnet-simple-component.h
@@ -99,6 +99,8 @@ class DropoutComponent : public RandomComponent {
   DropoutComponent(): dim_(0), dropout_proportion_(0.0),
                       dropout_per_frame_(false) { }
 
+  DropoutComponent(const DropoutComponent &other);
+
   virtual int32 Properties() const {
     return kLinearInInput|kBackpropInPlace|kSimpleComponent|kBackpropNeedsInput|
         kBackpropNeedsOutput|kRandomComponent;
@@ -127,9 +129,9 @@ class DropoutComponent : public RandomComponent {
                         void *memo,
                         Component *to_update,
                         CuMatrixBase<BaseFloat> *in_deriv) const;
-  virtual Component* Copy() const { return new DropoutComponent(dim_,
-                                               dropout_proportion_,
-                                               dropout_per_frame_); }
+
+  virtual Component* Copy() const;
+
   virtual std::string Info() const;
 
   void SetDropoutProportion(BaseFloat dropout_proportion) {