Commit 9846e31a authored by Martin Reinecke's avatar Martin Reinecke
Browse files

big bunch of reorganization

parent 43d0315c
Pipeline #76101 failed with stages
in 3 minutes and 41 seconds
......@@ -5,11 +5,11 @@
#include <pybind11/pybind11.h>
#include <pybind11/numpy.h>
#include "interpol_ng.h"
#include "totalconvolve.h"
namespace mr {
namespace detail_pyinterpol_ng {
namespace detail_pymodule_totalconvolve {
using namespace std;
using namespace mr;
......@@ -94,7 +94,7 @@ template<typename T> py::array pyrotate_alm(const py::array &alm_, int64_t lmax,
}
#endif
constexpr const char *pyinterpol_ng_DS = R"""(
constexpr const char *totalconvolve_DS = R"""(
Python interface for total convolution/interpolation library
All arrays containing spherical harmonic coefficients are assumed to have the
......@@ -234,12 +234,12 @@ Notes
- must be the last call to the object
)""";
void add_pyinterpol_ng(py::module &msup)
void add_totalconvolve(py::module &msup)
{
using namespace pybind11::literals;
auto m = msup.def_submodule("totalconvolve");
m.doc() = pyinterpol_ng_DS;
m.doc() = totalconvolve_DS;
using inter_d = PyInterpolator<double>;
py::class_<inter_d> (m, "PyInterpolator", py::module_local(), pyinterpolator_DS)
......@@ -272,6 +272,6 @@ void add_pyinterpol_ng(py::module &msup)
}
using detail_pyinterpol_ng::add_pyinterpol_ng;
using detail_pymodule_totalconvolve::add_totalconvolve;
}
......@@ -26,7 +26,7 @@
namespace mr {
namespace detail_nifty_gridder {
namespace detail_pymodule_wgridder {
using namespace std;
using namespace gridder;
......@@ -190,7 +190,7 @@ np.array((nrows, nchan,), dtype=complex of same precision as `dirty`)
the measurement set data.
)""";
void add_nifty_gridder(py::module &msup)
void add_wgridder(py::module &msup)
{
using namespace pybind11::literals;
auto m = msup.def_submodule("wgridder");
......@@ -205,6 +205,6 @@ void add_nifty_gridder(py::module &msup)
}
using detail_nifty_gridder::add_nifty_gridder;
using detail_pymodule_wgridder::add_wgridder;
}
......@@ -22,7 +22,7 @@ def _get_files_by_suffix(directory, suffix):
return list(itertools.chain.from_iterable(iterable_sources))
include_dirs = ['./src/',
include_dirs = ['.', './src/',
_deferred_pybind11_include(True),
_deferred_pybind11_include()]
extra_compile_args = ['--std=c++17', '-march=native', '-ffast-math', '-O3']
......@@ -47,7 +47,7 @@ def get_extension_modules():
depfiles = _get_files_by_suffix('.', 'h') + _get_files_by_suffix('.', 'cc') + ['setup.py']
return [Extension(pkgname,
language='c++',
sources=['ducc.cc'],
sources=['python/ducc.cc'],
depends=depfiles,
include_dirs=include_dirs,
define_macros=define_macros,
......
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