Only use Boost.PropertyTree if runtime interface is used (#88)

* Only use Boost.PropertyTree if runtime interface is used (or boost is otherwise available)
ddemidov · Jun 26, 2018 · a2fab10 · a2fab10
1 parent 946398e
commit a2fab10
Show file tree

Hide file tree

Showing 45 changed files with 130 additions and 16 deletions.
diff --git a/amgcl/amg.hpp b/amgcl/amg.hpp
@@ -155,6 +155,7 @@ class amg {
 #endif
             {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, coarsening),
                   AMGCL_PARAMS_IMPORT_CHILD(p, relax),
@@ -196,6 +197,7 @@ class amg {
                 AMGCL_PARAMS_EXPORT_VALUE(p, path, async_setup);
 #endif
             }
+#endif
         } prm;
 
         /// Builds the AMG hierarchy for the system matrix.

diff --git a/amgcl/backend/block_crs.hpp b/amgcl/backend/block_crs.hpp
@@ -158,6 +158,8 @@ struct block_crs {
         size_t block_size;
 
         params(size_t block_size = 4) : block_size(block_size) {}
+
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, block_size)
         {
@@ -166,6 +168,7 @@ struct block_crs {
         void get(boost::property_tree::ptree &p, const std::string &path) const {
             AMGCL_PARAMS_EXPORT_VALUE(p, path, block_size);
         }
+#endif
     };
 
     static std::string name() { return "block_crs"; }

diff --git a/amgcl/backend/cuda.hpp b/amgcl/backend/cuda.hpp
@@ -265,6 +265,7 @@ struct cuda {
 
         params(cusparseHandle_t handle = 0) : cusparse_handle(handle) {}
 
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, cusparse_handle)
         {
@@ -274,6 +275,7 @@ struct cuda {
         void get(boost::property_tree::ptree &p, const std::string &path) const {
             AMGCL_PARAMS_EXPORT_VALUE(p, path, cusparse_handle);
         }
+#endif
     };
 
     static std::string name() { return "cuda"; }

diff --git a/amgcl/coarsening/aggregation.hpp b/amgcl/coarsening/aggregation.hpp
@@ -96,6 +96,7 @@ struct aggregation {
 
         params() : over_interp(1.5f) { }
 
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_CHILD(p, nullspace),
@@ -109,6 +110,7 @@ struct aggregation {
             AMGCL_PARAMS_EXPORT_CHILD(p, path, nullspace);
             AMGCL_PARAMS_EXPORT_VALUE(p, path, over_interp);
         }
+#endif
     } prm;
 
     aggregation(const params &prm = params()) : prm(prm) {}

diff --git a/amgcl/coarsening/plain_aggregates.hpp b/amgcl/coarsening/plain_aggregates.hpp
@@ -74,6 +74,7 @@ struct plain_aggregates {
 
         params() : eps_strong(0.08f) {}
 
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, eps_strong)
         {
@@ -83,6 +84,7 @@ struct plain_aggregates {
         void get(boost::property_tree::ptree &p, const std::string &path) const {
             AMGCL_PARAMS_EXPORT_VALUE(p, path, eps_strong);
         }
+#endif
     };
 
     static const ptrdiff_t undefined = -1;

diff --git a/amgcl/coarsening/pointwise_aggregates.hpp b/amgcl/coarsening/pointwise_aggregates.hpp
@@ -61,6 +61,7 @@ class pointwise_aggregates {
 
             params() : block_size(1) {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : plain_aggregates::params(p),
                   AMGCL_PARAMS_IMPORT_VALUE(p, block_size)
@@ -72,6 +73,7 @@ class pointwise_aggregates {
                 plain_aggregates::params::get(p, path);
                 AMGCL_PARAMS_EXPORT_VALUE(p, path, block_size);
             }
+#endif
         };
 
         static const ptrdiff_t undefined = -1;

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

diff --git a/amgcl/coarsening/smoothed_aggr_emin.hpp b/amgcl/coarsening/smoothed_aggr_emin.hpp
@@ -65,6 +65,7 @@ struct smoothed_aggr_emin {
 
         params() {}
 
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_CHILD(p, nullspace)
@@ -76,6 +77,7 @@ struct smoothed_aggr_emin {
             AMGCL_PARAMS_EXPORT_CHILD(p, path, aggr);
             AMGCL_PARAMS_EXPORT_CHILD(p, path, nullspace);
         }
+#endif
     } prm;
 
     smoothed_aggr_emin(const params &prm = params()) : prm(prm) {}

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

diff --git a/amgcl/coarsening/tentative_prolongation.hpp b/amgcl/coarsening/tentative_prolongation.hpp
@@ -73,6 +73,7 @@ struct nullspace_params {
 
     nullspace_params() : cols(0) {}
 
+#ifdef BOOST_VERSION
     nullspace_params(const boost::property_tree::ptree &p)
         : cols(p.get("cols", nullspace_params().cols))
     {
@@ -105,6 +106,7 @@ struct nullspace_params {
     }
 
     void get(boost::property_tree::ptree&, const std::string&) const {}
+#endif
 };
 
 /// Tentative prolongation operator

diff --git a/amgcl/make_solver.hpp b/amgcl/make_solver.hpp
@@ -69,6 +69,7 @@ class make_solver {
 
             params() {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, precond),
                   AMGCL_PARAMS_IMPORT_CHILD(p, solver)
@@ -83,6 +84,7 @@ class make_solver {
                 AMGCL_PARAMS_EXPORT_CHILD(p, path, precond);
                 AMGCL_PARAMS_EXPORT_CHILD(p, path, solver);
             }
+#endif
         } prm;
 
         /** Sets up the preconditioner and creates the iterative solver. */
@@ -189,10 +191,12 @@ class make_solver {
             return P.system_matrix();
         }
 
+#ifdef BOOST_VERSION
         /// Stores the parameters used during construction into the property tree \p p.
         void get_params(boost::property_tree::ptree &p) const {
             prm.get(p);
         }
+#endif
 
         /// Returns the size of the system matrix.
         size_t size() const {

diff --git a/amgcl/mpi/amg.hpp b/amgcl/mpi/amg.hpp
@@ -113,6 +113,7 @@ class amg {
                 npre(1), npost(1), ncycle(1), pre_cycles(1)
             {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, coarsening),
                   AMGCL_PARAMS_IMPORT_CHILD(p, relax),
@@ -148,6 +149,7 @@ class amg {
                 AMGCL_PARAMS_EXPORT_VALUE(p, path, ncycle);
                 AMGCL_PARAMS_EXPORT_VALUE(p, path, pre_cycles);
             }
+#endif
         } prm;
 
         template <class Matrix>

diff --git a/amgcl/mpi/coarsening/aggregation.hpp b/amgcl/mpi/coarsening/aggregation.hpp
@@ -73,6 +73,7 @@ struct aggregation {
 
         params() : over_interp(1.5f) { }
 
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_CHILD(p, aggr),
               AMGCL_PARAMS_IMPORT_VALUE(p, over_interp)
@@ -84,6 +85,7 @@ struct aggregation {
             AMGCL_PARAMS_EXPORT_CHILD(p, path, aggr);
             AMGCL_PARAMS_EXPORT_VALUE(p, path, over_interp);
         }
+#endif
     } prm;
 
     aggregation(const params &prm = params()) : prm(prm) {}

diff --git a/amgcl/mpi/coarsening/pmis.hpp b/amgcl/mpi/coarsening/pmis.hpp
@@ -63,6 +63,7 @@ struct pmis {
 
         params() : eps_strong(0.08), block_size(1) { }
 
+#ifdef BOOST_VERSION
         params(const boost::property_tree::ptree &p)
             : AMGCL_PARAMS_IMPORT_VALUE(p, eps_strong),
               AMGCL_PARAMS_IMPORT_VALUE(p, block_size)
@@ -74,6 +75,7 @@ struct pmis {
             AMGCL_PARAMS_EXPORT_VALUE(p, path, eps_strong);
             AMGCL_PARAMS_EXPORT_VALUE(p, path, block_size);
         }
+#endif
     };
 
     std::shared_ptr< distributed_matrix<bool_backend> > conn;

diff --git a/amgcl/mpi/coarsening/runtime.hpp b/amgcl/mpi/coarsening/runtime.hpp
@@ -31,6 +31,8 @@ THE SOFTWARE.
  * \brief  Runtime wrapper for distributed coarsening schemes.
  */
 
+#include <boost/property_tree/ptree.hpp>
+
 #include <amgcl/util.hpp>
 #include <amgcl/mpi/util.hpp>
 #include <amgcl/mpi/distributed_matrix.hpp>

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

diff --git a/amgcl/mpi/direct_solver/pastix.hpp b/amgcl/mpi/direct_solver/pastix.hpp
@@ -74,6 +74,7 @@ class pastix : public solver_base< value_type, pastix<value_type, Distrib> > {
                 : max_rows_per_process(50000)
             {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_VALUE(p, max_rows_per_process)
             {
@@ -83,6 +84,7 @@ class pastix : public solver_base< value_type, pastix<value_type, Distrib> > {
             void get(boost::property_tree::ptree &p, const std::string &path) const {
                 AMGCL_PARAMS_EXPORT_VALUE(p, path, max_rows_per_process);
             }
+#endif
         };
 
         /// Constructor.

diff --git a/amgcl/mpi/direct_solver/runtime.hpp b/amgcl/mpi/direct_solver/runtime.hpp
@@ -31,6 +31,8 @@ THE SOFTWARE.
  * \brief  Runtime wrapper for distributed direct solvers.
  */
 
+#include <boost/property_tree/ptree.hpp>
+
 #include <amgcl/util.hpp>
 #include <amgcl/mpi/direct_solver/skyline_lu.hpp>
 #ifdef AMGCL_HAVE_EIGEN

diff --git a/amgcl/mpi/make_solver.hpp b/amgcl/mpi/make_solver.hpp
@@ -66,6 +66,7 @@ class make_solver {
 
             params() {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, precond),
                   AMGCL_PARAMS_IMPORT_CHILD(p, solver)
@@ -78,6 +79,7 @@ class make_solver {
                 AMGCL_PARAMS_EXPORT_CHILD(p, path, precond);
                 AMGCL_PARAMS_EXPORT_CHILD(p, path, solver);
             }
+#endif
         } prm;
 
         template <class Matrix>
@@ -146,9 +148,11 @@ class make_solver {
             return P.system_matrix();
         }
 
+#ifdef BOOST_VERSION
         void get_params(boost::property_tree::ptree &p) const {
             prm.get(p);
         }
+#endif
 
         size_t size() const {
             return n;

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

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

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

diff --git a/amgcl/mpi/partition/runtime.hpp b/amgcl/mpi/partition/runtime.hpp
@@ -32,6 +32,7 @@ THE SOFTWARE.
  */
 
 #include <memory>
+#include <boost/property_tree/ptree.hpp>
 
 #include <amgcl/mpi/partition/merge.hpp>
 

diff --git a/amgcl/mpi/relaxation/runtime.hpp b/amgcl/mpi/relaxation/runtime.hpp
@@ -32,6 +32,9 @@ THE SOFTWARE.
  */
 
 #include <memory>
+
+#include <boost/property_tree/ptree.hpp>
+
 #include <amgcl/backend/interface.hpp>
 #include <amgcl/value_type/interface.hpp>
 #include <amgcl/relaxation/runtime.hpp>

diff --git a/amgcl/mpi/schur_pressure_correction.hpp b/amgcl/mpi/schur_pressure_correction.hpp
@@ -81,6 +81,7 @@ class schur_pressure_correction {
 
             params() : approx_schur(true) {}
 
+#ifdef BOOST_VERSION
             params(const boost::property_tree::ptree &p)
                 : AMGCL_PARAMS_IMPORT_CHILD(p, usolver),
                   AMGCL_PARAMS_IMPORT_CHILD(p, psolver),
@@ -142,6 +143,7 @@ class schur_pressure_correction {
                 AMGCL_PARAMS_EXPORT_CHILD(p, path, psolver);
                 AMGCL_PARAMS_EXPORT_VALUE(p, path, approx_schur);
             }
+#endif
         } prm;
 
         template <class Matrix>