diff --git a/caffe2/operators/conv_pool_op_base.h b/caffe2/operators/conv_pool_op_base.h index 496670faaf7..b1b4001f6b8 100644 --- a/caffe2/operators/conv_pool_op_base.h +++ b/caffe2/operators/conv_pool_op_base.h @@ -163,7 +163,6 @@ class ConvPoolOpBase : public Operator { // exact padding values. This isolates out the padding scheme that are growing // unfortunately complex due to implementational differences from different // frameworks. - LegacyPadding legacy_pad_; int pad_; protected: @@ -176,6 +175,7 @@ class ConvPoolOpBase : public Operator { int stride_h_; int stride_w_; StorageOrder order_; + LegacyPadding legacy_pad_; inline void ComputeSizeAndPad( const int in_size, const int stride, const int kernel, diff --git a/caffe2/python/caffe_translator_test.py b/caffe2/python/caffe_translator_test.py index 06c4f856186..621554f7e77 100644 --- a/caffe2/python/caffe_translator_test.py +++ b/caffe2/python/caffe_translator_test.py @@ -56,9 +56,8 @@ if __name__ == '__main__': .read() ) net, pretrained_params = caffe_translator.TranslateModel( - caffenet, caffenet_pretrained + caffenet, caffenet_pretrained, is_test=True ) - caffe_translator.DeleteDropout(net) with open('data/testdata/caffe_translator/' 'bvlc_reference_caffenet.translatedmodel', 'w') as fid: