refactor caffe2 operator constructors - 1/9 (pytorch#17082)

smessmer · facebook-github-bot · commit 54c4b5a4db6e · 2019-03-04T16:04:01.000-08:00
Summary: Pull Request resolved: pytorch#17082 clangr codemod Reviewed By: ezyang Differential Revision: D14078498 fbshipit-source-id: f7f65d6d81c7942293f53fdaa61f756d8b7360c1
diff --git a/caffe2/operators/accumulate_op.h b/caffe2/operators/accumulate_op.h
@@ -10,8 +10,9 @@ namespace caffe2 {
 template <typename T, class Context>
 class AccumulateOp final : public Operator<Context> {
  public:
-  AccumulateOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit AccumulateOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         gamma_(static_cast<T>(
             this->template GetSingleArgument<float>("gamma", 1.0))) {}
   USE_OPERATOR_CONTEXT_FUNCTIONS;
diff --git a/caffe2/operators/accuracy_op.h b/caffe2/operators/accuracy_op.h
@@ -10,10 +10,11 @@ template <typename T, class Context>
 class AccuracyOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
-  AccuracyOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit AccuracyOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         top_k_(this->template GetSingleArgument<int>("top_k", 1)) {}
-        
+
   bool RunOnDevice() override;
 
  protected:
diff --git a/caffe2/operators/activation_ops_cudnn.h b/caffe2/operators/activation_ops_cudnn.h
@@ -13,8 +13,10 @@ class CuDNNActivationOpBase : public Operator<CUDAContext> {
  public:
   USE_OPERATOR_FUNCTIONS(CUDAContext);
 
-  CuDNNActivationOpBase(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CUDAContext>(operator_def, ws), cudnn_wrapper_(&context_) {
+  template <class... Args>
+  explicit CuDNNActivationOpBase(Args&&... args)
+      : Operator<CUDAContext>(std::forward<Args>(args)...),
+        cudnn_wrapper_(&context_) {
     CUDNN_ENFORCE(cudnnCreateTensorDescriptor(&data_desc_));
     CUDNN_ENFORCE(cudnnCreateActivationDescriptor(&act_desc_));
   }
@@ -55,8 +57,9 @@ class CuDNNActivationOp final : public CuDNNActivationOpBase {
  public:
   USE_OPERATOR_FUNCTIONS(CUDAContext);
 
-  CuDNNActivationOp(const OperatorDef& operator_def, Workspace* ws)
-      : CuDNNActivationOpBase(operator_def, ws) {
+  template <class... Args>
+  explicit CuDNNActivationOp(Args&&... args)
+      : CuDNNActivationOpBase(std::forward<Args>(args)...) {
     CUDNN_ENFORCE(cudnnSetActivationDescriptor(
         act_desc_, kCuDNNActivationMode, CUDNN_PROPAGATE_NAN, 0.0));
   }
@@ -93,8 +96,9 @@ class CuDNNActivationGradientOp final : public CuDNNActivationOpBase {
  public:
   USE_OPERATOR_FUNCTIONS(CUDAContext);
 
-  CuDNNActivationGradientOp(const OperatorDef& operator_def, Workspace* ws)
-      : CuDNNActivationOpBase(operator_def, ws) {
+  template <class... Args>
+  explicit CuDNNActivationGradientOp(Args&&... args)
+      : CuDNNActivationOpBase(std::forward<Args>(args)...) {
     CUDNN_ENFORCE(cudnnSetActivationDescriptor(
         act_desc_, kCuDNNActivationMode, CUDNN_PROPAGATE_NAN, 0.0));
   }
diff --git a/caffe2/operators/adjust_batch_op.h b/caffe2/operators/adjust_batch_op.h
@@ -9,8 +9,9 @@ template <class Context>
 class AdjustBatchOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
-  AdjustBatchOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit AdjustBatchOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         max_batch_size_(
             this->template GetSingleArgument<int64_t>("max_batch_size", -1)) {}
 
diff --git a/caffe2/operators/affine_channel_op.h b/caffe2/operators/affine_channel_op.h
@@ -15,8 +15,9 @@ class AffineChannelOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  AffineChannelOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit AffineChannelOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         order_(StringToStorageOrder(
             this->template GetSingleArgument<std::string>("order", "NCHW"))),
         OP_SINGLE_ARG(bool, "is_learnable", is_learnable_, false) {
@@ -94,8 +95,9 @@ class AffineChannelGradientOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  AffineChannelGradientOp(const OperatorDef& def, Workspace* ws)
-      : Operator<Context>(def, ws),
+  template <class... Args>
+  explicit AffineChannelGradientOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         order_(StringToStorageOrder(
             this->template GetSingleArgument<std::string>("order", "NCHW"))),
         OP_SINGLE_ARG(bool, "is_learnable", is_learnable_, false) {
diff --git a/caffe2/operators/apmeter_op.h b/caffe2/operators/apmeter_op.h
@@ -11,8 +11,9 @@ class APMeterOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  APMeterOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit APMeterOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         buffer_size_(
             this->template GetSingleArgument<int32_t>("buffer_size", 1000)),
         buffer_used_(0) {}
diff --git a/caffe2/operators/arg_ops.h b/caffe2/operators/arg_ops.h
@@ -16,8 +16,9 @@ class ArgOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  ArgOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit ArgOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         OP_SINGLE_ARG(int, "axis", axis_, -1),
         OP_SINGLE_ARG(bool, "keepdims", keep_dims_, true) {}
 
diff --git a/caffe2/operators/assert_op.h b/caffe2/operators/assert_op.h
@@ -9,8 +9,9 @@ namespace caffe2 {
 template <class Context>
 class AssertOp final : public Operator<Context> {
  public:
-  AssertOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit AssertOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         error_msg_(
             this->template GetSingleArgument<std::string>("error_msg", "")) {}
 
diff --git a/caffe2/operators/atomic_ops.cc b/caffe2/operators/atomic_ops.cc
@@ -14,8 +14,9 @@ namespace {
 
 class CreateMutexOp final : public Operator<CPUContext> {
  public:
-  CreateMutexOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws) {}
+  template <class... Args>
+  explicit CreateMutexOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override {
     *OperatorBase::Output<std::unique_ptr<std::mutex>>(0) =
@@ -26,8 +27,9 @@ class CreateMutexOp final : public Operator<CPUContext> {
 
 class AtomicFetchAddOp final : public Operator<CPUContext> {
  public:
-  AtomicFetchAddOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<CPUContext>(operator_def, ws) {}
+  template <class... Args>
+  explicit AtomicFetchAddOp(Args&&... args)
+      : Operator<CPUContext>(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override {
     auto& mutex = OperatorBase::Input<std::unique_ptr<std::mutex>>(0);
diff --git a/caffe2/operators/batch_box_cox_op.h b/caffe2/operators/batch_box_cox_op.h
@@ -12,8 +12,9 @@ template <class Context>
 class BatchBoxCoxOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
-  BatchBoxCoxOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws),
+  template <class... Args>
+  explicit BatchBoxCoxOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
         min_block_size_(
             this->template GetSingleArgument<int>("min_block_size", 256)) {}
 
diff --git a/caffe2/operators/batch_bucketize_op.h b/caffe2/operators/batch_bucketize_op.h
@@ -14,8 +14,9 @@ class BatchBucketizeOp final : public Operator<Context> {
  public:
   USE_OPERATOR_CONTEXT_FUNCTIONS;
 
-  BatchBucketizeOp(const OperatorDef& operator_def, Workspace* ws)
-      : Operator<Context>(operator_def, ws) {}
+  template <class... Args>
+  explicit BatchBucketizeOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...) {}
 
   bool RunOnDevice() override;
 
diff --git a/caffe2/operators/batch_gather_ops.h b/caffe2/operators/batch_gather_ops.h
@@ -36,9 +36,10 @@ class BatchGatherGradientOp final : public Operator<Context> {
 
   // Constructor to recieve axis in case it was passed for GatherOp gradient,
   // use default of 1 for batch gather otherwise.
-  BatchGatherGradientOp(const OperatorDef& operator_def, Workspace* ws)
-    : Operator<Context>(operator_def, ws),
-      OP_SINGLE_ARG(int, "axis", axis_, 1) { }
+  template <class... Args>
+  explicit BatchGatherGradientOp(Args&&... args)
+      : Operator<Context>(std::forward<Args>(args)...),
+        OP_SINGLE_ARG(int, "axis", axis_, 1) {}
   virtual ~BatchGatherGradientOp() noexcept {}
 
   bool RunOnDevice() override {
