Introduce AMGCL_USE_PROPERTY_TREE preprocessor macro

* When defined, include <boost/property_tree/ptree.hpp> and allow conversion of boost::property_tree::ptree to amgcl params. * When AMGCL_USE_PROPERTY_TREE is not defined, but BOOST_VERSION is, then define AMGCL_USE_PROPERTY_TREE anyway (Boost.PropertyTree is header-only and should not require any link options). * When neither AMGCL_USE_PROPERTY_TREE nor BOOST_VERSION is defined, but a runtime header is included, use pragma error to complain.
ddemidov · Jul 16, 2018 · a385c6b · a385c6b
1 parent e63c095
commit a385c6b
Show file tree

Hide file tree

Showing 51 changed files with 118 additions and 60 deletions.
diff --git a/amgcl/amg.hpp b/amgcl/amg.hpp
@@ -155,7 +155,7 @@ class amg {
 #endif
             {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, coarsening),
                   AMGCL_PARAMS_IMPORT_CHILD(p, relax),

diff --git a/amgcl/backend/block_crs.hpp b/amgcl/backend/block_crs.hpp
@@ -159,7 +159,7 @@ struct block_crs {
 
         params(size_t block_size = 4) : block_size(block_size) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, block_size)
         {

diff --git a/amgcl/backend/cuda.hpp b/amgcl/backend/cuda.hpp
@@ -265,7 +265,7 @@ struct cuda {
 
         params(cusparseHandle_t handle = 0) : cusparse_handle(handle) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, cusparse_handle)
         {

diff --git a/amgcl/backend/hpx.hpp b/amgcl/backend/hpx.hpp
@@ -222,6 +222,7 @@ struct HPX {
 
         params() : grain_size(4096) {}
 
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, grain_size)
         {
@@ -231,6 +232,7 @@ struct HPX {
         void get(boost::property_tree::ptree &p, const std::string &path) const {
             AMGCL_PARAMS_EXPORT_VALUE(p, path, grain_size);
         }
+#endif
     };
 
     typedef hpx_matrix<value_type>         matrix;

diff --git a/amgcl/backend/vexcl.hpp b/amgcl/backend/vexcl.hpp
@@ -110,6 +110,7 @@ struct vexcl {
 
         params() : fast_matrix_setup(true) {}
 
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, fast_matrix_setup)
         {
@@ -123,6 +124,7 @@ struct vexcl {
             p.put(path + "q", &q);
             AMGCL_PARAMS_EXPORT_VALUE(p, path, fast_matrix_setup);
         }
+#endif
 
         const std::vector<vex::backend::command_queue>& context() const {
             if (q.empty())

diff --git a/amgcl/coarsening/aggregation.hpp b/amgcl/coarsening/aggregation.hpp
@@ -96,7 +96,7 @@ struct aggregation {
 
         params() : over_interp(1.5f) { }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_CHILD(p, nullspace),

diff --git a/amgcl/coarsening/plain_aggregates.hpp b/amgcl/coarsening/plain_aggregates.hpp
@@ -74,7 +74,7 @@ struct plain_aggregates {
 
         params() : eps_strong(0.08f) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, eps_strong)
         {

diff --git a/amgcl/coarsening/pointwise_aggregates.hpp b/amgcl/coarsening/pointwise_aggregates.hpp
@@ -61,7 +61,7 @@ class pointwise_aggregates {
 
             params() : block_size(1) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : plain_aggregates::params(p),
                   AMGCL_PARAMS_IMPORT_VALUE(p, block_size)

diff --git a/amgcl/coarsening/ruge_stuben.hpp b/amgcl/coarsening/ruge_stuben.hpp
@@ -81,7 +81,7 @@ struct ruge_stuben {
 
         params() : eps_strong(0.25f), do_trunc(true), eps_trunc(0.2f) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, eps_strong),
               AMGCL_PARAMS_IMPORT_VALUE(p, do_trunc),

diff --git a/amgcl/coarsening/runtime.hpp b/amgcl/coarsening/runtime.hpp
@@ -33,16 +33,21 @@ THE SOFTWARE.
 
 #include <iostream>
 #include <stdexcept>
-
 #include <type_traits>
-#include <boost/property_tree/ptree.hpp>
+
+#include <amgcl/util.hpp>
+#ifndef AMGCL_USE_PROPERTY_TREE
+#  error \
+    Runtime interface relies on Boost.PropertyTree! \
+    Either define AMGCL_USE_PROPERTY_TREE, or \
+    include <boost/property_tree/ptree.hpp> before any of the amgcl headers.
+#endif
 
 #include <amgcl/backend/interface.hpp>
 #include <amgcl/coarsening/ruge_stuben.hpp>
 #include <amgcl/coarsening/aggregation.hpp>
 #include <amgcl/coarsening/smoothed_aggregation.hpp>
 #include <amgcl/coarsening/smoothed_aggr_emin.hpp>
-#include <amgcl/util.hpp>
 
 namespace amgcl {
 namespace runtime {

diff --git a/amgcl/coarsening/smoothed_aggr_emin.hpp b/amgcl/coarsening/smoothed_aggr_emin.hpp
@@ -65,7 +65,7 @@ struct smoothed_aggr_emin {
 
         params() {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_CHILD(p, nullspace)

diff --git a/amgcl/coarsening/smoothed_aggregation.hpp b/amgcl/coarsening/smoothed_aggregation.hpp
@@ -103,7 +103,7 @@ struct smoothed_aggregation {
 
         params() : relax(1.0f), estimate_spectral_radius(false), power_iters(0) { }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_CHILD(p, nullspace),

diff --git a/amgcl/coarsening/tentative_prolongation.hpp b/amgcl/coarsening/tentative_prolongation.hpp
@@ -73,7 +73,7 @@ struct nullspace_params {
 
     nullspace_params() : cols(0) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
     nullspace_params(const boost::property_tree::ptree &p)
         : cols(p.get("cols", nullspace_params().cols))
     {

diff --git a/amgcl/make_solver.hpp b/amgcl/make_solver.hpp
@@ -69,7 +69,7 @@ class make_solver {
 
             params() {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, precond),
                   AMGCL_PARAMS_IMPORT_CHILD(p, solver)
@@ -191,7 +191,7 @@ class make_solver {
             return P.system_matrix();
         }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         /// Stores the parameters used during construction into the property tree \p p.
         void get_params(boost::property_tree::ptree &p) const {
             prm.get(p);

diff --git a/amgcl/mpi/amg.hpp b/amgcl/mpi/amg.hpp
@@ -113,7 +113,7 @@ class amg {
                 npre(1), npost(1), ncycle(1), pre_cycles(1)
             {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, coarsening),
                   AMGCL_PARAMS_IMPORT_CHILD(p, relax),

diff --git a/amgcl/mpi/coarsening/aggregation.hpp b/amgcl/mpi/coarsening/aggregation.hpp
@@ -73,7 +73,7 @@ struct aggregation {
 
         params() : over_interp(1.5f) { }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_VALUE(p, over_interp)

diff --git a/amgcl/mpi/coarsening/pmis.hpp b/amgcl/mpi/coarsening/pmis.hpp
@@ -63,7 +63,7 @@ struct pmis {
 
         params() : eps_strong(0.08), block_size(1) { }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, eps_strong),
               AMGCL_PARAMS_IMPORT_VALUE(p, block_size)

diff --git a/amgcl/mpi/coarsening/runtime.hpp b/amgcl/mpi/coarsening/runtime.hpp
@@ -31,9 +31,14 @@ THE SOFTWARE.
  * \brief  Runtime wrapper for distributed coarsening schemes.
  */
 
-#include <boost/property_tree/ptree.hpp>
-
 #include <amgcl/util.hpp>
+#ifndef AMGCL_USE_PROPERTY_TREE
+#  error \
+    Runtime interface relies on Boost.PropertyTree! \
+    Either define AMGCL_USE_PROPERTY_TREE, or \
+    include <boost/property_tree/ptree.hpp> before any of the amgcl headers.
+#endif
+
 #include <amgcl/mpi/util.hpp>
 #include <amgcl/mpi/distributed_matrix.hpp>
 #include <amgcl/mpi/coarsening/aggregation.hpp>

diff --git a/amgcl/mpi/coarsening/smoothed_aggregation.hpp b/amgcl/mpi/coarsening/smoothed_aggregation.hpp
@@ -72,7 +72,7 @@ struct smoothed_aggregation {
             : relax(1.0f), estimate_spectral_radius(false), power_iters(0)
         { }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_VALUE(p, relax),

diff --git a/amgcl/mpi/direct_solver/pastix.hpp b/amgcl/mpi/direct_solver/pastix.hpp
@@ -74,7 +74,7 @@ class pastix : public solver_base< value_type, pastix<value_type, Distrib> > {
                 : max_rows_per_process(50000)
             {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_VALUE(p, max_rows_per_process)
             {

diff --git a/amgcl/mpi/direct_solver/runtime.hpp b/amgcl/mpi/direct_solver/runtime.hpp
@@ -31,9 +31,14 @@ THE SOFTWARE.
  * \brief  Runtime wrapper for distributed direct solvers.
  */
 
-#include <boost/property_tree/ptree.hpp>
-
 #include <amgcl/util.hpp>
+#ifndef AMGCL_USE_PROPERTY_TREE
+#  error \
+    Runtime interface relies on Boost.PropertyTree! \
+    Either define AMGCL_USE_PROPERTY_TREE, or \
+    include <boost/property_tree/ptree.hpp> before any of the amgcl headers.
+#endif
+
 #include <amgcl/mpi/direct_solver/skyline_lu.hpp>
 #ifdef AMGCL_HAVE_EIGEN
 #  include <amgcl/mpi/direct_solver/eigen_splu.hpp>

diff --git a/amgcl/mpi/make_solver.hpp b/amgcl/mpi/make_solver.hpp
@@ -66,7 +66,7 @@ class make_solver {
 
             params() {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, precond),
                   AMGCL_PARAMS_IMPORT_CHILD(p, solver)
@@ -148,7 +148,7 @@ class make_solver {
             return P.system_matrix();
         }
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         void get_params(boost::property_tree::ptree &p) const {
             prm.get(p);
         }

diff --git a/amgcl/mpi/partition/merge.hpp b/amgcl/mpi/partition/merge.hpp
@@ -57,7 +57,7 @@ struct merge {
             enable(false), min_per_proc(10000), shrink_ratio(8)
         {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, enable),
               AMGCL_PARAMS_IMPORT_VALUE(p, min_per_proc),

diff --git a/amgcl/mpi/partition/parmetis.hpp b/amgcl/mpi/partition/parmetis.hpp
@@ -59,7 +59,7 @@ struct parmetis {
             enable(false), min_per_proc(10000), shrink_ratio(8)
         {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, enable),
               AMGCL_PARAMS_IMPORT_VALUE(p, min_per_proc),

diff --git a/amgcl/mpi/partition/ptscotch.hpp b/amgcl/mpi/partition/ptscotch.hpp
@@ -59,7 +59,7 @@ struct ptscotch {
             enable(false), min_per_proc(10000), shrink_ratio(8)
         {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, enable),
               AMGCL_PARAMS_IMPORT_VALUE(p, min_per_proc),

diff --git a/amgcl/mpi/partition/runtime.hpp b/amgcl/mpi/partition/runtime.hpp
@@ -32,7 +32,14 @@ THE SOFTWARE.
  */
 
 #include <memory>
-#include <boost/property_tree/ptree.hpp>
+
+#include <amgcl/util.hpp>
+#ifndef AMGCL_USE_PROPERTY_TREE
+#  error \
+    Runtime interface relies on Boost.PropertyTree! \
+    Either define AMGCL_USE_PROPERTY_TREE, or \
+    include <boost/property_tree/ptree.hpp> before any of the amgcl headers.
+#endif
 
 #include <amgcl/mpi/partition/merge.hpp>
 

diff --git a/amgcl/mpi/relaxation/runtime.hpp b/amgcl/mpi/relaxation/runtime.hpp
@@ -33,7 +33,13 @@ THE SOFTWARE.
 
 #include <memory>
 
-#include <boost/property_tree/ptree.hpp>
+#include <amgcl/util.hpp>
+#ifndef AMGCL_USE_PROPERTY_TREE
+#  error \
+    Runtime interface relies on Boost.PropertyTree! \
+    Either define AMGCL_USE_PROPERTY_TREE, or \
+    include <boost/property_tree/ptree.hpp> before any of the amgcl headers.
+#endif
 
 #include <amgcl/backend/interface.hpp>
 #include <amgcl/value_type/interface.hpp>

diff --git a/amgcl/mpi/schur_pressure_correction.hpp b/amgcl/mpi/schur_pressure_correction.hpp
@@ -81,7 +81,7 @@ class schur_pressure_correction {
 
             params() : approx_schur(true) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, usolver),
                   AMGCL_PARAMS_IMPORT_CHILD(p, psolver),

diff --git a/amgcl/mpi/subdomain_deflation.hpp b/amgcl/mpi/subdomain_deflation.hpp
@@ -129,7 +129,7 @@ class subdomain_deflation {
 
             params() {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, local),
                   AMGCL_PARAMS_IMPORT_CHILD(p, isolver),

diff --git a/amgcl/preconditioner/cpr.hpp b/amgcl/preconditioner/cpr.hpp
@@ -71,7 +71,7 @@ class cpr {
 
             params() : block_size(2), active_rows(0) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, pprecond),
                   AMGCL_PARAMS_IMPORT_CHILD(p, sprecond),

diff --git a/amgcl/preconditioner/cpr_drs.hpp b/amgcl/preconditioner/cpr_drs.hpp
@@ -77,7 +77,7 @@ class cpr_drs {
 
             params() : block_size(2), active_rows(0), eps_dd(0.2), eps_ps(0.02) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, pprecond),
                   AMGCL_PARAMS_IMPORT_CHILD(p, sprecond),

diff --git a/amgcl/preconditioner/runtime.hpp b/amgcl/preconditioner/runtime.hpp
@@ -31,7 +31,14 @@ THE SOFTWARE.
  * \brief  Runtime-configurable wrappers around amgcl classes.
  */
 
-#include <boost/property_tree/ptree.hpp>
+#include <amgcl/util.hpp>
+#ifndef AMGCL_USE_PROPERTY_TREE
+#  error \
+    Runtime interface relies on Boost.PropertyTree! \
+    Either define AMGCL_USE_PROPERTY_TREE, or \
+    include <boost/property_tree/ptree.hpp> before any of the amgcl headers.
+#endif
+
 #include <amgcl/solver/runtime.hpp>
 #include <amgcl/coarsening/runtime.hpp>
 #include <amgcl/relaxation/runtime.hpp>

diff --git a/amgcl/preconditioner/schur_pressure_correction.hpp b/amgcl/preconditioner/schur_pressure_correction.hpp
@@ -121,7 +121,7 @@ class schur_pressure_correction {
 
             params() : approx_schur(true) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, usolver),
                   AMGCL_PARAMS_IMPORT_CHILD(p, psolver),

diff --git a/amgcl/relaxation/chebyshev.hpp b/amgcl/relaxation/chebyshev.hpp
@@ -68,7 +68,7 @@ class chebyshev {
 
             params() : degree(5), lower(1.0f / 30), power_iters(0) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_VALUE(p, degree),
                   AMGCL_PARAMS_IMPORT_VALUE(p, lower),

diff --git a/amgcl/relaxation/cusparse_ilu0.hpp b/amgcl/relaxation/cusparse_ilu0.hpp
@@ -54,7 +54,7 @@ struct ilu0< backend::cuda<real> > {
 
         params() : damping(1) {}
 
-#ifdef BOOST_VERSION
+#ifdef AMGCL_USE_PROPERTY_TREE
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, damping)
         {