Commit 3c7668f7 authored by Martin Reinecke's avatar Martin Reinecke

simplifications

parent f3ba8494
Pipeline #86030 passed with stages
in 30 minutes and 53 seconds
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#include "python/healpix.cc" #include "python/healpix.cc"
#include "python/misc.cc" #include "python/misc.cc"
#include "python/pointingprovider.cc" #include "python/pointingprovider.cc"
#ifdef DUCC0_USE_MPI
#include "python/mpi.cc" #include "python/mpi.cc"
#endif
using namespace ducc0; using namespace ducc0;
...@@ -37,5 +39,7 @@ PYBIND11_MODULE(PKGNAME, m) ...@@ -37,5 +39,7 @@ PYBIND11_MODULE(PKGNAME, m)
add_healpix(m); add_healpix(m);
add_misc(m); add_misc(m);
add_pointingprovider(m); add_pointingprovider(m);
#ifdef DUCC0_USE_MPI
add_mpi(m); add_mpi(m);
#endif
} }
...@@ -9,10 +9,7 @@ import pybind11 ...@@ -9,10 +9,7 @@ import pybind11
pkgname = 'ducc0' pkgname = 'ducc0'
version = '0.6.0' version = '0.6.0'
USE_MPI = False
mpi_compile_args = os.popen("mpiCC --showme:compile").read().strip().split(' ')
mpi_compile_args.append("-DDUCC0_USE_MPI")
mpi_link_args = os.popen("mpiCC --showme:link").read().strip().split(' ')
def _get_files_by_suffix(directory, suffix): def _get_files_by_suffix(directory, suffix):
path = directory path = directory
...@@ -58,8 +55,12 @@ else: ...@@ -58,8 +55,12 @@ else:
'-s'] '-s']
# if you want debugging info, remove the "-s" from python_module_link_args # if you want debugging info, remove the "-s" from python_module_link_args
extra_compile_args+=mpi_compile_args if USE_MPI:
python_module_link_args+=mpi_link_args extra_compile_args += (
os.popen("mpiCC --showme:compile").read().strip().split(' ') +
["-DDUCC0_USE_MPI"])
python_module_link_args += (
os.popen("mpiCC --showme:link").read().strip().split(' '))
depfiles = (_get_files_by_suffix('.', 'h') + depfiles = (_get_files_by_suffix('.', 'h') +
_get_files_by_suffix('.', 'cc') + _get_files_by_suffix('.', 'cc') +
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment