support auto generate static for uniform (uniform_random) (#52522)

paddle/fluid/operators/uniform_random_batch_size_like_op.cc

@@ -11,6 +11,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
+#include "paddle/fluid/operators/uniform_random_op.h"
 
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
@@ -19,6 +20,111 @@ limitations under the License. */
 namespace paddle {
 namespace operators {
 
+namespace {
+template <typename T>
+inline void UniformRealDistribution(T *data,
+                                    const int64_t &size,
+                                    const float &min,
+                                    const float &max,
+                                    const unsigned int seed) {
+  VLOG(4) << "[CPU] UniformRandomKernel<T>";
+  std::uniform_real_distribution<T> dist(static_cast<T>(min),
+                                         static_cast<T>(max));
+  auto engine = phi::GetCPURandomEngine(seed);
+
+  for (int64_t i = 0; i < size; ++i) {
+    data[i] = dist(*engine);
+  }
+}
+
+template <>
+inline void UniformRealDistribution(paddle::platform::bfloat16 *data,
+                                    const int64_t &size,
+                                    const float &min,
+                                    const float &max,
+                                    const unsigned int seed) {
+  VLOG(4) << "[CPU] UniformRandomKernel<bfloat16>";
+  std::uniform_real_distribution<float> dist(min, max);
+  auto engine = phi::GetCPURandomEngine(seed);
+
+  for (int64_t i = 0; i < size; ++i) {
+    data[i] = static_cast<paddle::platform::bfloat16>(dist(*engine));
+  }
+}
+}  // namespace
+
+// It seems that Eigen::Tensor::random in GPU will SEGFAULT.
+// Use std::random and thrust::random(thrust is a std library in CUDA) to
+// implement uniform random.
+template <typename T>
+class CPUUniformRandomKernel : public framework::OpKernel<T> {
+ public:
+  void Compute(const framework::ExecutionContext &ctx) const override {
+    phi::DenseTensor *tensor = nullptr;
+    auto out_var = ctx.OutputVar("Out");
+    std::vector<int64_t> new_shape;
+    auto list_new_shape_tensor =
+        ctx.MultiInput<phi::DenseTensor>("ShapeTensorList");
+    if (list_new_shape_tensor.size() > 0 || ctx.HasInput("ShapeTensor")) {
+      if (ctx.HasInput("ShapeTensor")) {
+        auto *shape_tensor = ctx.Input<phi::DenseTensor>("ShapeTensor");
+        new_shape = GetNewDataFromShapeTensor(shape_tensor);
+      } else if (list_new_shape_tensor.size() > 0) {
+        new_shape = GetNewDataFromShapeTensorList(list_new_shape_tensor);
+      }
+    }
+
+    if (out_var->IsType<phi::SelectedRows>()) {
+      auto *selected_rows = out_var->GetMutable<phi::SelectedRows>();
+      tensor = selected_rows->mutable_value();
+      auto shape = ctx.Attr<std::vector<int64_t>>("shape");
+      if (!new_shape.empty()) shape = new_shape;
+      tensor->Resize(phi::make_ddim(shape));
+      selected_rows->mutable_rows()->reserve(shape[0]);
+    } else if (out_var->IsType<phi::DenseTensor>()) {
+      tensor = out_var->GetMutable<phi::DenseTensor>();
+      if (!new_shape.empty()) tensor->Resize(phi::make_ddim(new_shape));
+    } else {
+      PADDLE_THROW(platform::errors::InvalidArgument(
+          "Expected type of Output(out) in uniform_random_op must be Tensor, "
+          "SelectedRows. But got "
+          "unsupport type: %s.",
+          framework::ToTypeName(out_var->Type())));
+    }
+    T *data = tensor->mutable_data<T>(ctx.GetPlace());
+    int64_t size = tensor->numel();
+
+    UniformRealDistribution<T>(
+        data,
+        size,
+        ctx.Attr<float>("min"),
+        ctx.Attr<float>("max"),
+        static_cast<unsigned int>(ctx.Attr<int>("seed")));
+
+    unsigned int diag_num =
+        static_cast<unsigned int>(ctx.Attr<int>("diag_num"));
+    unsigned int diag_step =
+        static_cast<unsigned int>(ctx.Attr<int>("diag_step"));
+    auto diag_val = static_cast<T>(ctx.Attr<float>("diag_val"));
+    if (diag_num > 0) {
+      PADDLE_ENFORCE_GT(
+          size,
+          (diag_num - 1) * (diag_step + 1),
+          platform::errors::InvalidArgument(
+              "ShapeInvalid: the diagonal's elements is equal (num-1) "
+              "* (step-1) with num %d, step %d,"
+              "It should be smaller than %d, but received %d",
+              diag_num,
+              diag_step,
+              (diag_num - 1) * (diag_step + 1),
+              size));
+      for (int64_t i = 0; i < diag_num; ++i) {
+        int64_t pos = i * diag_step + i;
+        data[pos] = diag_val;
+      }
+    }
+  }
+};
 class UniformRandomBatchSizeLikeOp : public BatchSizeLikeOp {
  protected:
   using BatchSizeLikeOp::BatchSizeLikeOp;
@@ -79,4 +185,9 @@ REGISTER_OPERATOR(
     paddle::framework::EmptyGradOpMaker<paddle::framework::OpDesc>,
     paddle::framework::EmptyGradOpMaker<paddle::imperative::OpBase>,
     paddle::operators::BatchSizeLikeNoNeedBufferVarsInferer);
-// Kernels are registered in uniform_random_op.cc and uniform_random_op.cu
+
+REGISTER_OP_CPU_KERNEL(
+    uniform_random_batch_size_like,
+    paddle::operators::CPUUniformRandomKernel<float>,
+    paddle::operators::CPUUniformRandomKernel<double>,
+    paddle::operators::CPUUniformRandomKernel<paddle::platform::bfloat16>);

paddle/fluid/operators/uniform_random_op.cc

-/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-#include "paddle/fluid/operators/uniform_random_op.h"
-
-#include <string>
-
-#include "paddle/fluid/framework/infershape_utils.h"
-#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/platform/bfloat16.h"
-#include "paddle/phi/core/generator.h"
-#include "paddle/phi/infermeta/nullary.h"
-
-namespace paddle {
-namespace operators {
-
-namespace {
-template <typename T>
-inline void UniformRealDistribution(T *data,
-                                    const int64_t &size,
-                                    const float &min,
-                                    const float &max,
-                                    const unsigned int seed) {
-  VLOG(4) << "[CPU] UniformRandomKernel<T>";
-  std::uniform_real_distribution<T> dist(static_cast<T>(min),
-                                         static_cast<T>(max));
-  auto engine = phi::GetCPURandomEngine(seed);
-
-  for (int64_t i = 0; i < size; ++i) {
-    data[i] = dist(*engine);
-  }
-}
-
-template <>
-inline void UniformRealDistribution(paddle::platform::bfloat16 *data,
-                                    const int64_t &size,
-                                    const float &min,
-                                    const float &max,
-                                    const unsigned int seed) {
-  VLOG(4) << "[CPU] UniformRandomKernel<bfloat16>";
-  std::uniform_real_distribution<float> dist(min, max);
-  auto engine = phi::GetCPURandomEngine(seed);
-
-  for (int64_t i = 0; i < size; ++i) {
-    data[i] = static_cast<paddle::platform::bfloat16>(dist(*engine));
-  }
-}
-}  // namespace
-
-// It seems that Eigen::Tensor::random in GPU will SEGFAULT.
-// Use std::random and thrust::random(thrust is a std library in CUDA) to
-// implement uniform random.
-template <typename T>
-class CPUUniformRandomKernel : public framework::OpKernel<T> {
- public:
-  void Compute(const framework::ExecutionContext &ctx) const override {
-    phi::DenseTensor *tensor = nullptr;
-    auto out_var = ctx.OutputVar("Out");
-    std::vector<int64_t> new_shape;
-    auto list_new_shape_tensor =
-        ctx.MultiInput<phi::DenseTensor>("ShapeTensorList");
-    if (list_new_shape_tensor.size() > 0 || ctx.HasInput("ShapeTensor")) {
-      if (ctx.HasInput("ShapeTensor")) {
-        auto *shape_tensor = ctx.Input<phi::DenseTensor>("ShapeTensor");
-        new_shape = GetNewDataFromShapeTensor(shape_tensor);
-      } else if (list_new_shape_tensor.size() > 0) {
-        new_shape = GetNewDataFromShapeTensorList(list_new_shape_tensor);
-      }
-    }
-
-    if (out_var->IsType<phi::SelectedRows>()) {
-      auto *selected_rows = out_var->GetMutable<phi::SelectedRows>();
-      tensor = selected_rows->mutable_value();
-      auto shape = ctx.Attr<std::vector<int64_t>>("shape");
-      if (!new_shape.empty()) shape = new_shape;
-      tensor->Resize(phi::make_ddim(shape));
-      selected_rows->mutable_rows()->reserve(shape[0]);
-    } else if (out_var->IsType<phi::DenseTensor>()) {
-      tensor = out_var->GetMutable<phi::DenseTensor>();
-      if (!new_shape.empty()) tensor->Resize(phi::make_ddim(new_shape));
-    } else {
-      PADDLE_THROW(platform::errors::InvalidArgument(
-          "Expected type of Output(out) in uniform_random_op must be Tensor, "
-          "SelectedRows. But got "
-          "unsupport type: %s.",
-          framework::ToTypeName(out_var->Type())));
-    }
-    T *data = tensor->mutable_data<T>(ctx.GetPlace());
-    int64_t size = tensor->numel();
-
-    UniformRealDistribution<T>(
-        data,
-        size,
-        ctx.Attr<float>("min"),
-        ctx.Attr<float>("max"),
-        static_cast<unsigned int>(ctx.Attr<int>("seed")));
-
-    unsigned int diag_num =
-        static_cast<unsigned int>(ctx.Attr<int>("diag_num"));
-    unsigned int diag_step =
-        static_cast<unsigned int>(ctx.Attr<int>("diag_step"));
-    auto diag_val = static_cast<T>(ctx.Attr<float>("diag_val"));
-    if (diag_num > 0) {
-      PADDLE_ENFORCE_GT(
-          size,
-          (diag_num - 1) * (diag_step + 1),
-          platform::errors::InvalidArgument(
-              "ShapeInvalid: the diagonal's elements is equal (num-1) "
-              "* (step-1) with num %d, step %d,"
-              "It should be smaller than %d, but received %d",
-              diag_num,
-              diag_step,
-              (diag_num - 1) * (diag_step + 1),
-              size));
-      for (int64_t i = 0; i < diag_num; ++i) {
-        int64_t pos = i * diag_step + i;
-        data[pos] = diag_val;
-      }
-    }
-  }
-};
-
-class UniformRandomOp : public framework::OperatorWithKernel {
- public:
-  using framework::OperatorWithKernel::OperatorWithKernel;
-
- protected:
-  phi::KernelKey GetExpectedKernelType(
-      const framework::ExecutionContext &ctx) const override {
-    return phi::KernelKey(
-        static_cast<framework::proto::VarType::Type>(ctx.Attr<int>("dtype")),
-        ctx.GetPlace());
-  }
-
-  phi::KernelKey GetKernelTypeForVar(
-      const std::string &var_name,
-      const phi::DenseTensor &tensor,
-      const phi::KernelKey &expected_kernel_type) const override {
-    if (var_name == "ShapeTensorList" || var_name == "ShapeTensor") {
-      return phi::KernelKey(phi::Backend::ALL_BACKEND,
-                            expected_kernel_type.layout(),
-                            expected_kernel_type.dtype());
-    }
-    return phi::KernelKey(
-        tensor.place(), tensor.layout(), expected_kernel_type.dtype());
-  }
-};
-
-class UniformRandomOpMaker : public framework::OpProtoAndCheckerMaker {
- public:
-  void Make() override {
-    AddInput("ShapeTensor",
-             "(Tensor<int64_t> or Tensor<int32_t>, optional) . If provided, "
-             "uniform_random "
-             "according to "
-             "this given shape. It means that it has a higher priority than "
-             "the shape attribute, while the shape attribute still should be "
-             "set correctly to guarantee shape inference in compile time.")
-        .AsDispensable();
-    AddInput("ShapeTensorList",
-             "(vector<Tensor<int64_t>> or vector<Tensor<int32_t>>, optional). "
-             "If provided, uniform_random use this. The shape of the tensor "
-             "must be [1], it has the highest priority comparing with "
-             "Input(ShapeTensor) and attr(shape).")
-        .AsDuplicable()
-        .AsDispensable();
-    AddOutput("Out", "The output tensor of uniform random op");
-    AddComment(R"DOC(
-This operator initializes a tensor with random values sampled from a
-uniform distribution. The random result is in set [min, max).
-
-)DOC");
-    AddAttr<std::vector<int64_t>>("shape", "The shape of the output tensor")
-        .SetDefault({});
-    AddAttr<float>("min", "Minimum value of uniform random. [default -1.0].")
-        .SetDefault(-1.0f)
-        .SupportTensor();
-    AddAttr<float>("max", "Maximun value of uniform random. [default 1.0].")
-        .SetDefault(1.0f)
-        .SupportTensor();
-    AddAttr<int>("seed",
-                 "Random seed used for generating samples. "
-                 "0 means use a seed generated by the system."
-                 "Note that if seed is not 0, this operator will always "
-                 "generate the same random numbers every time. [default 0].")
-        .SetDefault(0);
-    AddAttr<int>("diag_num",
-                 "The number of diag elements. Note that if "
-                 "diag_num is 0, it means without diag init.[default 0].")
-        .SetDefault(0);
-    AddAttr<int>("diag_step", "The step between two diag element.[default 0].")
-        .SetDefault(0);
-    AddAttr<float>("diag_val", "The value of diag element. [default 1.0].")
-        .SetDefault(1.0f);
-    AddAttr<int>("dtype", "Output tensor data type. [default 5(FP32)].")
-        .SetDefault(framework::proto::VarType::FP32);
-  }
-};
-
-class UniformRandomOpVarTypeInference : public framework::VarTypeInference {
- public:
-  void operator()(framework::InferVarTypeContext *ctx) const override {
-    auto var_data_type = static_cast<framework::proto::VarType::Type>(
-        PADDLE_GET_CONST(int, ctx->GetAttr("dtype")));
-
-    if (ctx->GetOutputType("Out") != framework::proto::VarType::SELECTED_ROWS) {
-      ctx->SetOutputType("Out", framework::proto::VarType::LOD_TENSOR);
-    }
-    ctx->SetOutputDataType("Out", var_data_type);
-  }
-};
-
-}  // namespace operators
-}  // namespace paddle
-
-DECLARE_INFER_SHAPE_FUNCTOR(uniform_random,
-                            UniformRandomInferShapeFunctor,
-                            PD_INFER_META(phi::UniformRandomInferMeta));
-
-REGISTER_OPERATOR(
-    uniform_random,
-    paddle::operators::UniformRandomOp,
-    paddle::operators::UniformRandomOpMaker,
-    paddle::framework::EmptyGradOpMaker<paddle::framework::OpDesc>,
-    paddle::framework::EmptyGradOpMaker<paddle::imperative::OpBase>,
-    paddle::operators::UniformRandomOpVarTypeInference,
-    UniformRandomInferShapeFunctor);
-
-REGISTER_OP_CPU_KERNEL(
-    uniform_random_batch_size_like,
-    paddle::operators::CPUUniformRandomKernel<float>,
-    paddle::operators::CPUUniformRandomKernel<double>,
-    paddle::operators::CPUUniformRandomKernel<paddle::platform::bfloat16>);

paddle/fluid/operators/unity_build_rule.cmake

@@ -303,7 +303,6 @@ register_unity_group(
   cc
   smooth_l1_loss_op.cc
   uniform_random_batch_size_like_op.cc
-  uniform_random_op.cc
   unique_op.cc
   unique_with_counts_op.cc
   unpool_op.cc
@@ -555,7 +554,7 @@ register_unity_group(
 register_unity_group(
   cu
   smooth_l1_loss_op.cu
-  uniform_random_op.cu
+  uniform_random_batch_size_like_op.cu
   unstack_op.cu
   where_index_op.cu
   where_op.cu

paddle/phi/api/yaml/op_compat.yaml

@@ -2057,6 +2057,23 @@
   outputs :
     out : Y
 
+- op : uniform (uniform_random)
+  outputs :
+    out : Out
+  int_array :
+    shape :
+      data_type : int64_t
+      tensor_name : ShapeTensor
+      tensors_name : ShapeTensorList
+  scalar :
+      min :
+        data_type : float
+        support_tensor : true
+      max :
+        data_type : float
+        support_tensor : true
+  manual_signature : [uniform]
+
 - op : unique_consecutive
   inputs :
     x : X

paddle/phi/api/yaml/static_ops.yaml

@@ -213,3 +213,14 @@
     func : ShareBufferInferMeta
   kernel :
     func : share_buffer
+
+- op : uniform
+  args : (IntArray shape = {},  DataType dtype = DataType::FLOAT32, Scalar min = -1.0f, Scalar max = 1.0f, int seed = 0, int diag_num = 0, int diag_step = 0, float diag_val = 1.0f)
+  output : Tensor(out)
+  infer_meta :
+    func : UniformRandomInferMeta
+    param: [shape, dtype]
+  kernel :
+    func : uniform
+    param: [shape, dtype, min, max, seed]
+    data_type : dtype