summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2020-04-14 17:00:27 +0200
committerMarc Glisse <marc.glisse@inria.fr>2020-04-14 17:00:27 +0200
commitb908205e85bbe29c8d18ad1f38e783a1327434d7 (patch)
tree33180b825c6b4b142bd40a1928792108157f803b
parentf0c5aab988ee966510503a30b0591105594ac67d (diff)
EagerPy in cmake
-rw-r--r--src/cmake/modules/GUDHI_third_party_libraries.cmake1
-rw-r--r--src/python/CMakeLists.txt5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index a931b3a1..0abe66b7 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -181,6 +181,7 @@ if( PYTHONINTERP_FOUND )
find_python_module("pybind11")
find_python_module("torch")
find_python_module("pykeops")
+ find_python_module("eagerpy")
find_python_module_no_version("hnswlib")
endif()
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index d7a6a4db..99e8b57c 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -88,6 +88,9 @@ if(PYTHONINTERP_FOUND)
if(PYKEOPS_FOUND)
add_gudhi_debug_info("PyKeOps version ${PYKEOPS_VERSION}")
endif()
+ if(EAGERPY_FOUND)
+ add_gudhi_debug_info("EagerPy version ${EAGERPY_VERSION}")
+ endif()
set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_RESULT_OF_USE_DECLTYPE', ")
set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_ALL_NO_LIB', ")
@@ -410,7 +413,7 @@ if(PYTHONINTERP_FOUND)
add_gudhi_py_test(test_time_delay)
# DTM
- if(SCIPY_FOUND AND SKLEARN_FOUND AND TORCH_FOUND AND HNSWLIB_FOUND AND PYKEOPS_FOUND)
+ if(SCIPY_FOUND AND SKLEARN_FOUND AND TORCH_FOUND AND HNSWLIB_FOUND AND PYKEOPS_FOUND AND EAGERPY_FOUND)
add_gudhi_py_test(test_knn)
add_gudhi_py_test(test_dtm)
endif()