diff options
| author | Marc Glisse <marc.glisse@inria.fr> | 2020-05-26 19:22:38 +0200 |
|---|---|---|
| committer | Marc Glisse <marc.glisse@inria.fr> | 2020-05-26 19:22:38 +0200 |
| commit | 995d7af6c1686c0ded9a1c48b58ab90f3ac69a1b (patch) | |
| tree | 3112ab67908069b17013d604c9d562f3be24544e /src/python/CMakeLists.txt | |
| parent | 16e8f92f0635da668f9f4602f4b7bb4086045a9d (diff) | |
| parent | 80dc3b26a91280f9da8b9630d983499846d42ea6 (diff) | |
Merge remote-tracking branch 'origin/master' into tomato2
Diffstat (limited to 'src/python/CMakeLists.txt')
| -rw-r--r-- | src/python/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 7186dc2b..a8872d73 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -58,6 +58,7 @@ if(PYTHONINTERP_FOUND) set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'representations', ") set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'wasserstein', ") set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'point_cloud', ") + set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'weighted_rips_complex', ") add_gudhi_debug_info("Python version ${PYTHON_VERSION_STRING}") add_gudhi_debug_info("Cython version ${CYTHON_VERSION}") @@ -235,6 +236,7 @@ if(PYTHONINTERP_FOUND) file(COPY "gudhi/wasserstein" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") file(COPY "gudhi/point_cloud" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") file(COPY "gudhi/clustering" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi" FILES_MATCHING PATTERN "*.py") + file(COPY "gudhi/weighted_rips_complex.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") add_custom_command( OUTPUT gudhi.so @@ -496,6 +498,11 @@ if(PYTHONINTERP_FOUND) add_gudhi_py_test(test_tomato) endif() + # Weighted Rips + if(SCIPY_FOUND) + add_gudhi_py_test(test_weighted_rips) + endif() + # Set missing or not modules set(GUDHI_MODULES ${GUDHI_MODULES} "python" CACHE INTERNAL "GUDHI_MODULES") else(CYTHON_FOUND) |