delete common_thorw (#62605)

risemeup1 · web-flow · commit f5120286747d · 2024-03-11T19:15:44.000+08:00
* delete common_thorw

* fix
diff --git a/paddle/common/array.h b/paddle/common/array.h
@@ -109,7 +109,7 @@ class Array<T, 0> {
     static T obj{};
     return obj;
 #else
-    COMMON_THROW(common::errors::Unavailable("Array<T, 0> has no element."));
+    PADDLE_THROW(common::errors::Unavailable("Array<T, 0> has no element."));
 #endif
   }
 
@@ -120,7 +120,7 @@ class Array<T, 0> {
     static const T obj{};
     return obj;
 #else
-    COMMON_THROW(common::errors::Unavailable("Array<T, 0> has no element."));
+    PADDLE_THROW(common::errors::Unavailable("Array<T, 0> has no element."));
 #endif
   }
 
diff --git a/paddle/common/enforce.h b/paddle/common/enforce.h
@@ -55,16 +55,6 @@ inline std::string demangle(std::string name) {
 inline std::string demangle(std::string name) { return name; }
 #endif
 
-class CommonNotMetException : public std::exception {
- public:
-  explicit CommonNotMetException(const std::string& str) : err_str_(str) {}
-
-  const char* what() const noexcept override { return err_str_.c_str(); }
-
- private:
-  std::string err_str_;
-};
-
 namespace enforce {
 
 TEST_API void SkipPaddleFatal(bool skip = true);
@@ -274,15 +264,12 @@ template <typename T1, typename T2>
 using CommonType2 = typename std::add_lvalue_reference<
     typename std::add_const<typename TypeConverter<T1, T2>::Type2>::type>::type;
 
-#define COMMON_THROW(...)                                               \
-  do {                                                                  \
-    HANDLE_THE_ERROR                                                    \
-    throw common::CommonNotMetException(                                \
-        paddle::string::Sprintf("Error occurred at: %s:%d :\n%s",       \
-                                __FILE__,                               \
-                                __LINE__,                               \
-                                paddle::string::Sprintf(__VA_ARGS__))); \
-    END_HANDLE_THE_ERROR                                                \
+#define PADDLE_THROW(...)                                         \
+  do {                                                            \
+    HANDLE_THE_ERROR                                              \
+    throw ::common::enforce::EnforceNotMet(                       \
+        ::common::ErrorSummary(__VA_ARGS__), __FILE__, __LINE__); \
+    END_HANDLE_THE_ERROR                                          \
   } while (0)
 
 #define PADDLE_FATAL(...)                                          \
diff --git a/paddle/phi/core/enforce.h b/paddle/phi/core/enforce.h
@@ -79,41 +79,6 @@ limitations under the License. */
 namespace phi {
 namespace enforce {
 
-namespace details {
-template <typename T>
-inline constexpr bool IsArithmetic() {
-  return std::is_arithmetic<T>::value;
-}
-
-template <typename T1, typename T2, bool kIsArithmetic /* = true */>
-struct TypeConverterImpl {
-  using Type1 = typename std::common_type<T1, T2>::type;
-  using Type2 = Type1;
-};
-
-template <typename T1, typename T2>
-struct TypeConverterImpl<T1, T2, false> {
-  using Type1 = T1;
-  using Type2 = T2;
-};
-
-template <typename T1, typename T2>
-struct TypeConverter {
-  static constexpr bool kIsArithmetic =
-      IsArithmetic<T1>() && IsArithmetic<T2>();
-  using Type1 = typename TypeConverterImpl<T1, T2, kIsArithmetic>::Type1;
-  using Type2 = typename TypeConverterImpl<T1, T2, kIsArithmetic>::Type2;
-};
-
-template <typename T1, typename T2>
-using CommonType1 = typename std::add_lvalue_reference<
-    typename std::add_const<typename TypeConverter<T1, T2>::Type1>::type>::type;
-
-template <typename T1, typename T2>
-using CommonType2 = typename std::add_lvalue_reference<
-    typename std::add_const<typename TypeConverter<T1, T2>::Type2>::type>::type;
-}  // namespace details
-
 template <typename StrType>
 std::string GetCompleteTraceBackString(StrType&& what,
                                        const char* file,
@@ -131,14 +96,6 @@ inline bool is_error(bool stat) { return !stat; }
 
 void ThrowWarnInternal(const std::string& message);
 
-#define PADDLE_THROW(...)                                         \
-  do {                                                            \
-    HANDLE_THE_ERROR                                              \
-    throw ::common::enforce::EnforceNotMet(                       \
-        ::common::ErrorSummary(__VA_ARGS__), __FILE__, __LINE__); \
-    END_HANDLE_THE_ERROR                                          \
-  } while (0)
-
 #if defined(__CUDA_ARCH__)
 // For cuda, the assertions can affect performance and it is therefore
 // recommended to disable them in production code
diff --git a/tools/check_file_diff_approvals.sh b/tools/check_file_diff_approvals.sh
@@ -394,7 +394,7 @@ if [ "${HAS_MODIFIED_STATIC_BUILD}" != "" ] && [ "${GIT_PR_ID}" != ""]; then
 fi
 
 
-HAS_MODIFIED_ENFORCE_SYNTAX=`git diff upstream/$BRANCH | grep -E "IR_ENFORCE|CHECK_EQ|CHECK_NE|CHECK_LT|CHECK_LE|CHECK_GE|CHECK_GT|LOG\(FATAL\)" || true`
+HAS_MODIFIED_ENFORCE_SYNTAX=`git diff --diff-filter=A upstream/$BRANCH | grep -E "IR_ENFORCE|CHECK_EQ|CHECK_NE|CHECK_LT|CHECK_LE|CHECK_GE|CHECK_GT|LOG\(FATAL\)" || true`
 if [ "${HAS_MODIFIED_ENFORCE_SYNTAX}" != "" ] && [ "${GIT_PR_ID}" != "" ]; then
     echo_line="You must have one RD (rismeup1 or winter-wang) approval for using 'IR_ENFORCE, CHECK_EQ, CHECK_NE, CHECK_LT, CHECK_LE, CHECK_GE, CHECK_GT, LOG(FATAL)', it is recommended to use PADDLE_ENFORCE as a replacement,see [ https://github.com/PaddlePaddle/Paddle/wiki/PADDLE_ENFORCE-Rewriting-Specification ] for details.\n"
     check_approval 1 risemeup1 winter-wang
