From 6137adc05ad286455ed31a9458928c954ca2c2ad Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Mon, 6 Jul 2020 13:22:42 +0800
Subject: [PATCH] feat(core): move more exceptions to base exception

mgb::cg::GraphError
mgb::NumRangeChecker::Error
mgb::VarSanityCheck::Error
GitOrigin-RevId: 4d79e3629c480f651af7ff54cb5c870f60db5159
---
 src/core/include/megbrain/graph/bases.h           | 15 ++++++++++-----
 .../include/megbrain/plugin/num_range_checker.h   | 13 ++++++++-----
 .../include/megbrain/plugin/var_sanity_check.h    | 12 ++++++++----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/core/include/megbrain/graph/bases.h b/src/core/include/megbrain/graph/bases.h
index deaedbf7..95dd7eb6 100644
--- a/src/core/include/megbrain/graph/bases.h
+++ b/src/core/include/megbrain/graph/bases.h
@@ -48,6 +48,15 @@
 
 namespace mgb {
 
+class GraphError : public MegBrainError {
+public:
+    using MegBrainError::MegBrainError;
+};
+
+}  // namespace mgb
+
+namespace mgb {
+
 //! computing graph
 namespace cg {
 
@@ -55,11 +64,7 @@ namespace static_infer {
     struct DepElement;
 };
 
-class GraphError: public MegBrainError {
-    public:
-        using MegBrainError::MegBrainError;
-};
-
+using GraphError = mgb::GraphError;
 class OperatorNodeBase;
 class ComputingGraph;
 
diff --git a/src/plugin/include/megbrain/plugin/num_range_checker.h b/src/plugin/include/megbrain/plugin/num_range_checker.h
index ef5ed70c..0fec7098 100644
--- a/src/plugin/include/megbrain/plugin/num_range_checker.h
+++ b/src/plugin/include/megbrain/plugin/num_range_checker.h
@@ -16,6 +16,13 @@
 #include "megbrain/graph/event.h"
 #include "megbrain/utils/thin/hash_table.h"
 
+namespace mgb {
+class NumRangeCheckerError final : public MegBrainError {
+public:
+    using MegBrainError::MegBrainError;
+};
+}  // namespace mgb
+
 namespace mgb {
 
     /*!
@@ -47,11 +54,7 @@ namespace mgb {
         std::string format_msg(const HostTensorND &hv, float range);
 
         public:
-            class Error final: public MegBrainError {
-                public:
-                    using MegBrainError::MegBrainError;
-            };
-
+            using Error = NumRangeCheckerError;
             NumRangeChecker(cg::ComputingGraph *graph, float range);
     };
 }
diff --git a/src/plugin/include/megbrain/plugin/var_sanity_check.h b/src/plugin/include/megbrain/plugin/var_sanity_check.h
index 399fdb43..d57bc849 100644
--- a/src/plugin/include/megbrain/plugin/var_sanity_check.h
+++ b/src/plugin/include/megbrain/plugin/var_sanity_check.h
@@ -20,6 +20,13 @@
 #include <cstdint>
 #include <thread>
 
+namespace mgb {
+class VarSanityCheckError : public MegBrainError {
+public:
+    using MegBrainError::MegBrainError;
+};
+}  // namespace mgb
+
 namespace mgb {
 
 /*!
@@ -87,10 +94,7 @@ class VarSanityCheck final : public PluginBase {
 public:
     VarSanityCheck(cg::ComputingGraph* graph);
 
-    class Error : public MegBrainError {
-    public:
-        using MegBrainError::MegBrainError;
-    };
+    using Error = VarSanityCheckError;
 
     /*!
      * \brief perform basic sanity check after opr exec
-- 
GitLab