move scalar and polish enforce

chenwhql · chenwhql · commit 24ef6c5698ae · 2021-10-22T07:32:43.000Z
diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
@@ -30,6 +30,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/var_type.h"
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/profiler.h"
+#include "paddle/pten/common/scalar.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/imperative/prepared_operator.cc b/paddle/fluid/imperative/prepared_operator.cc
@@ -18,6 +18,7 @@
 #include "paddle/fluid/framework/details/nan_inf_utils.h"
 #include "paddle/fluid/framework/pten_utils.h"
 #include "paddle/fluid/imperative/infer_shape_context.h"
+#include "paddle/pten/common/scalar.h"
 #include "paddle/utils/small_vector.h"
 #ifdef PADDLE_WITH_XPU
 #include "paddle/fluid/platform/xpu/xpu_op_list.h"
diff --git a/paddle/pten/api/include/core.h b/paddle/pten/api/include/core.h
@@ -19,5 +19,4 @@ limitations under the License. */
 #include "paddle/pten/core/dense_tensor.h"
 #include "paddle/pten/core/kernel_context.h"
 #include "paddle/pten/core/kernel_factory.h"
-#include "paddle/pten/core/scalar.h"
 #include "paddle/pten/core/tensor_meta.h"
diff --git a/paddle/pten/common/backend.h b/paddle/pten/common/backend.h
@@ -16,6 +16,8 @@ limitations under the License. */
 
 #include <ostream>
 
+#include "paddle/fluid/platform/enforce.h"
+
 namespace paddle {
 namespace experimental {
 
@@ -78,7 +80,8 @@ inline std::ostream& operator<<(std::ostream& os, Backend backend) {
       os << "CUDNN";
       break;
     default:
-      throw std::runtime_error("Invalid Backend type.");
+      PADDLE_THROW(platform::errors::InvalidArgument(
+          "Invalid enum backend type `%d`.", static_cast<int>(backend)));
   }
   return os;
 }
diff --git a/paddle/pten/common/data_type.h b/paddle/pten/common/data_type.h
@@ -18,7 +18,6 @@ limitations under the License. */
 #include "paddle/fluid/platform/bfloat16.h"
 #include "paddle/fluid/platform/complex.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/platform/float16.h"
 
 namespace paddle {
@@ -164,13 +163,13 @@ inline std::ostream& operator<<(std::ostream& os, DataType dtype) {
       os << "complex128";
       break;
     default:
-      // TODO(chenweihang): change to enforce later
-      throw std::runtime_error("Invalid DataType type.");
+      PADDLE_THROW(platform::errors::InvalidArgument(
+          "Invalid enum data type `%d`.", static_cast<int>(dtype)));
   }
   return os;
 }
 
-inline DataType& operator++(DataType& dtype, int) {
+inline DataType& operator++(DataType dtype, int) {
   dtype =
       DataType(static_cast<std::underlying_type<DataType>::type>(dtype) + 1);
   return dtype;
diff --git a/paddle/pten/common/layout.h b/paddle/pten/common/layout.h
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #pragma once
 
+#include "paddle/fluid/platform/enforce.h"
+
 namespace paddle {
 namespace experimental {
 
@@ -26,8 +28,8 @@ enum class DataLayout {
   NUM_DATA_LAYOUTS,
 };
 
-inline std::ostream& operator<<(std::ostream& os, DataLayout dtype) {
-  switch (dtype) {
+inline std::ostream& operator<<(std::ostream& os, DataLayout layout) {
+  switch (layout) {
     case DataLayout::UNDEFINED:
       os << "Undefined";
       break;
@@ -44,13 +46,13 @@ inline std::ostream& operator<<(std::ostream& os, DataLayout dtype) {
       os << "MKLDNN";
       break;
     default:
-      // TODO(chenweihang): change to enforce later
-      throw std::runtime_error("Invalid DataLayout type.");
+      PADDLE_THROW(platform::errors::InvalidArgument(
+          "Invalid enum data layout type `%d`.", static_cast<int>(layout)));
   }
   return os;
 }
 
-inline DataLayout& operator++(DataLayout& layout, int) {
+inline DataLayout& operator++(DataLayout layout, int) {
   layout = DataLayout(
       static_cast<std::underlying_type<DataLayout>::type>(layout) + 1);
   return layout;
diff --git a/paddle/pten/common/scalar.h b/paddle/pten/common/scalar.h
@@ -14,7 +14,12 @@ limitations under the License. */
 
 #pragma once
 
-namespace pten {
+#include <cstdint>
+
+#include "paddle/fluid/platform/enforce.h"
+
+namespace paddle {
+namespace experimental {
 
 class Scalar {
  public:
@@ -43,7 +48,8 @@ class Scalar {
       case Tag::HAS_B:
         return static_cast<T>(data_.b);
       default:
-        throw std::runtime_error("Invalid Scalar type.");
+        PADDLE_THROW(platform::errors::InvalidArgument(
+            "Invalid enum scalar type tag `%d`.", static_cast<int>(tag)));
     }
   }
 
@@ -60,4 +66,9 @@ class Scalar {
   } data_;
 };
 
-}  // namespace pten
+}  // namespace experimental
+}  // namespace paddle
+
+namespace pten {
+using Scalar = paddle::experimental::Scalar;
+}
diff --git a/paddle/pten/core/kernel_utils.h b/paddle/pten/core/kernel_utils.h
@@ -14,10 +14,10 @@
 
 #pragma once
 
+#include "paddle/pten/common/scalar.h"
 #include "paddle/pten/core/dense_tensor.h"
 #include "paddle/pten/core/kernel_context.h"
 #include "paddle/pten/core/kernel_def.h"
-#include "paddle/pten/core/scalar.h"
 
 // See Note [ Why still include the fluid headers? ]
 #include "paddle/fluid/platform/device_context.h"
@@ -163,7 +163,7 @@ struct KernelImpl<Return (*)(Args...), kernel_fn> {
   PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(int);
   PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(int64_t);
   PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(paddle::platform::float16);
-  PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(const pten::Scalar&);
+  PT_SPECIALIZE_KernelCallHelper_FOR_ATTRIBUTE(const Scalar&);
 
   /* Output Helpers */
 
diff --git a/paddle/pten/hapi/include/backend_set.h b/paddle/pten/hapi/include/backend_set.h
@@ -16,9 +16,8 @@ limitations under the License. */
 
 #include <ostream>
 
-// TODO(chenweihang): move this file into hapi/include when compile
+#include "paddle/fluid/platform/enforce.h"
 #include "paddle/pten/common/backend.h"
-
 namespace paddle {
 namespace experimental {
 
@@ -39,10 +38,10 @@ class BackendSet final {
   uint64_t bitset() const { return bitset_; }
 
   bool inline Has(Backend b) const {
-    // TODO(chenweihang): replace by internal assert method later
-    if (b == Backend::UNDEFINED) {
-      throw std::runtime_error("Backend argument can't be UNDEFINED.");
-    }
+    PADDLE_ENFORCE_NE(b,
+                      Backend::UNDEFINED,
+                      platform::errors::InvalidArgument(
+                          "Backend argument can't be UNDEFINED."));
     return static_cast<bool>(bitset_ & BackendSet(b).bitset());
   }
   bool IsEmpty() const { return bitset_ == 0; }
diff --git a/paddle/pten/hapi/include/creation.h b/paddle/pten/hapi/include/creation.h
@@ -15,14 +15,14 @@
 #pragma once
 
 #include "paddle/pten/common/data_type.h"
-#include "paddle/pten/core/scalar.h"
+#include "paddle/pten/common/scalar.h"
 #include "paddle/pten/hapi/include/tensor.h"
 
 namespace paddle {
 namespace experimental {
 
 Tensor full_like(const Tensor& x,
-                 const pten::Scalar& value,
+                 const Scalar& value,
                  DataType dtype = DataType::UNDEFINED);
 
 Tensor ones_like(const Tensor& x, DataType dtype = DataType::UNDEFINED);
diff --git a/paddle/pten/hapi/include/tensor.h b/paddle/pten/hapi/include/tensor.h
@@ -39,6 +39,7 @@ limitations under the License. */
  * or the corresponding components will be re-implemented.
  */
 #include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/place.h"
 
 namespace paddle {
@@ -93,9 +94,9 @@ class Tensor final {
    */
   explicit Tensor(std::shared_ptr<pten::TensorBase> tensor_impl)
       : impl_(std::move(tensor_impl)) {
-    if (impl_.get() == nullptr) {
-      throw std::runtime_error("TensorImpl with nullptr is not supported");
-    }
+    PADDLE_ENFORCE_NOT_NULL(impl_,
+                            platform::errors::InvalidArgument(
+                                "TensorImpl with nullptr is not supported"));
   }
 
   /* Part 2: Dimension, DataType and DataLayout methods */
diff --git a/paddle/pten/hapi/lib/creation.cc b/paddle/pten/hapi/lib/creation.cc
@@ -26,7 +26,7 @@ namespace paddle {
 namespace experimental {
 
 Tensor full_like(const Tensor& x,
-                 const pten::Scalar& value,
+                 const Scalar& value,
                  paddle::experimental::DataType dtype) {
   // 1. Get kernel signature and kernel
   auto kernel_key_set = ParseKernelKeyByInputArgs(x);
@@ -63,11 +63,11 @@ Tensor full_like(const Tensor& x,
   return out;
 }
 
-Tensor ones_like(const Tensor& x, paddle::experimental::DataType dtype) {
+Tensor ones_like(const Tensor& x, DataType dtype) {
   return full_like(x, 1, dtype);
 }
 
-Tensor zeros_like(const Tensor& x, paddle::experimental::DataType dtype) {
+Tensor zeros_like(const Tensor& x, DataType dtype) {
   return full_like(x, 0, dtype);
 }
 
diff --git a/paddle/pten/kernels/cpu/creation.h b/paddle/pten/kernels/cpu/creation.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
+#include "paddle/pten/common/scalar.h"
 #include "paddle/pten/core/dense_tensor.h"
-#include "paddle/pten/core/scalar.h"
 
 #include "paddle/fluid/platform/device_context.h"
 
diff --git a/paddle/pten/kernels/cuda/creation.h b/paddle/pten/kernels/cuda/creation.h
@@ -17,8 +17,8 @@
 // CUDA and HIP use same api
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
 
+#include "paddle/pten/common/scalar.h"
 #include "paddle/pten/core/dense_tensor.h"
-#include "paddle/pten/core/scalar.h"
 
 #include "paddle/fluid/platform/device_context.h"
 
diff --git a/paddle/pten/kernels/cuda/math.cu b/paddle/pten/kernels/cuda/math.cu
@@ -26,6 +26,7 @@ limitations under the License. */
 namespace cub = hipcub;
 #endif
 
+#include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/float16.h"
 #include "paddle/pten/core/convert_utils.h"
 #include "paddle/pten/core/kernel_registry.h"
@@ -104,9 +105,10 @@ void ScaleHost(const CUDAContext& dev_ctx,
                float bias,
                bool bias_after_scale,
                DenseTensor* out) {
-  if (paddle::platform::is_gpu_place(scale.place())) {
-    throw std::runtime_error("scale host place error.");
-  }
+  PADDLE_ENFORCE_EQ(paddle::platform::is_gpu_place(scale.place()),
+                    false,
+                    paddle::platform::errors::InvalidArgument(
+                        "Scale argument isn't a host tensor."));
   eigen::Scale<CUDAContext, T>(dev_ctx,
                                x,
                                static_cast<float>(*scale.data<T>()),
