throw gko::Error

ginkgo-project · Aug 17, 2023 · 877eb6d · 877eb6d
1 parent ab80db4
commit 877eb6d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/core/config/config.cpp b/core/config/config.cpp
@@ -36,6 +36,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 
 
+#include <ginkgo/core/base/exception_helpers.hpp>
+
+
 namespace gko {
 namespace config {
 
@@ -55,7 +58,7 @@ std::unique_ptr<gko::LinOpFactory> build_from_config(
             config.at("Type").get_data<std::string>());
         return func(config, context, exec, td);
     }
-    return nullptr;
+    GKO_INVALID_STATE("Should contain Type property");
 }
 
 

diff --git a/core/config/dispatch.hpp b/core/config/dispatch.hpp
@@ -38,6 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 
 
+#include <ginkgo/core/base/exception_helpers.hpp>
 #include <ginkgo/core/config/config.hpp>
 #include <ginkgo/core/config/registry.hpp>
 #include <ginkgo/core/synthesizer/containers.hpp>
@@ -75,7 +76,7 @@ std::unique_ptr<ReturnType> dispatch(std::string str, const pnode& config,
                                      const type_descriptor& td,
                                      syn::type_list<>, List... list)
 {
-    throw std::runtime_error("Not Found");
+    GKO_INVALID_STATE("Can not figure out the actual type");
 }
 
 /**

diff --git a/core/config/stop_config.cpp b/core/config/stop_config.cpp
@@ -30,6 +30,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
+#include <ginkgo/core/base/exception_helpers.hpp>
 #include <ginkgo/core/config/config.hpp>
 #include <ginkgo/core/config/registry.hpp>
 #include <ginkgo/core/stop/criterion.hpp>
@@ -41,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "core/config/config.hpp"
 #include "core/config/dispatch.hpp"
 
+
 namespace gko {
 namespace config {
 
@@ -74,6 +76,7 @@ stop::mode get_mode(const std::string& str)
     } else if (str == "rhs_norm") {
         return stop::mode::rhs_norm;
     }
+    GKO_INVALID_STATE("Not valid " + str);
 }
 
 

diff --git a/include/ginkgo/core/config/registry.hpp b/include/ginkgo/core/config/registry.hpp
@@ -35,6 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <complex>
+#include <functional>
 #include <map>
 #include <string>
 #include <unordered_map>