refactor caffe2 operator constructors - 6/9 (#17087)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/17087

clangr codemod

Reviewed By: ezyang

Differential Revision: D14078525

fbshipit-source-id: 7cc03b30b0d4eb99818e35406be4119b27bdb1bc

diff --git a/caffe2/operators/percentile_op.h b/caffe2/operators/percentile_op.h
index 595713a..91e3783 100644 (file)
--- a/caffe2/operators/percentile_op.h
+++ b/caffe2/operators/percentile_op.h
@@ -17,8 +17,9 @@ template <class Context>
 class PercentileOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
-  PercentileOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws) {}
+  template <class... Args>
+  explicit PercentileOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override;
 

diff --git a/caffe2/operators/piecewise_linear_transform_op.h b/caffe2/operators/piecewise_linear_transform_op.h
index eeab4cd..8b27bd6 100644 (file)
--- a/caffe2/operators/piecewise_linear_transform_op.h
+++ b/caffe2/operators/piecewise_linear_transform_op.h
@@ -11,8 +11,9 @@ class PiecewiseLinearTransformOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  PiecewiseLinearTransformOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws) {
+  template <class... Args>
+  explicit PiecewiseLinearTransformOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...) {
     binary_ = this->template GetSingleArgument<bool>("binary", false);
 
     // Retrieve transform params (i.e., the linear functions).

diff --git a/caffe2/operators/pool_op.h b/caffe2/operators/pool_op.h
index 73119f4..77d0f06 100644 (file)
--- a/caffe2/operators/pool_op.h
+++ b/caffe2/operators/pool_op.h
@@ -16,8 +16,9 @@ class PoolOp final : public ConvPoolOpBase<Context> {
  public:
   USE_CONV_POOL_BASE_FUNCTIONS(Context);
 
-  PoolOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<Context>(operator_def, ws), functor_(*this) {
+  template <class... Args>
+  explicit PoolOp(Args&&... args)
+      : ConvPoolOpBase<Context>(std::forward<Args>(args)...), functor_(*this) {
     const int kernel_size = kernel_.size();
     for (int i = 0; i < kernel_size; ++i) {
       CAFFE_ENFORCE_EQ(
@@ -107,8 +108,9 @@ template <typename T, class Context, class Functor>
 class PoolGradientOp final : public ConvPoolOpBase<Context> {
  public:
   USE_CONV_POOL_BASE_FUNCTIONS(Context);
-  PoolGradientOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<Context>(operator_def, ws), functor_(*this) {}
+  template <class... Args>
+  explicit PoolGradientOp(Args&&... args)
+      : ConvPoolOpBase<Context>(std::forward<Args>(args)...), functor_(*this) {}
 
   ~PoolGradientOp() = default;
 

diff --git a/caffe2/operators/pool_op_cudnn.cc b/caffe2/operators/pool_op_cudnn.cc
index 45dfc41..5ccf479 100644 (file)
--- a/caffe2/operators/pool_op_cudnn.cc
+++ b/caffe2/operators/pool_op_cudnn.cc
@@ -50,8 +50,9 @@ void SetTensorDescriptor(
 template <class Functor>
 class CuDNNPoolOp final : public ConvPoolOpBase<CUDAContext> {
  public:
-  CuDNNPoolOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<CUDAContext>(operator_def, ws),
+  template <class... Args>
+  explicit CuDNNPoolOp(Args&&... args)
+      : ConvPoolOpBase<CUDAContext>(std::forward<Args>(args)...),
         cudnn_wrapper_(&context_),
         functor_(*this),
         equal_padding_(std::equal(
@@ -190,8 +191,9 @@ class CuDNNPoolOp final : public ConvPoolOpBase<CUDAContext> {
 template <class Functor>
 class CuDNNPoolGradientOp final : public ConvPoolOpBase<CUDAContext> {
  public:
-  CuDNNPoolGradientOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<CUDAContext>(operator_def, ws),
+  template <class... Args>
+  explicit CuDNNPoolGradientOp(Args&&... args)
+      : ConvPoolOpBase<CUDAContext>(std::forward<Args>(args)...),
         cudnn_wrapper_(&context_),
         functor_(*this),
         equal_padding_(std::equal(

diff --git a/caffe2/operators/pow_op.h b/caffe2/operators/pow_op.h
index a0b9159..481618f 100644 (file)
--- a/caffe2/operators/pow_op.h
+++ b/caffe2/operators/pow_op.h
@@ -20,8 +20,9 @@ class PowOp : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  PowOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit PowOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         OP_SINGLE_ARG(bool, "broadcast", enable_broadcast_, 0),
         OP_SINGLE_ARG(int, "axis", axis_, -1),
         OP_SINGLE_ARG(string, "axis_str", axis_str_, ""),

diff --git a/caffe2/operators/prelu_op.h b/caffe2/operators/prelu_op.h
index d0f3168..ad8383f 100644 (file)
--- a/caffe2/operators/prelu_op.h
+++ b/caffe2/operators/prelu_op.h
@@ -10,8 +10,9 @@ namespace caffe2 {
 template <typename T, class Context>
 class PReluOp final : public Operator<Context> {
  public:
-  PReluOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit PReluOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         order_(StringToStorageOrder(
             this->template GetSingleArgument<string>("order", "NCHW"))) {}
 
@@ -26,8 +27,9 @@ class PReluOp final : public Operator<Context> {
 template <typename T, class Context>
 class PReluGradientOp final : public Operator<Context> {
  public:
-  PReluGradientOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit PReluGradientOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         order_(StringToStorageOrder(
             this->template GetSingleArgument<string>("order", "NCHW"))) {}
   USE_OPERATOR_CONTEXT_FUNCTIONS;

diff --git a/caffe2/operators/prepend_dim_op.h b/caffe2/operators/prepend_dim_op.h
index ea5108b..2df840d 100644 (file)
--- a/caffe2/operators/prepend_dim_op.h
+++ b/caffe2/operators/prepend_dim_op.h
@@ -13,8 +13,9 @@ template <class Context>
 class PrependDimOp : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
-  PrependDimOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit PrependDimOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         dim_size_(this->template GetSingleArgument<int64_t>("dim_size", 0)) {
     CAFFE_ENFORCE_GT(
         dim_size_, 0, "Argument dim_size must be greater than zero.");
@@ -57,8 +58,9 @@ template <class Context>
 class MergeDimOp : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
-  MergeDimOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws) {}
+  template <class... Args>
+  explicit MergeDimOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override {
     auto& input = Input(0);

diff --git a/caffe2/operators/quant_decode_op.h b/caffe2/operators/quant_decode_op.h
index 40508dd..b4c4791 100644 (file)
--- a/caffe2/operators/quant_decode_op.h
+++ b/caffe2/operators/quant_decode_op.h
@@ -102,8 +102,9 @@ template <QuantDecodeRunTy QuantDecodeRun>
 class QuantDecodeOp final : public Operator<CPUContext> {
  public:
   USE_OPERATOR_FUNCTIONS(CPUContext);
-  QuantDecodeOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws) {}
+  template <class... Args>
+  explicit QuantDecodeOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...) {}
 
   ~QuantDecodeOp() {}
 
@@ -138,8 +139,9 @@ class QuantDecodeOp final : public Operator<CPUContext> {
 class QuantDecodeGradientOp final : public Operator<CPUContext> {
  public:
   USE_OPERATOR_FUNCTIONS(CPUContext);
-  QuantDecodeGradientOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws) {}
+  template <class... Args>
+  explicit QuantDecodeGradientOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...) {}
   ~QuantDecodeGradientOp() {}
 
   bool RunOnDevice() override {

diff --git a/caffe2/operators/quantized/int8_add_op.h b/caffe2/operators/quantized/int8_add_op.h
index 391bf86..803db2b 100644 (file)
--- a/caffe2/operators/quantized/int8_add_op.h
+++ b/caffe2/operators/quantized/int8_add_op.h
@@ -15,9 +15,8 @@ namespace int8 {
 template <Activation Ac>
 class Int8AddOp final : public Operator<CPUContext> {
  public:
-  Int8AddOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
-        ws_(ws) {}
+  explicit Int8AddOp(const OperatorDef& operator_def, Workspace* ws)
+      : Operator<CPUContext>(operator_def, ws), ws_(ws) {}
 
   ~Int8AddOp() {
     if (this->qnnpackOperator_ != nullptr) {

diff --git a/caffe2/operators/quantized/int8_average_pool_op.h b/caffe2/operators/quantized/int8_average_pool_op.h
index 1d542ce..2fb3665 100644 (file)
--- a/caffe2/operators/quantized/int8_average_pool_op.h
+++ b/caffe2/operators/quantized/int8_average_pool_op.h
@@ -16,8 +16,9 @@ namespace int8 {
 template <Activation Ac>
 class Int8AveragePoolOp final : public ConvPoolOpBase<CPUContext> {
  public:
-  Int8AveragePoolOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<CPUContext>(operator_def, ws) {
+  template <class... Args>
+  explicit Int8AveragePoolOp(Args&&... args)
+      : ConvPoolOpBase<CPUContext>(std::forward<Args>(args)...) {
     OPERATOR_NEEDS_FEATURE(
         this->order_ == StorageOrder::NHWC, "Int8 only supports NHWC order.");
   }

diff --git a/caffe2/operators/quantized/int8_channel_shuffle_op.h b/caffe2/operators/quantized/int8_channel_shuffle_op.h
index 0037e1d..865c462 100644 (file)
--- a/caffe2/operators/quantized/int8_channel_shuffle_op.h
+++ b/caffe2/operators/quantized/int8_channel_shuffle_op.h
@@ -15,9 +15,8 @@ namespace int8 {
 
 class Int8ChannelShuffleOp final : public ConvPoolOpBase<CPUContext> {
  public:
-  Int8ChannelShuffleOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<CPUContext>(operator_def, ws),
-        ws_(ws) {
+  explicit Int8ChannelShuffleOp(const OperatorDef& operator_def, Workspace* ws)
+      : ConvPoolOpBase<CPUContext>(operator_def, ws), ws_(ws) {
     OPERATOR_NEEDS_FEATURE(
         this->order_ == StorageOrder::NHWC,
         "Int8ChannelShuffleOp only supports NHWC order");

diff --git a/caffe2/operators/quantized/int8_concat_op.h b/caffe2/operators/quantized/int8_concat_op.h
index fb41d6f..b501bc1 100644 (file)
--- a/caffe2/operators/quantized/int8_concat_op.h
+++ b/caffe2/operators/quantized/int8_concat_op.h
@@ -12,8 +12,9 @@ namespace int8 {
 
 class Int8ConcatOp final : public Operator<CPUContext> {
  public:
-  Int8ConcatOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws) {
+  template <class... Args>
+  explicit Int8ConcatOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...) {
     // concat supports more than NHWC format
     if (this->template GetSingleArgument<string>("order", "") == "NHWC") {
       // Default to C axis

diff --git a/caffe2/operators/quantized/int8_conv_op.h b/caffe2/operators/quantized/int8_conv_op.h
index 2864724..45acab8 100644 (file)
--- a/caffe2/operators/quantized/int8_conv_op.h
+++ b/caffe2/operators/quantized/int8_conv_op.h
@@ -18,8 +18,9 @@ template <Activation Ac>
 class Int8ConvOp final : public ConvPoolOpBase<CPUContext> {
  public:
   USE_CONV_POOL_BASE_FUNCTIONS(CPUContext);
-  Int8ConvOp(const OperatorDef& def, Workspace* ws)
-      : ConvPoolOpBase(def, ws) {
+  template <class... Args>
+  explicit Int8ConvOp(Args&&... args)
+      : ConvPoolOpBase(std::forward<Args>(args)...) {
     OPERATOR_NEEDS_FEATURE(
         this->order_ == StorageOrder::NHWC,
         "Int8Conv only supports NHWC order");

diff --git a/caffe2/operators/quantized/int8_conv_transpose_op.h b/caffe2/operators/quantized/int8_conv_transpose_op.h
index 966c259..ac3c99b 100644 (file)
--- a/caffe2/operators/quantized/int8_conv_transpose_op.h
+++ b/caffe2/operators/quantized/int8_conv_transpose_op.h
@@ -17,8 +17,9 @@ namespace int8 {
 class Int8ConvTransposeOp final : public ConvTransposeUnpoolBase<CPUContext> {
  public:
   USE_CONV_TRANSPOSE_UNPOOL_BASE_FUNCTIONS(CPUContext);
-  Int8ConvTransposeOp(const OperatorDef& def, Workspace* ws)
-      : ConvTransposeUnpoolBase(def, ws) {
+  template <class... Args>
+  explicit Int8ConvTransposeOp(Args&&... args)
+      : ConvTransposeUnpoolBase(std::forward<Args>(args)...) {
     OPERATOR_NEEDS_FEATURE(
         this->order_ == StorageOrder::NHWC,
         "Int8ConvTransposeOp only supports NHWC order");

diff --git a/caffe2/operators/quantized/int8_fc_op.h b/caffe2/operators/quantized/int8_fc_op.h
index 85f51e1..a5a2af3 100644 (file)
--- a/caffe2/operators/quantized/int8_fc_op.h
+++ b/caffe2/operators/quantized/int8_fc_op.h
@@ -15,9 +15,8 @@ namespace int8 {
 
 class Int8FCOp final : public Operator<CPUContext> {
  public:
-  Int8FCOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
-        ws_(ws) {
+  explicit Int8FCOp(const OperatorDef& operator_def, Workspace* ws)
+      : Operator<CPUContext>(operator_def, ws), ws_(ws) {
     createSharedBuffer<CPUContext>(ws_);
   }
 

diff --git a/caffe2/operators/quantized/int8_flatten_op.h b/caffe2/operators/quantized/int8_flatten_op.h
index 79981cc..5660ae4 100644 (file)
--- a/caffe2/operators/quantized/int8_flatten_op.h
+++ b/caffe2/operators/quantized/int8_flatten_op.h
@@ -12,8 +12,9 @@ namespace int8 {
 
 class Int8FlattenOp : public Operator<CPUContext> {
  public:
-  Int8FlattenOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
+  template <class... Args>
+  explicit Int8FlattenOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...),
         axis_(this->template GetSingleArgument<int>("axis", 1)) {}
 
   bool RunOnDevice() override {

diff --git a/caffe2/operators/quantized/int8_given_tensor_fill_op.h b/caffe2/operators/quantized/int8_given_tensor_fill_op.h
index 6eb5389..68827b3 100644 (file)
--- a/caffe2/operators/quantized/int8_given_tensor_fill_op.h
+++ b/caffe2/operators/quantized/int8_given_tensor_fill_op.h
@@ -14,8 +14,9 @@ namespace int8 {
 
 class Int8GivenTensorFillOp final : public Operator<CPUContext> {
  public:
-  Int8GivenTensorFillOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
+  template <class... Args>
+  explicit Int8GivenTensorFillOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...),
         scale_(this->template GetSingleArgument<float>("Y_scale", 1.0)),
         zero_point_(
             this->template GetSingleArgument<int32_t>("Y_zero_point", 0)),
@@ -63,8 +64,9 @@ class Int8GivenTensorFillOp final : public Operator<CPUContext> {
 
 class Int8GivenIntTensorFillOp final : public Operator<CPUContext> {
  public:
-  Int8GivenIntTensorFillOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
+  template <class... Args>
+  explicit Int8GivenIntTensorFillOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...),
         scale_(this->template GetSingleArgument<float>("Y_scale", 1.0)),
         zero_point_(
             this->template GetSingleArgument<int32_t>("Y_zero_point", 0)),

diff --git a/caffe2/operators/quantized/int8_leaky_relu_op.h b/caffe2/operators/quantized/int8_leaky_relu_op.h
index ef7dc1f..b16ff81 100644 (file)
--- a/caffe2/operators/quantized/int8_leaky_relu_op.h
+++ b/caffe2/operators/quantized/int8_leaky_relu_op.h
@@ -14,9 +14,8 @@ namespace int8 {
 
 class Int8LeakyReluOp final : public Operator<CPUContext> {
  public:
-  Int8LeakyReluOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
-        ws_(ws) {
+  explicit Int8LeakyReluOp(const OperatorDef& operator_def, Workspace* ws)
+      : Operator<CPUContext>(operator_def, ws), ws_(ws) {
     const float alpha = this->template GetSingleArgument<float>("alpha", 0.01);
     CAFFE_ENFORCE_GT(alpha, 0.0);
     CAFFE_ENFORCE_LT(alpha, 1.0);

diff --git a/caffe2/operators/quantized/int8_max_pool_op.h b/caffe2/operators/quantized/int8_max_pool_op.h
index ce65bb4..d0b7028 100644 (file)
--- a/caffe2/operators/quantized/int8_max_pool_op.h
+++ b/caffe2/operators/quantized/int8_max_pool_op.h
@@ -16,8 +16,9 @@ namespace int8 {
 template <Activation Ac>
 class Int8MaxPoolOp final : public ConvPoolOpBase<CPUContext> {
  public:
-  Int8MaxPoolOp(const OperatorDef& operator_def, Workspace* ws)
-      : ConvPoolOpBase<CPUContext>(operator_def, ws) {
+  template <class... Args>
+  explicit Int8MaxPoolOp(Args&&... args)
+      : ConvPoolOpBase<CPUContext>(std::forward<Args>(args)...) {
     OPERATOR_NEEDS_FEATURE(
         this->order_ == StorageOrder::NHWC, "Int8 only supports NHWC order.");
   }

diff --git a/caffe2/operators/quantized/int8_relu_op.h b/caffe2/operators/quantized/int8_relu_op.h
index 843f8aa..605f53a 100644 (file)
--- a/caffe2/operators/quantized/int8_relu_op.h
+++ b/caffe2/operators/quantized/int8_relu_op.h
@@ -14,9 +14,8 @@ namespace int8 {
 
 class Int8ReluOp final : public Operator<CPUContext> {
  public:
-  Int8ReluOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
-        ws_(ws) {}
+  explicit Int8ReluOp(const OperatorDef& operator_def, Workspace* ws)
+      : Operator<CPUContext>(operator_def, ws), ws_(ws) {}
 
   ~Int8ReluOp() {
     if (this->qnnpackOperator_ != nullptr) {

diff --git a/caffe2/operators/quantized/int8_reshape_op.h b/caffe2/operators/quantized/int8_reshape_op.h
index 0aa2000..e3226a9 100644 (file)
--- a/caffe2/operators/quantized/int8_reshape_op.h
+++ b/caffe2/operators/quantized/int8_reshape_op.h
@@ -13,8 +13,9 @@ namespace int8 {
 
 class Int8ReshapeOp final : public ReshapeOp<uint8_t, CPUContext> {
  public:
-  Int8ReshapeOp(const OperatorDef& operator_def, Workspace* ws)
-      : ReshapeOp(operator_def, ws) {}
+  template <class... Args>
+  explicit Int8ReshapeOp(Args&&... args)
+      : ReshapeOp(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override {
     if (InputSize() == 2) {

diff --git a/caffe2/operators/quantized/int8_resize_nearest_op.h b/caffe2/operators/quantized/int8_resize_nearest_op.h
index 5ebf629..0bc6be3 100644 (file)
--- a/caffe2/operators/quantized/int8_resize_nearest_op.h
+++ b/caffe2/operators/quantized/int8_resize_nearest_op.h
@@ -12,8 +12,9 @@ namespace int8 {
 
 class Int8ResizeNearestOp final : public Operator<CPUContext> {
  public:
-  Int8ResizeNearestOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws) {
+  template <class... Args>
+  explicit Int8ResizeNearestOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...) {
     width_scale_ = this->template GetSingleArgument<float>("width_scale", 1);
     height_scale_ = this->template GetSingleArgument<float>("height_scale", 1);
     CAFFE_ENFORCE_GT(width_scale_, 0);

diff --git a/caffe2/operators/quantized/int8_roi_align_op.h b/caffe2/operators/quantized/int8_roi_align_op.h
index 493132b..ff506b8 100644 (file)
--- a/caffe2/operators/quantized/int8_roi_align_op.h
+++ b/caffe2/operators/quantized/int8_roi_align_op.h
@@ -258,8 +258,9 @@ void ROIAlignForward(
 
 class Int8RoIAlignOp final : public Operator<CPUContext> {
  public:
-  Int8RoIAlignOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
+  template <class... Args>
+  explicit Int8RoIAlignOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...),
         order_(StringToStorageOrder(
             this->template GetSingleArgument<string>("order", "NHWC"))),
         spatial_scale_(

diff --git a/caffe2/operators/quantized/int8_sigmoid_op.h b/caffe2/operators/quantized/int8_sigmoid_op.h
index 5773bde..85bc4d1 100644 (file)
--- a/caffe2/operators/quantized/int8_sigmoid_op.h
+++ b/caffe2/operators/quantized/int8_sigmoid_op.h
@@ -13,9 +13,8 @@ namespace int8 {
 
 class Int8SigmoidOp final : public Operator<CPUContext> {
  public:
-  Int8SigmoidOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws),
-        ws_(ws) {}
+  explicit Int8SigmoidOp(const OperatorDef& operator_def, Workspace* ws)
+      : Operator<CPUContext>(operator_def, ws), ws_(ws) {}
 
   ~Int8SigmoidOp() {
     if (this->qnnpackOperator_ != nullptr) {

diff --git a/caffe2/operators/quantized/int8_slice_op.h b/caffe2/operators/quantized/int8_slice_op.h
index 7847715..4a1e3ef 100644 (file)
--- a/caffe2/operators/quantized/int8_slice_op.h
+++ b/caffe2/operators/quantized/int8_slice_op.h
@@ -13,8 +13,8 @@ namespace int8 {
 
 class Int8SliceOp final : public SliceOp<CPUContext> {
  public:
-  Int8SliceOp(const OperatorDef& operator_def, Workspace* ws)
-      : SliceOp(operator_def, ws) {}
+  template <class... Args>
+  explicit Int8SliceOp(Args&&... args) : SliceOp(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override {
     if (InputSize() > 1) {