Merge pull request #346 from jcarpent/devel

jcarpent · web-flow · commit a32e9de34d40 · 2023-02-12T21:41:24.000+01:00
Clean use of namespace bp::
diff --git a/cmake b/cmake
@@ -1 +1 @@
-Subproject commit 74c1e60e72c449b242c524d8406b1f4bf549f498
+Subproject commit 4bf6c7fc970aa5ef35627f2c7cca79eb9275bec8
diff --git a/include/eigenpy/angle-axis.hpp b/include/eigenpy/angle-axis.hpp
@@ -9,8 +9,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename AngleAxis>
 class AngleAxisVisitor;
 
diff --git a/include/eigenpy/copyable.hpp b/include/eigenpy/copyable.hpp
@@ -9,8 +9,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 ///
 /// \brief Add the Python method copy to allow a copy of this by calling the
 /// copy constructor.
diff --git a/include/eigenpy/decompositions/EigenSolver.hpp b/include/eigenpy/decompositions/EigenSolver.hpp
@@ -23,7 +23,6 @@ struct EigenSolverVisitor
 
   template <class PyClass>
   void visit(PyClass& cl) const {
-    namespace bp = boost::python;
     cl.def(bp::init<>("Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
             bp::arg("size"), "Default constructor with memory preallocation"))
@@ -76,7 +75,6 @@ struct EigenSolverVisitor
   }
 
   static void expose(const std::string& name) {
-    namespace bp = boost::python;
     bp::class_<Solver>(name.c_str(), bp::no_init).def(EigenSolverVisitor());
   }
 
diff --git a/include/eigenpy/decompositions/LDLT.hpp b/include/eigenpy/decompositions/LDLT.hpp
@@ -28,7 +28,6 @@ struct LDLTSolverVisitor
 
   template <class PyClass>
   void visit(PyClass &cl) const {
-    namespace bp = boost::python;
     cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
             bp::args("self", "size"),
@@ -106,7 +105,6 @@ struct LDLTSolverVisitor
   }
 
   static void expose(const std::string &name) {
-    namespace bp = boost::python;
     bp::class_<Solver>(
         name.c_str(),
         "Robust Cholesky decomposition of a matrix with pivoting.\n\n"
diff --git a/include/eigenpy/decompositions/LLT.hpp b/include/eigenpy/decompositions/LLT.hpp
@@ -28,7 +28,6 @@ struct LLTSolverVisitor
 
   template <class PyClass>
   void visit(PyClass &cl) const {
-    namespace bp = boost::python;
     cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
             bp::args("self", "size"),
@@ -99,7 +98,6 @@ struct LLTSolverVisitor
   }
 
   static void expose(const std::string &name) {
-    namespace bp = boost::python;
     bp::class_<Solver>(
         name.c_str(),
         "Standard Cholesky decomposition (LL^T) of a matrix and associated "
diff --git a/include/eigenpy/decompositions/SelfAdjointEigenSolver.hpp b/include/eigenpy/decompositions/SelfAdjointEigenSolver.hpp
@@ -24,7 +24,6 @@ struct SelfAdjointEigenSolverVisitor
 
   template <class PyClass>
   void visit(PyClass& cl) const {
-    namespace bp = boost::python;
     cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
             bp::args("self", "size"),
@@ -84,7 +83,6 @@ struct SelfAdjointEigenSolverVisitor
   }
 
   static void expose(const std::string& name) {
-    namespace bp = boost::python;
     bp::class_<Solver>(name.c_str(), bp::no_init)
         .def(SelfAdjointEigenSolverVisitor());
   }
diff --git a/include/eigenpy/decompositions/minres.hpp b/include/eigenpy/decompositions/minres.hpp
@@ -28,7 +28,6 @@ struct IterativeSolverBaseVisitor
 
   template <class PyClass>
   void visit(PyClass& cl) const {
-    namespace bp = boost::python;
     cl.def("analyzePattern",
            (Solver & (Solver::*)(const Eigen::EigenBase<MatrixType>& matrix)) &
                Solver::analyzePattern,
@@ -137,7 +136,6 @@ struct MINRESSolverVisitor
 
   template <class PyClass>
   void visit(PyClass& cl) const {
-    namespace bp = boost::python;
     cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<MatrixType>(
             bp::args("self", "matrix"),
@@ -155,7 +153,6 @@ struct MINRESSolverVisitor
   }
 
   static void expose(const std::string& name) {
-    namespace bp = boost::python;
     bp::class_<Solver, boost::noncopyable>(
         name.c_str(),
         "A minimal residual solver for sparse symmetric problems.\n"
diff --git a/include/eigenpy/eigen-to-python.hpp b/include/eigenpy/eigen-to-python.hpp
@@ -59,7 +59,6 @@ struct to_python_indirect<
 }  // namespace boost
 
 namespace eigenpy {
-namespace bp = boost::python;
 
 template <typename MatType, typename _Scalar>
 struct EigenToPy {
diff --git a/include/eigenpy/eigenpy.hpp b/include/eigenpy/eigenpy.hpp
@@ -9,6 +9,7 @@
 #include "eigenpy/fwd.hpp"
 #include "eigenpy/deprecated.hpp"
 #include "eigenpy/eigen-typedef.hpp"
+#include "eigenpy/expose.hpp"
 
 #define ENABLE_SPECIFIC_MATRIX_TYPE(TYPE) \
   ::eigenpy::enableEigenPySpecific<TYPE>();
diff --git a/include/eigenpy/fwd.hpp b/include/eigenpy/fwd.hpp
@@ -70,6 +70,12 @@
 #include <boost/python.hpp>
 #include <boost/python/scope.hpp>
 
+namespace eigenpy {
+
+namespace bp = boost::python;
+
+}
+
 #define NO_IMPORT_ARRAY
 #include "eigenpy/numpy.hpp"
 #undef NO_IMPORT_ARRAY
@@ -91,8 +97,6 @@
 
 #define EIGENPY_UNUSED_VARIABLE(var) (void)(var)
 
-#include "eigenpy/expose.hpp"
-
 #ifdef EIGENPY_WITH_CXX11_SUPPORT
 #include <memory>
 #define EIGENPY_SHARED_PTR_HOLDER_TYPE(T) ::std::shared_ptr<T>
diff --git a/include/eigenpy/geometry-conversion.hpp b/include/eigenpy/geometry-conversion.hpp
@@ -10,8 +10,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename Scalar, int Options = 0>
 struct EulerAnglesConvertor {
   typedef typename Eigen::Matrix<Scalar, 3, 1, Options> Vector3;
diff --git a/include/eigenpy/numpy-type.hpp b/include/eigenpy/numpy-type.hpp
@@ -14,7 +14,6 @@
 #include "eigenpy/scalar-conversion.hpp"
 
 namespace eigenpy {
-namespace bp = boost::python;
 
 template <typename Scalar>
 bool np_type_is_convertible_into_scalar(const int np_type) {
diff --git a/include/eigenpy/quaternion.hpp b/include/eigenpy/quaternion.hpp
@@ -65,8 +65,6 @@ class ExceptionIndex : public Exception {
   }
 };
 
-namespace bp = boost::python;
-
 template <typename QuaternionDerived>
 class QuaternionVisitor;
 
diff --git a/include/eigenpy/register.hpp b/include/eigenpy/register.hpp
@@ -31,7 +31,6 @@ struct EIGENPY_DLLAPI Register {
 
   template <typename Scalar>
   static PyTypeObject *getPyType() {
-    namespace bp = boost::python;
     if (!isNumpyNativeType<Scalar>()) {
       const PyTypeObject *const_py_type_ptr =
           bp::converter::registered_pytype<Scalar>::get_pytype();
@@ -53,7 +52,6 @@ struct EIGENPY_DLLAPI Register {
 
   template <typename Scalar>
   static PyArray_Descr *getPyArrayDescr() {
-    namespace bp = boost::python;
     if (!isNumpyNativeType<Scalar>()) {
       return getPyArrayDescr(getPyType<Scalar>());
     } else {
diff --git a/include/eigenpy/registration.hpp b/include/eigenpy/registration.hpp
@@ -3,12 +3,13 @@
  * Copyright 2018-2019, INRIA
  */
 
-#include "eigenpy/fwd.hpp"
-
 #ifndef __eigenpy_registration_hpp__
 #define __eigenpy_registration_hpp__
 
+#include "eigenpy/fwd.hpp"
+
 namespace eigenpy {
+
 ///
 /// \brief Check at runtime the registration of the type T inside the boost
 /// python registry.
@@ -19,8 +20,6 @@ namespace eigenpy {
 ///
 template <typename T>
 inline bool check_registration() {
-  namespace bp = boost::python;
-
   const bp::type_info info = bp::type_id<T>();
   const bp::converter::registration* reg = bp::converter::registry::query(info);
   if (reg == NULL)
@@ -40,8 +39,6 @@ inline bool check_registration() {
 ///
 template <typename T>
 inline bool register_symbolic_link_to_registered_type() {
-  namespace bp = boost::python;
-
   if (eigenpy::check_registration<T>()) {
     const bp::type_info info = bp::type_id<T>();
     const bp::converter::registration* reg =
diff --git a/include/eigenpy/solvers/BFGSPreconditioners.hpp b/include/eigenpy/solvers/BFGSPreconditioners.hpp
@@ -24,8 +24,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename Preconditioner>
 struct BFGSPreconditionerBaseVisitor
     : public bp::def_visitor<BFGSPreconditionerBaseVisitor<Preconditioner> > {
diff --git a/include/eigenpy/solvers/BasicPreconditioners.hpp b/include/eigenpy/solvers/BasicPreconditioners.hpp
@@ -23,8 +23,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename Preconditioner>
 struct PreconditionerBaseVisitor
     : public bp::def_visitor<PreconditionerBaseVisitor<Preconditioner> > {
diff --git a/include/eigenpy/solvers/ConjugateGradient.hpp b/include/eigenpy/solvers/ConjugateGradient.hpp
@@ -24,8 +24,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename ConjugateGradient>
 struct ConjugateGradientVisitor
     : public boost::python::def_visitor<
diff --git a/include/eigenpy/solvers/IterativeSolverBase.hpp b/include/eigenpy/solvers/IterativeSolverBase.hpp
@@ -22,8 +22,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename IterativeSolver>
 struct IterativeSolverVisitor : public boost::python::def_visitor<
                                     IterativeSolverVisitor<IterativeSolver> > {
diff --git a/include/eigenpy/solvers/LeastSquaresConjugateGradient.hpp b/include/eigenpy/solvers/LeastSquaresConjugateGradient.hpp
@@ -24,8 +24,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename LeastSquaresConjugateGradient>
 struct LeastSquaresConjugateGradientVisitor
     : public boost::python::def_visitor<LeastSquaresConjugateGradientVisitor<
diff --git a/include/eigenpy/solvers/SparseSolverBase.hpp b/include/eigenpy/solvers/SparseSolverBase.hpp
@@ -21,8 +21,6 @@
 
 namespace eigenpy {
 
-namespace bp = boost::python;
-
 template <typename SparseSolver>
 struct SparseSolverVisitor
     : public bp::def_visitor<SparseSolverVisitor<SparseSolver> > {
diff --git a/include/eigenpy/std-map.hpp b/include/eigenpy/std-map.hpp
@@ -27,8 +27,6 @@ struct overload_base_get_item_for_std_map
  private:
   static boost::python::object base_get_item(
       boost::python::back_reference<Container&> container, PyObject* i_) {
-    namespace bp = ::boost::python;
-
     index_type idx = convert_index(container.get(), i_);
     typename Container::iterator i = container.get().find(idx);
     if (i == container.get().end()) {
@@ -43,7 +41,6 @@ struct overload_base_get_item_for_std_map
   }
 
   static index_type convert_index(Container& /*container*/, PyObject* i_) {
-    namespace bp = ::boost::python;
     bp::extract<key_type const&> i(i_);
     if (i.check()) {
       return i();
diff --git a/include/eigenpy/std-vector.hpp b/include/eigenpy/std-vector.hpp
@@ -31,8 +31,6 @@ namespace details {
 /// \brief Check if a PyObject can be converted to an std::vector<T>.
 template <typename T>
 bool from_python_list(PyObject *obj_ptr, T *) {
-  namespace bp = ::boost::python;
-
   // Check if it is a list
   if (!PyList_Check(obj_ptr)) return false;
 
@@ -53,8 +51,6 @@ bool from_python_list(PyObject *obj_ptr, T *) {
 template <typename vector_type, bool NoProxy>
 struct build_list {
   static ::boost::python::list run(vector_type &vec) {
-    namespace bp = ::boost::python;
-
     bp::list bp_list;
     for (size_t k = 0; k < vec.size(); ++k) {
       bp_list.append(boost::ref(vec[k]));
@@ -66,8 +62,6 @@ struct build_list {
 template <typename vector_type>
 struct build_list<vector_type, true> {
   static ::boost::python::list run(vector_type &vec) {
-    namespace bp = ::boost::python;
-
     typedef bp::iterator<vector_type> iterator;
     return bp::list(iterator()(vec));
   }
@@ -92,8 +86,6 @@ struct overload_base_get_item_for_std_vector
  private:
   static boost::python::object base_get_item(
       boost::python::back_reference<Container &> container, PyObject *i_) {
-    namespace bp = ::boost::python;
-
     index_type idx = convert_index(container.get(), i_);
     typename Container::iterator i = container.get().begin();
     std::advance(i, idx);
@@ -109,7 +101,6 @@ struct overload_base_get_item_for_std_vector
   }
 
   static index_type convert_index(Container &container, PyObject *i_) {
-    namespace bp = boost::python;
     bp::extract<long> i(i_);
     if (i.check()) {
       long index = i();
@@ -279,8 +270,6 @@ struct StdContainerFromPythonList {
   static void construct(
       PyObject *obj_ptr,
       boost::python::converter::rvalue_from_python_stage1_data *memory) {
-    namespace bp = boost::python;
-
     // Extract the list
     bp::object bp_obj(bp::handle<>(bp::borrowed(obj_ptr)));
     bp::list bp_list(bp_obj);
@@ -410,8 +399,6 @@ struct StdVectorPythonVisitor
   static void expose(
       const std::string &class_name, const std::string &doc_string,
       const boost::python::def_visitor<VisitorDerived> &visitor) {
-    namespace bp = boost::python;
-
     if (!register_symbolic_link_to_registered_type<vector_type>()) {
       bp::class_<vector_type> cl(class_name.c_str(), doc_string.c_str());
       cl.def(StdVectorPythonVisitor())
diff --git a/include/eigenpy/user-type.hpp b/include/eigenpy/user-type.hpp
@@ -286,7 +286,6 @@ bool registerCast(const bool safe) {
 template <typename T>
 boost::python::object getInstanceClass() {
   // Query into the registry for type T.
-  namespace bp = boost::python;
   bp::type_info type = bp::type_id<T>();
   const bp::converter::registration* registration =
       bp::converter::registry::query(type);
diff --git a/python/main.cpp b/python/main.cpp
@@ -18,7 +18,6 @@
 using namespace eigenpy;
 
 BOOST_PYTHON_MODULE(eigenpy_pywrap) {
-  namespace bp = boost::python;
   enableEigenPy();
 
   bp::scope().attr("__version__") = eigenpy::printVersion();
diff --git a/src/decompositions/decompositions.cpp b/src/decompositions/decompositions.cpp
@@ -14,7 +14,6 @@
 namespace eigenpy {
 void exposeDecompositions() {
   using namespace Eigen;
-  namespace bp = boost::python;
 
   EigenSolverVisitor<MatrixXd>::expose("EigenSolver");
   SelfAdjointEigenSolverVisitor<MatrixXd>::expose("SelfAdjointEigenSolver");
diff --git a/src/numpy-type.cpp b/src/numpy-type.cpp
@@ -7,7 +7,6 @@
 #include <patchlevel.h>  // For PY_MAJOR_VERSION
 
 namespace eigenpy {
-namespace bp = boost::python;
 
 NumpyType& NumpyType::getInstance() {
   static NumpyType instance;
diff --git a/src/register.cpp b/src/register.cpp
@@ -36,8 +36,6 @@ int Register::registerNewType(
     PyArray_CopySwapFunc* copyswap, PyArray_CopySwapNFunc* copyswapn,
     PyArray_DotFunc* dotfunc, PyArray_FillFunc* fill,
     PyArray_FillWithScalarFunc* fillwithscalar) {
-  namespace bp = boost::python;
-
   bp::tuple tp_bases_extended(
       bp::make_tuple(bp::handle<>(bp::borrowed(&PyGenericArrType_Type))));
   tp_bases_extended +=

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ struct EigenSolverVisitor`
`23`	`23`
`24`	`24`	`template <class PyClass>`
`25`	`25`	`void visit(PyClass& cl) const {`
`26`		`- namespace bp = boost::python;`
`27`	`26`	`cl.def(bp::init<>("Default constructor"))`
`28`	`27`	`.def(bp::init<Eigen::DenseIndex>(`
`29`	`28`	`bp::arg("size"), "Default constructor with memory preallocation"))`
`@@ -76,7 +75,6 @@ struct EigenSolverVisitor`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`static void expose(const std::string& name) {`
`79`		`- namespace bp = boost::python;`
`80`	`78`	`bp::class_<Solver>(name.c_str(), bp::no_init).def(EigenSolverVisitor());`
`81`	`79`	`}`
`82`	`80`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ struct SelfAdjointEigenSolverVisitor`
`24`	`24`
`25`	`25`	`template <class PyClass>`
`26`	`26`	`void visit(PyClass& cl) const {`
`27`		`- namespace bp = boost::python;`
`28`	`27`	`cl.def(bp::init<>(bp::arg("self"), "Default constructor"))`
`29`	`28`	`.def(bp::init<Eigen::DenseIndex>(`
`30`	`29`	`bp::args("self", "size"),`
`@@ -84,7 +83,6 @@ struct SelfAdjointEigenSolverVisitor`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`static void expose(const std::string& name) {`
`87`		`- namespace bp = boost::python;`
`88`	`86`	`bp::class_<Solver>(name.c_str(), bp::no_init)`
`89`	`87`	`.def(SelfAdjointEigenSolverVisitor());`
`90`	`88`	`}`