From 94925401793cf319c1dddd991faac41ed245d180 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 17:39:10 +0200 Subject: [PATCH 01/12] cmake: add PYTHON_BUILD --- python/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index aeb24ae28..694e5da5c 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -45,6 +45,7 @@ SET(PYTHON_FILES ) FOREACH(python ${PYTHON_FILES}) + PYTHON_BUILD(${PROJECT_NAME} ${python}) INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/eigenpy/${python}" DESTINATION ${${PYWRAP}_INSTALL_DIR}) From 7a94a348d9bbc4038c553778b90d9af07935d976 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 19:04:57 +0200 Subject: [PATCH 02/12] cmake: sync submodule --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 4b30eba00..11fe06f81 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 4b30eba00b9e197583f3239e5a6a454e8655ea03 +Subproject commit 11fe06f8159e6abcf251214fd22b37d6b6dfa695 From 4bcfb359e83ce330bfddc6c1097b518febdd7c9a Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 19:05:36 +0200 Subject: [PATCH 03/12] python: add generation of Python stubs --- CMakeLists.txt | 11 ++++++----- python/CMakeLists.txt | 21 +++++++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bab48e6e9..177e152e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ SET(CMAKE_VERBOSE_MAKEFILE True) # ---------------------------------------------------- OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" OFF) OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" OFF) +OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" ON) IF(DEFINED BUILD_UNIT_TESTS) MESSAGE(AUTHOR_WARNING "BUILD_UNIT_TESTS is deprecated. Use BUILD_TESTING instead.\ @@ -150,7 +151,7 @@ SET(${PROJECT_NAME}_SOLVERS_SOURCES SET(${PROJECT_NAME}_DECOMPOSITIONS_SOURCES src/decompositions/decompositions.cpp ) - + SET(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOLVERS_SOURCES} ${${PROJECT_NAME}_DECOMPOSITIONS_SOURCES} @@ -175,11 +176,11 @@ SET(${PROJECT_NAME}_SOURCES ) ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS}) -TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} - SYSTEM PUBLIC - ${Boost_INCLUDE_DIRS} +TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} + SYSTEM PUBLIC + ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} $ $) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 694e5da5c..5569e99f9 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -3,30 +3,32 @@ # # --- LIBRARY --- # -SET(PYWRAP ${PROJECT_NAME}_pywrap) +SET(PYWRAP ${PROJECT_NAME}_pywrap) SET(PYWRAP ${PYWRAP} PARENT_SCOPE) MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}") +include(${PROJECT_SOURCE_DIR}/cmake/stubs.cmake) ADD_CUSTOM_TARGET(python) SET_TARGET_PROPERTIES(python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True) ADD_LIBRARY(${PYWRAP} SHARED main.cpp) ADD_DEPENDENCIES(python ${PYWRAP}) -TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME}) +TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME}) # BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS spews conversion warnings from int to long unsigned int. # Unfortunately, using literals does not work in a macro. As such, this turns them off for the entire wrapper: IF(NOT WIN32) TARGET_COMPILE_OPTIONS(${PYWRAP} PRIVATE "-Wno-conversion") ENDIF() IF(IS_ABSOLUTE ${PYTHON_SITELIB}) - SET(${PYWRAP}_INSTALL_DIR ${PYTHON_SITELIB}/${PROJECT_NAME}) + SET(ABSOLUTE_PYTHON_SITELIB ${PYTHON_SITELIB}) ELSE() - SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME}) + SET(ABSOLUTE_PYTHON_SITELIB ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}) ENDIF() +SET(${PYWRAP}_INSTALL_DIR ${ABSOLUTE_PYTHON_SITELIB}/${PROJECT_NAME}) SET_TARGET_PROPERTIES(${PYWRAP} - PROPERTIES + PROPERTIES PREFIX "" SUFFIX ${PYTHON_EXT_SUFFIX} OUTPUT_NAME "${PROJECT_NAME}" @@ -39,7 +41,14 @@ ENDIF() INSTALL(TARGETS ${PYWRAP} DESTINATION ${${PYWRAP}_INSTALL_DIR}) -# --- INSTALL SCRIPTS +# --- GENERATE STUBS +IF(GENERATE_PYTHON_STUBS) + LOAD_STUBGEN() + + GENERATE_STUBS(${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_NAME} ${ABSOLUTE_PYTHON_SITELIB}) +ENDIF(GENERATE_PYTHON_STUBS) + +# --- INSTALL SCRIPTS SET(PYTHON_FILES __init__.py ) From be5e180026b7c7defac89be0de2342fbf4dd3da1 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 19:25:30 +0200 Subject: [PATCH 04/12] cmake: GENERATE_PYTHON_STUBS OFF by default --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 177e152e8..609c3429b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ SET(CMAKE_VERBOSE_MAKEFILE True) # ---------------------------------------------------- OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" OFF) OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" OFF) -OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" ON) +CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF "NOT WIN32" OFF) IF(DEFINED BUILD_UNIT_TESTS) MESSAGE(AUTHOR_WARNING "BUILD_UNIT_TESTS is deprecated. Use BUILD_TESTING instead.\ From e2b70f004a484da41e1fa4d28ff069112caf5043 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 19:26:29 +0200 Subject: [PATCH 05/12] ci: set GENERATE_PYTHON_STUBS on Linux/OS X --- .github/workflows/macos-linux-conda.yml | 6 +++--- CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index e71d3a22b..b551e032e 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -31,17 +31,17 @@ jobs: run: | conda activate eigenpy conda install cmake -c main - + - name: Build EigenPy shell: bash -l {0} run: | conda activate eigenpy echo $CONDA_PREFIX - + mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$(which python3) + cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$(which python3) -DGENERATE_PYTHON_STUBS=ON make make build_tests export CTEST_OUTPUT_ON_FAILURE=1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 609c3429b..7be9675b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ SET(CMAKE_VERBOSE_MAKEFILE True) # ---------------------------------------------------- OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" OFF) OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" OFF) -CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF "NOT WIN32" OFF) IF(DEFINED BUILD_UNIT_TESTS) MESSAGE(AUTHOR_WARNING "BUILD_UNIT_TESTS is deprecated. Use BUILD_TESTING instead.\ @@ -44,6 +43,9 @@ INCLUDE(cmake/boost.cmake) INCLUDE(cmake/python.cmake) INCLUDE(cmake/ide.cmake) INCLUDE(cmake/apple.cmake) +INCLUDE(CMakeDependentOption) + +CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF "NOT WIN32" OFF) STRING(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) From d01ee847818a9c6af094ea9674d5b6e5d35c3d98 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 19:39:24 +0200 Subject: [PATCH 06/12] ci: use ccache --- .github/workflows/macos-linux-conda.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index b551e032e..f0bcbf19d 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -4,8 +4,10 @@ on: [push,pull_request] jobs: eigenpy-conda: - name: CI - EigenPy on ${{ matrix.os }} via Conda + name: CI on ${{ matrix.os }} via Conda runs-on: ${{ matrix.os }} + env: + CCACHE_DIR: /github/home/.ccache # Enable ccache strategy: fail-fast: false @@ -14,10 +16,8 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: Checkout submodules - run: | - git submodule update --init + with: + submodules: recursive - uses: conda-incubator/setup-miniconda@v2 with: @@ -26,6 +26,11 @@ jobs: environment-file: .github/workflows/conda/environment.yml python-version: 3.8 + - uses: actions/cache@v2 + with: + path: ${{ env.CCACHE_DIR }} + key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} + - name: Install cmake and update conda shell: bash -l {0} run: | From 95000fea7bc7ef65d5ccb03d9209dee1c50744c5 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sat, 4 Sep 2021 19:48:28 +0200 Subject: [PATCH 07/12] ci: fix cache key --- .github/workflows/macos-linux-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index f0bcbf19d..da5370481 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/cache@v2 with: path: ${{ env.CCACHE_DIR }} - key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} + key: ccache-${{ matrix.os }} - name: Install cmake and update conda shell: bash -l {0} From d82f15c20f983905e05bf7fd0dcfbc1cb1d26670 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 5 Sep 2021 10:00:30 +0200 Subject: [PATCH 08/12] cmake: try to enable Stubs on Windows --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7be9675b8..7a41d7fad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,9 +43,8 @@ INCLUDE(cmake/boost.cmake) INCLUDE(cmake/python.cmake) INCLUDE(cmake/ide.cmake) INCLUDE(cmake/apple.cmake) -INCLUDE(CMakeDependentOption) -CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF "NOT WIN32" OFF) +OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF) STRING(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) @@ -63,6 +62,16 @@ FIND_NUMPY() IF(WIN32) LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS}) + # Set default Windows build paths + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY + ${PROJECT_BINARY_DIR}/Bin + CACHE PATH "Single directory for all libraries") + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY + ${PROJECT_BINARY_DIR}/Bin + CACHE PATH "Single directory for all executables") + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY + ${PROJECT_BINARY_DIR}/Bin + CACHE PATH "Sing$le directory for all archives") ENDIF(WIN32) # ---------------------------------------------------- From fd075b7fa1f918fccfd74a7570ddbab38ff43f38 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 5 Sep 2021 10:00:44 +0200 Subject: [PATCH 09/12] ci: set GENERATE_PYTHON_STUBS on Windows --- .github/workflows/windows-conda.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 2c9d21472..6b5d6aa18 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -39,6 +39,7 @@ jobs: -G "NMake Makefiles" ^ -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^ -DCMAKE_BUILD_TYPE=Release ^ + -DGENERATE_PYTHON_STUBS=ON ^ -DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^ -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^ .. From 38869d76b7ccc5af85206540127223a0fa1dbf83 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 5 Sep 2021 10:21:56 +0200 Subject: [PATCH 10/12] python: remove useless license header --- python/eigenpy/__init__.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/python/eigenpy/__init__.py b/python/eigenpy/__init__.py index 30a8524c3..e71d43808 100644 --- a/python/eigenpy/__init__.py +++ b/python/eigenpy/__init__.py @@ -1,18 +1,6 @@ # # Copyright (c) 2017-2019 CNRS INRIA # -# This file is part of eigenpy -# eigenpy is free software: you can redistribute it -# and/or modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation, either version -# 3 of the License, or (at your option) any later version. -# Pinocchio is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Lesser Public License for more details. You should have -# received a copy of the GNU Lesser General Public License along with -# eigenpy If not, see -# . from .eigenpy import * from .eigenpy import __version__, __raw_version__ From bd7beda4c01c0a29c9058f3e411d791fbfccc831 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 5 Sep 2021 10:22:14 +0200 Subject: [PATCH 11/12] cmake: change python lib name (to avoid conflicts) --- python/CMakeLists.txt | 1 - python/eigenpy/__init__.py | 6 +++--- python/main.cpp | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 5569e99f9..a8a37f324 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -31,7 +31,6 @@ SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES PREFIX "" SUFFIX ${PYTHON_EXT_SUFFIX} - OUTPUT_NAME "${PROJECT_NAME}" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}" ) diff --git a/python/eigenpy/__init__.py b/python/eigenpy/__init__.py index e71d43808..328c005e8 100644 --- a/python/eigenpy/__init__.py +++ b/python/eigenpy/__init__.py @@ -1,6 +1,6 @@ # -# Copyright (c) 2017-2019 CNRS INRIA +# Copyright (c) 2017-2021 CNRS INRIA # -from .eigenpy import * -from .eigenpy import __version__, __raw_version__ +from .eigenpy_pywrap import * +from .eigenpy_pywrap import __version__, __raw_version__ diff --git a/python/main.cpp b/python/main.cpp index 075b819b9..85abcc056 100644 --- a/python/main.cpp +++ b/python/main.cpp @@ -1,6 +1,6 @@ /* * Copyright 2014-2019, CNRS - * Copyright 2018-2020, INRIA + * Copyright 2018-2021, INRIA */ #include "eigenpy/eigenpy.hpp" @@ -19,42 +19,42 @@ using namespace eigenpy; -BOOST_PYTHON_MODULE(eigenpy) +BOOST_PYTHON_MODULE(eigenpy_pywrap) { namespace bp = boost::python; enableEigenPy(); - + bp::scope().attr("__version__") = eigenpy::printVersion(); bp::scope().attr("__raw_version__") = bp::str(EIGENPY_VERSION); bp::def("checkVersionAtLeast",&eigenpy::checkVersionAtLeast, bp::args("major_version","minor_version","patch_version"), "Checks if the current version of EigenPy is at least the version provided by the input arguments."); - + exposeAngleAxis(); exposeQuaternion(); exposeGeometryConversion(); - + exposeComputationInfo(); - + { bp::scope solvers = boost::python::class_("solvers"); exposeSolvers(); exposePreconditioners(); - + register_symbolic_link_to_registered_type(); } - + { using namespace Eigen; - + bp::def("is_approx",(bool (*)(const Eigen::MatrixBase &, const Eigen::MatrixBase &, const double &))&is_approx, bp::args("A","B","prec"), "Returns True if A is approximately equal to B, within the precision determined by prec."); - + bp::def("is_approx",(bool (*)(const Eigen::MatrixBase &, const Eigen::MatrixBase &))&is_approx, bp::args("A","B"), "Returns True if A is approximately equal to B."); } - + exposeDecompositions(); } From a5e72306c4c42be67e9493a01fa752846927ae1d Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 5 Sep 2021 10:51:47 +0200 Subject: [PATCH 12/12] cmake: fix PYTHONPATH --- unittest/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index d8730c43c..a41d29b96 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -42,26 +42,26 @@ ADD_PYTHON_UNIT_TEST("py-return-by-ref" "unittest/python/test_return_by_ref.py" ADD_PYTHON_UNIT_TEST("py-eigen-ref" "unittest/python/test_eigen_ref.py" "unittest") ADD_PYTHON_UNIT_TEST("py-user-type" "unittest/python/test_user_type.py" "unittest") -ADD_PYTHON_UNIT_TEST("py-switch" "unittest/python/test_switch.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-switch" "unittest/python/test_switch.py" "python;unittest") SET_TESTS_PROPERTIES("py-switch" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-dimensions" "unittest/python/test_dimensions.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-dimensions" "unittest/python/test_dimensions.py" "python;unittest") SET_TESTS_PROPERTIES("py-dimensions" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-version" "unittest/python/test_version.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-version" "unittest/python/test_version.py" "python;unittest") SET_TESTS_PROPERTIES("py-version" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-eigen-solver" "unittest/python/test_eigen_solver.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-eigen-solver" "unittest/python/test_eigen_solver.py" "python;unittest") SET_TESTS_PROPERTIES("py-eigen-solver" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-self-adjoint-eigen-solver" "unittest/python/test_self_adjoint_eigen_solver.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-self-adjoint-eigen-solver" "unittest/python/test_self_adjoint_eigen_solver.py" "python;unittest") SET_TESTS_PROPERTIES("py-self-adjoint-eigen-solver" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-LLT" "unittest/python/test_LLT.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-LLT" "unittest/python/test_LLT.py" "python;unittest") SET_TESTS_PROPERTIES("py-LLT" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-LDLT" "unittest/python/test_LDLT.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-LDLT" "unittest/python/test_LDLT.py" "python;unittest") SET_TESTS_PROPERTIES("py-LDLT" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-MINRES" "unittest/python/test_MINRES.py" "python/eigenpy;unittest") +ADD_PYTHON_UNIT_TEST("py-MINRES" "unittest/python/test_MINRES.py" "python;unittest") SET_TESTS_PROPERTIES("py-MINRES" PROPERTIES DEPENDS ${PYWRAP})