Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not use namespace eigenpy and define bp #429

Merged
merged 2 commits into from
Jan 30, 2024
Merged

do not use namespace eigenpy and define bp #429

merged 2 commits into from
Jan 30, 2024

Conversation

nim65s
Copy link
Contributor

@nim65s nim65s commented Jan 29, 2024

to fix on 18.04:

[ 94%] Building CXX object unittest/CMakeFiles/std_pair.dir/std_pair.cpp.o
cd /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest && /usr/bin/g++  -Dstd_pair_EXPORTS -I/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0 -isystem /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include -isystem /usr/lib/python3/dist-packages/numpy/core/include -isystem /usr/include/python3.6 -isystem /usr/include/eigen3  -Wno-long-long -Wall -Wextra -Wcast-align -Wcast-qual -Wformat -Wwrite-strings -Wconversion   -pipe  -O3 -DNDEBUG -fPIC   -std=gnu++14 -o CMakeFiles/std_pair.dir/std_pair.cpp.o -c /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp: In function 'void init_module_std_pair()':
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:28:3: error: reference to 'bp' is ambiguous
bp::def("std_pair_to_tuple", std_pair_to_tuple);
^~
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:8:29: note: candidates are: namespace bp = boost::boost::python;
namespace bp = boost::python;
^
In file included from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/eigenpy.hpp:9:0,
from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:4:
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/fwd.hpp:81:29: note:                 namespace eigenpy::bp = boost::boost::python;
namespace bp = boost::python;
^
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:29:3: error: reference to 'bp' is ambiguous
bp::def("copy", copy);
^~
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:8:29: note: candidates are: namespace bp = boost::boost::python;
namespace bp = boost::python;
^
In file included from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/eigenpy.hpp:9:0,
from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:4:
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/fwd.hpp:81:29: note:                 namespace eigenpy::bp = boost::boost::python;
namespace bp = boost::python;
^

to fix on 18.04:
```
[ 94%] Building CXX object unittest/CMakeFiles/std_pair.dir/std_pair.cpp.o
cd /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest && /usr/bin/g++  -Dstd_pair_EXPORTS -I/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0 -isystem /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include -isystem /usr/lib/python3/dist-packages/numpy/core/include -isystem /usr/include/python3.6 -isystem /usr/include/eigen3  -Wno-long-long -Wall -Wextra -Wcast-align -Wcast-qual -Wformat -Wwrite-strings -Wconversion   -pipe  -O3 -DNDEBUG -fPIC   -std=gnu++14 -o CMakeFiles/std_pair.dir/std_pair.cpp.o -c /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp: In function 'void init_module_std_pair()':
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:28:3: error: reference to 'bp' is ambiguous
bp::def("std_pair_to_tuple", std_pair_to_tuple);
^~
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:8:29: note: candidates are: namespace bp = boost::boost::python;
namespace bp = boost::python;
^
In file included from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/eigenpy.hpp:9:0,
from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:4:
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/fwd.hpp:81:29: note:                 namespace eigenpy::bp = boost::boost::python;
namespace bp = boost::python;
^
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:29:3: error: reference to 'bp' is ambiguous
bp::def("copy", copy);
^~
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:8:29: note: candidates are: namespace bp = boost::boost::python;
namespace bp = boost::python;
^
In file included from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/eigenpy.hpp:9:0,
from /local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/unittest/std_pair.cpp:4:
/local/robotpkg/var/tmp/robotpkg/math/py-eigenpy/work/eigenpy-3.3.0/include/eigenpy/fwd.hpp:81:29: note:                 namespace eigenpy::bp = boost::boost::python;
namespace bp = boost::python;
^
```
@jcarpent jcarpent merged commit ebde399 into devel Jan 30, 2024
55 checks passed
@jcarpent jcarpent deleted the namespace branch January 30, 2024 06:51
nim65s added a commit to nim65s/robotpkg that referenced this pull request Mar 12, 2024
Upstream changelog:

    ## [3.4.0] - 2024-02-26

    ### Added
    - Support for `Eigen::SparseMatrix` types (stack-of-tasks/eigenpy#426)
    - Support for `boost::variant` types with `VariantConverter` (stack-of-tasks/eigenpy#430)
    - Support for `std::variant` types with `VariantConverter` (stack-of-tasks/eigenpy#431)
    - Support for `std::unique_ptr` as a return types with `StdUniquePtrCallPolicies` and `boost::python::default_call_policies` (stack-of-tasks/eigenpy#433)
    - Support for `std::unique_ptr` as an internal reference with `ReturnInternalStdUniquePtr` (stack-of-tasks/eigenpy#433)
    - Support for `Eigen::Simplicial{LLT,LDLT}` and `Eigen::Cholmod{Simplicial,Supernodal}{LLT,LDLT}` Cholesky de compositions (stack-of-tasks/eigenpy#438)
    - Switch to ruff for lints, format, and import sort (stack-of-tasks/eigenpy#441)

    ### Fixed
    - Fix the issue of missing exposition of Eigen types with __int64 scalar type (stack-of-tasks/eigenpy#426)
    - Fix namespace use in unittest/std_pair.cpp (stack-of-tasks/eigenpy#429)
    - Fix case of zero-size sparse matrices (stack-of-tasks/eigenpy#437)

Packaging changes:
- remove patch-aa, fixed upstream
nim65s added a commit to nim65s/robotpkg that referenced this pull request Mar 29, 2024
Upstream changelog:

    ## [3.4.0] - 2024-02-26

    ### Added
    - Support for `Eigen::SparseMatrix` types (stack-of-tasks/eigenpy#426)
    - Support for `boost::variant` types with `VariantConverter` (stack-of-tasks/eigenpy#430)
    - Support for `std::variant` types with `VariantConverter` (stack-of-tasks/eigenpy#431)
    - Support for `std::unique_ptr` as a return types with `StdUniquePtrCallPolicies` and `boost::python::default_call_policies` (stack-of-tasks/eigenpy#433)
    - Support for `std::unique_ptr` as an internal reference with `ReturnInternalStdUniquePtr` (stack-of-tasks/eigenpy#433)
    - Support for `Eigen::Simplicial{LLT,LDLT}` and `Eigen::Cholmod{Simplicial,Supernodal}{LLT,LDLT}` Cholesky de compositions (stack-of-tasks/eigenpy#438)
    - Switch to ruff for lints, format, and import sort (stack-of-tasks/eigenpy#441)

    ### Fixed
    - Fix the issue of missing exposition of Eigen types with __int64 scalar type (stack-of-tasks/eigenpy#426)
    - Fix namespace use in unittest/std_pair.cpp (stack-of-tasks/eigenpy#429)
    - Fix case of zero-size sparse matrices (stack-of-tasks/eigenpy#437)

Packaging changes:
- remove patch-aa, fixed upstream
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants