Merge pull request #327 from jcarpent/devel

Fix potential issues related to Boost.Python >= 1.80

Author: jcarpent

.github/workflows/macos-linux-conda.yml

@@ -24,7 +24,7 @@ jobs:
         activate-environment: eigenpy
         auto-update-conda: true
         environment-file: .github/workflows/conda/environment.yml
-        python-version: 3.8
+        python-version: '3.10'
 
     - uses: actions/cache@v2
       with:
@@ -36,6 +36,7 @@ jobs:
       run: |
         conda activate eigenpy
         conda install cmake -c main
+        conda list
 
     - name: Build EigenPy
       shell: bash -l {0}

cmake

@@ -46,15 +46,13 @@ class AngleAxisVisitor : public bp::def_visitor<AngleAxisVisitor<AngleAxis> > {
   template <class PyClass>
   void visit(PyClass& cl) const {
     cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
-        .def(bp::init<Scalar, Vector3>(
-            (bp::arg("self"), bp::arg("angle"), bp::arg("axis")),
-            "Initialize from angle and axis."))
-        .def(bp::init<Matrix3>((bp::arg("self"), bp::arg("R")),
+        .def(bp::init<Scalar, Vector3>(bp::args("self", "angle", "axis"),
+                                       "Initialize from angle and axis."))
+        .def(bp::init<Matrix3>(bp::args("self", "R"),
                                "Initialize from a rotation matrix"))
-        .def(bp::init<Quaternion>((bp::arg("self"), bp::arg("quaternion")),
+        .def(bp::init<Quaternion>(bp::args("self", "quaternion"),
                                   "Initialize from a quaternion."))
-        .def(bp::init<AngleAxis>((bp::arg("self"), bp::arg("copy")),
-                                 "Copy constructor."))
+        .def(bp::init<AngleAxis>(bp::args("self", "copy"), "Copy constructor."))
 
         /* --- Properties --- */
         .add_property(

include/eigenpy/angle-axis.hpp

@@ -29,11 +29,12 @@ struct LDLTSolverVisitor
   template <class PyClass>
   void visit(PyClass &cl) const {
     namespace bp = boost::python;
-    cl.def(bp::init<>("Default constructor"))
+    cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
-            bp::arg("size"), "Default constructor with memory preallocation"))
+            bp::args("self", "size"),
+            "Default constructor with memory preallocation"))
         .def(bp::init<MatrixType>(
-            bp::arg("matrix"),
+            bp::args("self", "matrix"),
             "Constructs a LDLT factorization from a given matrix."))
 
         .def("isNegative", &Solver::isNegative, bp::arg("self"),

include/eigenpy/decompositions/LDLT.hpp

@@ -29,11 +29,12 @@ struct LLTSolverVisitor
   template <class PyClass>
   void visit(PyClass &cl) const {
     namespace bp = boost::python;
-    cl.def(bp::init<>("Default constructor"))
+    cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
-            bp::arg("size"), "Default constructor with memory preallocation"))
+            bp::args("self", "size"),
+            "Default constructor with memory preallocation"))
         .def(bp::init<MatrixType>(
-            bp::arg("matrix"),
+            bp::args("self", "matrix"),
             "Constructs a LLT factorization from a given matrix."))
 
         .def("matrixL", &matrixL, bp::arg("self"),

include/eigenpy/decompositions/LLT.hpp

@@ -25,11 +25,12 @@ struct SelfAdjointEigenSolverVisitor
   template <class PyClass>
   void visit(PyClass& cl) const {
     namespace bp = boost::python;
-    cl.def(bp::init<>("Default constructor"))
+    cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
-            bp::arg("size"), "Default constructor with memory preallocation"))
+            bp::args("self", "size"),
+            "Default constructor with memory preallocation"))
         .def(bp::init<MatrixType, bp::optional<int> >(
-            bp::args("matrix", "options"),
+            bp::args("self", "matrix", "options"),
             "Computes eigendecomposition of given matrix"))
 
         .def("eigenvalues", &Solver::eigenvalues, bp::arg("self"),

include/eigenpy/decompositions/SelfAdjointEigenSolver.hpp

@@ -138,9 +138,9 @@ struct MINRESSolverVisitor
   template <class PyClass>
   void visit(PyClass& cl) const {
     namespace bp = boost::python;
-    cl.def(bp::init<>("Default constructor"))
+    cl.def(bp::init<>(bp::arg("self"), "Default constructor"))
         .def(bp::init<MatrixType>(
-            bp::arg("matrix"),
+            bp::args("self", "matrix"),
             "Initialize the solver with matrix A for further Ax=b solving.\n"
             "This constructor is a shortcut for the default constructor "
             "followed by a call to compute()."))

include/eigenpy/decompositions/minres.hpp

@@ -34,7 +34,7 @@ struct PreconditionerBaseVisitor
   template <class PyClass>
   void visit(PyClass& cl) const {
     cl.def(bp::init<>("Default constructor"))
-        .def(bp::init<MatrixType>(bp::arg("A"),
+        .def(bp::init<MatrixType>(bp::args("self", "A"),
                                   "Initialize the preconditioner with matrix A "
                                   "for further Az=b solving."))
 #if EIGEN_VERSION_AT_LEAST(3, 3, 0)