diff options
author | Marc Glisse <marc.glisse@inria.fr> | 2020-05-13 23:19:35 +0200 |
---|---|---|
committer | Marc Glisse <marc.glisse@inria.fr> | 2020-05-13 23:19:35 +0200 |
commit | 4220ee79bf32aed1c8ee3bb9b04dea3888b74d2d (patch) | |
tree | c62ac12c03693d3a8f3abf6e8f7b00c7be0e55ea /src/python/setup.py.in | |
parent | 8ba3ca48e03e379fca0a0b68a508d8357a367f52 (diff) | |
parent | 1efd71c502bacce375e1950e10a8112208acd0cf (diff) |
Merge remote-tracking branch 'origin/master' into tomato2
Diffstat (limited to 'src/python/setup.py.in')
-rw-r--r-- | src/python/setup.py.in | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/python/setup.py.in b/src/python/setup.py.in index 21d562f3..5e26079a 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -18,7 +18,8 @@ __author__ = "Vincent Rouvreau" __copyright__ = "Copyright (C) 2016 Inria" __license__ = "MIT" -modules = [@GUDHI_PYTHON_MODULES_TO_COMPILE@] +cython_modules = [@GUDHI_CYTHON_MODULES@] +pybind11_modules = [@GUDHI_PYBIND11_MODULES@] source_dir='@CMAKE_CURRENT_SOURCE_DIR@/gudhi/' extra_compile_args=[@GUDHI_PYTHON_EXTRA_COMPILE_ARGS@] @@ -30,7 +31,7 @@ runtime_library_dirs=[@GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS@] # Create ext_modules list from module list ext_modules = [] -for module in modules: +for module in cython_modules: ext_modules.append(Extension( 'gudhi.' + module, sources = [source_dir + module + '.pyx',], @@ -45,23 +46,21 @@ for module in modules: ext_modules = cythonize(ext_modules) -ext_modules.append(Extension( - 'gudhi.hera', - sources = [source_dir + 'hera.cc'], - language = 'c++', - include_dirs = include_dirs + - ['@HERA_WASSERSTEIN_INCLUDE_DIR@', - pybind11.get_include(False), pybind11.get_include(True)], - extra_compile_args=extra_compile_args + [@GUDHI_PYBIND11_EXTRA_COMPILE_ARGS@], - )) -ext_modules.append(Extension( - 'gudhi.clustering._tomato', - sources = [source_dir + 'clustering/_tomato.cc'], - language = 'c++', - include_dirs = include_dirs + - [pybind11.get_include(False), pybind11.get_include(True)], - extra_compile_args=extra_compile_args + [@GUDHI_PYBIND11_EXTRA_COMPILE_ARGS@], - )) +for module in pybind11_modules: + my_include_dirs = include_dirs + [pybind11.get_include(False), pybind11.get_include(True)] + if module == 'hera': + my_include_dirs = ['@HERA_WASSERSTEIN_INCLUDE_DIR@'] + my_include_dirs + ext_modules.append(Extension( + 'gudhi.' + module.replace('/', '.'), + sources = [source_dir + module + '.cc'], + language = 'c++', + include_dirs = my_include_dirs, + extra_compile_args=extra_compile_args + [@GUDHI_PYBIND11_EXTRA_COMPILE_ARGS@], + extra_link_args=extra_link_args, + libraries=libraries, + library_dirs=library_dirs, + runtime_library_dirs=runtime_library_dirs, + )) setup( name = 'gudhi', |