diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-03 14:11:41 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-03 14:11:41 +0100 |
| commit | a07430764c57c195c9260fc1b301ba0aeb77dcc7 (patch) | |
| tree | 5a946e39e7158d4e6e8e3aff04bed9efbde6444e /src/python/CMakeLists.txt | |
| parent | 05e28e39717c4ca5871b13a350c4b142ec9a173b (diff) | |
| parent | 5900b2d802a7387f7fd4a87b5251dcbe6931371c (diff) | |
Merge branch 'master' into weighted_alpha_complex_dD
Diffstat (limited to 'src/python/CMakeLists.txt')
| -rw-r--r-- | src/python/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 4f26481e..c09996fe 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -103,6 +103,9 @@ if(PYTHONINTERP_FOUND) if(EAGERPY_FOUND) add_gudhi_debug_info("EagerPy version ${EAGERPY_VERSION}") endif() + if(TENSORFLOW_FOUND) + add_gudhi_debug_info("TensorFlow version ${TENSORFLOW_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', ") @@ -496,11 +499,17 @@ if(PYTHONINTERP_FOUND) # Wasserstein if(OT_FOUND AND PYBIND11_FOUND) - if(TORCH_FOUND AND EAGERPY_FOUND) + # EagerPy dependency because of enable_autodiff=True + if(EAGERPY_FOUND) add_gudhi_py_test(test_wasserstein_distance) endif() add_gudhi_py_test(test_wasserstein_barycenter) endif() + if(OT_FOUND) + if(TORCH_FOUND AND TENSORFLOW_FOUND AND EAGERPY_FOUND) + add_gudhi_py_test(test_wasserstein_with_tensors) + endif() + endif() # Representations if(SKLEARN_FOUND AND MATPLOTLIB_FOUND) |