Provide Backend::name() function

ddemidov · Sep 26, 2014 · f66797d · f66797d
1 parent e37a923
commit f66797d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 1 deletion.
diff --git a/amgcl/backend/blaze.hpp b/amgcl/backend/blaze.hpp
@@ -66,6 +66,8 @@ struct blaze {
         params(const boost::property_tree::ptree&) {}
     };
 
+    static std::string name() { return "blaze"; }
+
     /// Copy matrix from builtin backend.
     static boost::shared_ptr<matrix>
     copy_matrix(

diff --git a/amgcl/backend/block_crs.hpp b/amgcl/backend/block_crs.hpp
@@ -171,6 +171,8 @@ struct block_crs {
         {}
     };
 
+    static std::string name() { return "block_crs"; }
+
     /// Copy matrix from builtin backend.
     static boost::shared_ptr<matrix>
     copy_matrix(boost::shared_ptr< typename backend::builtin<real>::matrix > A,

diff --git a/amgcl/backend/builtin.hpp b/amgcl/backend/builtin.hpp
@@ -359,6 +359,8 @@ struct builtin {
         params(const boost::property_tree::ptree&) {}
     };
 
+    static std::string name() { return "builtin"; }
+
     /// Copy matrix.
     /** This is a noop for builtin backend. */
     static boost::shared_ptr<matrix>

diff --git a/amgcl/backend/cuda.hpp b/amgcl/backend/cuda.hpp
@@ -221,6 +221,8 @@ struct cuda {
         {}
     };
 
+    static std::string name() { return "cuda"; }
+
     /// Copy matrix from builtin backend.
     static boost::shared_ptr<matrix>
     copy_matrix(boost::shared_ptr< typename builtin<real>::matrix > A, const params &prm)

diff --git a/amgcl/backend/eigen.hpp b/amgcl/backend/eigen.hpp
@@ -73,6 +73,8 @@ struct eigen {
         params(const boost::property_tree::ptree&) {}
     };
 
+    static std::string name() { return "eigen"; }
+
     /// Copy matrix from builtin backend.
     static boost::shared_ptr<matrix>
     copy_matrix(boost::shared_ptr< typename builtin<real>::matrix > A, const params&)

diff --git a/amgcl/backend/vexcl.hpp b/amgcl/backend/vexcl.hpp
@@ -99,6 +99,8 @@ struct vexcl {
         }
     };
 
+    static std::string name() { return "vexcl"; }
+
     /// Copy matrix from builtin backend.
     static boost::shared_ptr<matrix>
     copy_matrix(boost::shared_ptr< typename builtin<real>::matrix > A, const params &prm)

diff --git a/amgcl/backend/viennacl.hpp b/amgcl/backend/viennacl.hpp
@@ -74,6 +74,8 @@ struct viennacl {
         params(const boost::property_tree::ptree&) {}
     };
 
+    static std::string name() { return "viennacl"; }
+
     /// Copy matrix from builtin backend.
     static boost::shared_ptr<matrix>
     copy_matrix(

diff --git a/tests/test_solver.cpp b/tests/test_solver.cpp
@@ -116,7 +116,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_backends, Backend, backend_list)
     BOOST_FOREACH(amgcl::runtime::coarsening::type c, coarsening) {
         BOOST_FOREACH(amgcl::runtime::relaxation::type r, relaxation) {
             BOOST_FOREACH(amgcl::runtime::solver::type s, solver) {
-                std::cout << c << " " << r << " " << s << std::endl;
+                std::cout
+                    << Backend::name() << " "
+                    << c << " " << r << " " << s << std::endl;
 
                 try {
                     test_solver<Backend>(c, r, s);