Commit f149f19c authored by Martin Reinecke's avatar Martin Reinecke
Browse files

mr_util -> ducc0

parent 57561d08
...@@ -2,53 +2,53 @@ prune . ...@@ -2,53 +2,53 @@ prune .
include LICENSE include LICENSE
include src/mr_util/infra/aligned_array.h include src/ducc0/infra/aligned_array.h
include src/mr_util/infra/error_handling.h include src/ducc0/infra/error_handling.h
include src/mr_util/infra/mav.h include src/ducc0/infra/mav.h
include src/mr_util/infra/simd.h include src/ducc0/infra/simd.h
include src/mr_util/infra/string_utils.cc include src/ducc0/infra/string_utils.cc
include src/mr_util/infra/string_utils.h include src/ducc0/infra/string_utils.h
include src/mr_util/infra/system.cc include src/ducc0/infra/system.cc
include src/mr_util/infra/system.h include src/ducc0/infra/system.h
include src/mr_util/infra/threading.cc include src/ducc0/infra/threading.cc
include src/mr_util/infra/threading.h include src/ducc0/infra/threading.h
include src/mr_util/infra/timers.h include src/ducc0/infra/timers.h
include src/mr_util/infra/useful_macros.h include src/ducc0/infra/useful_macros.h
include src/mr_util/bindings/pybind_utils.h include src/ducc0/bindings/pybind_utils.h
include src/mr_util/math/cmplx.h include src/ducc0/math/cmplx.h
include src/mr_util/math/constants.h include src/ducc0/math/constants.h
include src/mr_util/math/es_kernel.h include src/ducc0/math/es_kernel.h
include src/mr_util/math/fft1d.h include src/ducc0/math/fft1d.h
include src/mr_util/math/fft.h include src/ducc0/math/fft.h
include src/mr_util/math/geom_utils.cc include src/ducc0/math/geom_utils.cc
include src/mr_util/math/geom_utils.h include src/ducc0/math/geom_utils.h
include src/mr_util/math/gl_integrator.h include src/ducc0/math/gl_integrator.h
include src/mr_util/math/math_utils.h include src/ducc0/math/math_utils.h
include src/mr_util/math/pointing.cc include src/ducc0/math/pointing.cc
include src/mr_util/math/pointing.h include src/ducc0/math/pointing.h
include src/mr_util/math/rangeset.h include src/ducc0/math/rangeset.h
include src/mr_util/math/space_filling.cc include src/ducc0/math/space_filling.cc
include src/mr_util/math/space_filling.h include src/ducc0/math/space_filling.h
include src/mr_util/math/unity_roots.h include src/ducc0/math/unity_roots.h
include src/mr_util/math/vec3.h include src/ducc0/math/vec3.h
include src/mr_util/sharp/sharp_almhelpers.cc include src/ducc0/sharp/sharp_almhelpers.cc
include src/mr_util/sharp/sharp_almhelpers.h include src/ducc0/sharp/sharp_almhelpers.h
include src/mr_util/sharp/sharp.cc include src/ducc0/sharp/sharp.cc
include src/mr_util/sharp/sharp_core.cc include src/ducc0/sharp/sharp_core.cc
include src/mr_util/sharp/sharp_core_inc.cc include src/ducc0/sharp/sharp_core_inc.cc
include src/mr_util/sharp/sharp_geomhelpers.cc include src/ducc0/sharp/sharp_geomhelpers.cc
include src/mr_util/sharp/sharp_geomhelpers.h include src/ducc0/sharp/sharp_geomhelpers.h
include src/mr_util/sharp/sharp.h include src/ducc0/sharp/sharp.h
include src/mr_util/sharp/sharp_internal.h include src/ducc0/sharp/sharp_internal.h
include src/mr_util/sharp/sharp_ylmgen.cc include src/ducc0/sharp/sharp_ylmgen.cc
include src/mr_util/healpix/healpix_base.cc include src/ducc0/healpix/healpix_base.cc
include src/mr_util/healpix/healpix_base.h include src/ducc0/healpix/healpix_base.h
include src/mr_util/healpix/healpix_tables.cc include src/ducc0/healpix/healpix_tables.cc
include src/mr_util/healpix/healpix_tables.h include src/ducc0/healpix/healpix_tables.h
include python/fft.cc include python/fft.cc
include python/sht.cc include python/sht.cc
......
...@@ -3,43 +3,43 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -3,43 +3,43 @@ ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libmrutil.la lib_LTLIBRARIES = libmrutil.la
libmrutil_la_SOURCES = \ libmrutil_la_SOURCES = \
mr_util/sharp/sharp.cc \ ducc0/sharp/sharp.cc \
mr_util/sharp/sharp_almhelpers.cc \ ducc0/sharp/sharp_almhelpers.cc \
mr_util/sharp/sharp_core.cc \ ducc0/sharp/sharp_core.cc \
mr_util/sharp/sharp_geomhelpers.cc \ ducc0/sharp/sharp_geomhelpers.cc \
mr_util/sharp/sharp_ylmgen.cc \ ducc0/sharp/sharp_ylmgen.cc \
mr_util/sharp/sharp_internal.h \ ducc0/sharp/sharp_internal.h \
mr_util/math/math_utils.h \ ducc0/math/math_utils.h \
mr_util/math/cmplx.h \ ducc0/math/cmplx.h \
mr_util/infra/aligned_array.h \ ducc0/infra/aligned_array.h \
mr_util/infra/simd.h \ ducc0/infra/simd.h \
mr_util/math/pointing.cc \ ducc0/math/pointing.cc \
mr_util/math/pointing.h \ ducc0/math/pointing.h \
mr_util/math/vec3.h \ ducc0/math/vec3.h \
mr_util/math/constants.h \ ducc0/math/constants.h \
mr_util/infra/error_handling.h \ ducc0/infra/error_handling.h \
mr_util/math/space_filling.cc \ ducc0/math/space_filling.cc \
mr_util/math/space_filling.h \ ducc0/math/space_filling.h \
mr_util/math/fft1d.h \ ducc0/math/fft1d.h \
mr_util/math/fft.h \ ducc0/math/fft.h \
mr_util/math/gl_integrator.h \ ducc0/math/gl_integrator.h \
mr_util/infra/mav.h \ ducc0/infra/mav.h \
mr_util/infra/string_utils.cc \ ducc0/infra/string_utils.cc \
mr_util/infra/string_utils.h \ ducc0/infra/string_utils.h \
mr_util/infra/system.cc \ ducc0/infra/system.cc \
mr_util/infra/system.h \ ducc0/infra/system.h \
mr_util/infra/threading.cc \ ducc0/infra/threading.cc \
mr_util/infra/threading.h \ ducc0/infra/threading.h \
mr_util/infra/timers.h \ ducc0/infra/timers.h \
mr_util/math/unity_roots.h \ ducc0/math/unity_roots.h \
mr_util/infra/useful_macros.h \ ducc0/infra/useful_macros.h \
mr_util/math/rangeset.h \ ducc0/math/rangeset.h \
mr_util/geom_utils.h \ ducc0/geom_utils.h \
mr_util/math/geom_utils.cc \ ducc0/math/geom_utils.cc \
mr_util/healpix/healpix_tables.h \ ducc0/healpix/healpix_tables.h \
mr_util/healpix/healpix_tables.cc \ ducc0/healpix/healpix_tables.cc \
mr_util/healpix/healpix_base.h \ ducc0/healpix/healpix_base.h \
mr_util/healpix/healpix_base.cc ducc0/healpix/healpix_base.cc
# format is "current:revision:age" # format is "current:revision:age"
# any change: increase revision # any change: increase revision
...@@ -53,11 +53,11 @@ AM_CXXFLAGS = @AM_CXXFLAGS@ ...@@ -53,11 +53,11 @@ AM_CXXFLAGS = @AM_CXXFLAGS@
if HAVE_MULTIARCH if HAVE_MULTIARCH
libavx_la_SOURCES = mr_util/sharp/sharp_core_inc.cc libavx_la_SOURCES = ducc0/sharp/sharp_core_inc.cc
libavx2_la_SOURCES = mr_util/sharp/sharp_core_inc.cc libavx2_la_SOURCES = ducc0/sharp/sharp_core_inc.cc
libfma_la_SOURCES = mr_util/sharp/sharp_core_inc.cc libfma_la_SOURCES = ducc0/sharp/sharp_core_inc.cc
libfma4_la_SOURCES = mr_util/sharp/sharp_core_inc.cc libfma4_la_SOURCES = ducc0/sharp/sharp_core_inc.cc
libavx512f_la_SOURCES = mr_util/sharp/sharp_core_inc.cc libavx512f_la_SOURCES = ducc0/sharp/sharp_core_inc.cc
noinst_LTLIBRARIES = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la noinst_LTLIBRARIES = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la
...@@ -72,9 +72,9 @@ libmrutil_la_LIBADD = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la ...@@ -72,9 +72,9 @@ libmrutil_la_LIBADD = libavx.la libavx2.la libfma.la libfma4.la libavx512f.la
endif endif
nobase_include_HEADERS = \ nobase_include_HEADERS = \
mr_util/sharp/sharp.h \ ducc0/sharp/sharp.h \
mr_util/sharp/sharp_geomhelpers.h \ ducc0/sharp/sharp_geomhelpers.h \
mr_util/sharp/sharp_almhelpers.h ducc0/sharp/sharp_almhelpers.h
EXTRA_DIST = test/test_libsharp.sh test/test_space_filling.sh EXTRA_DIST = test/test_libsharp.sh test/test_space_filling.sh
......
...@@ -51,17 +51,17 @@ Candidates for testing the validity of the Healpix routines: ...@@ -51,17 +51,17 @@ Candidates for testing the validity of the Healpix routines:
#include <iostream> #include <iostream>
#include "Healpix_cxx/healpix_base.h" #include "Healpix_cxx/healpix_base.h"
#include "Healpix_cxx/healpix_map.h" #include "Healpix_cxx/healpix_map.h"
#include "mr_util/constants.h" #include "ducc0/constants.h"
//#include "alm.h" //#include "alm.h"
//#include "alm_healpix_tools.h" //#include "alm_healpix_tools.h"
//#include "alm_powspec_tools.h" //#include "alm_powspec_tools.h"
#include "mr_util/geom_utils.h" #include "ducc0/geom_utils.h"
#include "mr_util/timers.h" #include "ducc0/timers.h"
//#include "announce.h" //#include "announce.h"
#include "mr_util/compress_utils.h" #include "ducc0/compress_utils.h"
#include "Healpix_cxx/moc.h" #include "Healpix_cxx/moc.h"
//#include "moc_fitsio.h" //#include "moc_fitsio.h"
#include "mr_util/crangeset.h" #include "ducc0/crangeset.h"
//#include "weight_utils.h" //#include "weight_utils.h"
//#include "powspec.h" //#include "powspec.h"
......
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
#include <iostream> #include <iostream>
#include <complex> #include <complex>
#include "mr_util/sharp/sharp.h" #include "ducc0/sharp/sharp.h"
#include "mr_util/sharp/sharp_geomhelpers.h" #include "ducc0/sharp/sharp_geomhelpers.h"
#include "mr_util/sharp/sharp_almhelpers.h" #include "ducc0/sharp/sharp_almhelpers.h"
#include "mr_util/infra/system.h" #include "ducc0/infra/system.h"
#include "mr_util/infra/error_handling.h" #include "ducc0/infra/error_handling.h"
#include "mr_util/infra/threading.h" #include "ducc0/infra/threading.h"
#include "mr_util/math/math_utils.h" #include "ducc0/math/math_utils.h"
#include "mr_util/infra/string_utils.h" #include "ducc0/infra/string_utils.h"
#include "mr_util/math/gl_integrator.h" #include "ducc0/math/gl_integrator.h"
#include "mr_util/math/constants.h" #include "ducc0/math/constants.h"
using namespace std; using namespace std;
using namespace mr; using namespace mr;
......
#include <functional> #include <functional>
#include "mr_util/math/space_filling.h" #include "ducc0/math/space_filling.h"
#include "mr_util/infra/error_handling.h" #include "ducc0/infra/error_handling.h"
using namespace std; using namespace std;
using namespace mr; using namespace mr;
...@@ -167,7 +167,7 @@ int64_t t34() ...@@ -167,7 +167,7 @@ int64_t t34()
} // unnamed namespace } // unnamed namespace
#include <cstdio> #include <cstdio>
#include "mr_util/infra/timers.h" #include "ducc0/infra/timers.h"
using namespace std; using namespace std;
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#if 1 #if 1
#include <complex> #include <complex>
#include <cmath> #include <cmath>
#include "mr_util/infra/threading.h" #include "ducc0/infra/threading.h"
#endif #endif
#include "mr_util/infra/mav.h" #include "ducc0/infra/mav.h"
#include "mr_util/infra/error_handling.h" #include "ducc0/infra/error_handling.h"
namespace mr { namespace mr {
......
#include "mr_util/infra/system.cc" #include "ducc0/infra/system.cc"
#include "mr_util/infra/string_utils.cc" #include "ducc0/infra/string_utils.cc"
#include "mr_util/infra/threading.cc" #include "ducc0/infra/threading.cc"
#include "mr_util/math/pointing.cc" #include "ducc0/math/pointing.cc"
#include "mr_util/math/geom_utils.cc" #include "ducc0/math/geom_utils.cc"
#include "mr_util/math/space_filling.cc" #include "ducc0/math/space_filling.cc"
#include "mr_util/sharp/sharp.cc" #include "ducc0/sharp/sharp.cc"
#include "mr_util/sharp/sharp_almhelpers.cc" #include "ducc0/sharp/sharp_almhelpers.cc"
#include "mr_util/sharp/sharp_core.cc" #include "ducc0/sharp/sharp_core.cc"
#include "mr_util/sharp/sharp_ylmgen.cc" #include "ducc0/sharp/sharp_ylmgen.cc"
#include "mr_util/sharp/sharp_geomhelpers.cc" #include "ducc0/sharp/sharp_geomhelpers.cc"
#include "mr_util/healpix/healpix_tables.cc" #include "ducc0/healpix/healpix_tables.cc"
#include "mr_util/healpix/healpix_base.cc" #include "ducc0/healpix/healpix_base.cc"
#include <pybind11/pybind11.h> #include <pybind11/pybind11.h>
#include "python/sht.cc" #include "python/sht.cc"
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <pybind11/numpy.h> #include <pybind11/numpy.h>
#include <pybind11/stl.h> #include <pybind11/stl.h>
#include "mr_util/math/fft.h" #include "ducc0/math/fft.h"
#include "mr_util/bindings/pybind_utils.h" #include "ducc0/bindings/pybind_utils.h"
namespace mr { namespace mr {
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
#include <vector> #include <vector>
#include <array> #include <array>
#include "mr_util/infra/error_handling.h" #include "ducc0/infra/error_handling.h"
#include "mr_util/math/fft.h" #include "ducc0/math/fft.h"
#include "mr_util/infra/threading.h" #include "ducc0/infra/threading.h"
#include "mr_util/infra/useful_macros.h" #include "ducc0/infra/useful_macros.h"
#include "mr_util/infra/mav.h" #include "ducc0/infra/mav.h"
#include "mr_util/math/es_kernel.h" #include "ducc0/math/es_kernel.h"
namespace mr { namespace mr {
......
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "mr_util/healpix/healpix_base.h" #include "ducc0/healpix/healpix_base.h"
#include "mr_util/math/constants.h" #include "ducc0/math/constants.h"
#include "mr_util/infra/string_utils.h" #include "ducc0/infra/string_utils.h"
#include "mr_util/math/geom_utils.h" #include "ducc0/math/geom_utils.h"
#include "mr_util/bindings/pybind_utils.h" #include "ducc0/bindings/pybind_utils.h"
namespace mr { namespace mr {
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
#include <pybind11/numpy.h> #include <pybind11/numpy.h>
#include <vector> #include <vector>
#include "mr_util/infra/mav.h" #include "ducc0/infra/mav.h"
#include "mr_util/infra/transpose.h" #include "ducc0/infra/transpose.h"
#include "mr_util/math/fft.h" #include "ducc0/math/fft.h"
#include "mr_util/math/constants.h" #include "ducc0/math/constants.h"
#include "mr_util/math/gl_integrator.h" #include "ducc0/math/gl_integrator.h"
#include "mr_util/bindings/pybind_utils.h" #include "ducc0/bindings/pybind_utils.h"
#include "python/alm.h" #include "python/alm.h"
namespace mr { namespace mr {
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
#include <vector> #include <vector>
#include <complex> #include <complex>
#include "mr_util/sharp/sharp.h" #include "ducc0/sharp/sharp.h"
#include "mr_util/sharp/sharp_geomhelpers.h" #include "ducc0/sharp/sharp_geomhelpers.h"
#include "mr_util/sharp/sharp_almhelpers.h" #include "ducc0/sharp/sharp_almhelpers.h"
#include "mr_util/infra/string_utils.h" #include "ducc0/infra/string_utils.h"
#include "mr_util/infra/error_handling.h" #include "ducc0/infra/error_handling.h"
#include "mr_util/math/constants.h" #include "ducc0/math/constants.h"
#include "mr_util/bindings/pybind_utils.h" #include "ducc0/bindings/pybind_utils.h"
namespace mr { namespace mr {
......
...@@ -12,16 +12,16 @@ ...@@ -12,16 +12,16 @@
#include <vector> #include <vector>
#include <complex> #include <complex>
#include <cmath> #include <cmath>
#include "mr_util/math/constants.h" #include "ducc0/math/constants.h"
#include "mr_util/math/gl_integrator.h" #include "ducc0/math/gl_integrator.h"
#include "mr_util/math/es_kernel.h" #include "ducc0/math/es_kernel.h"
#include "mr_util/infra/mav.h" #include "ducc0/infra/mav.h"
#include "mr_util/infra/simd.h" #include "ducc0/infra/simd.h"
#include "mr_util/sharp/sharp.h" #include "ducc0/sharp/sharp.h"
#include "mr_util/sharp/sharp_almhelpers.h" #include "ducc0/sharp/sharp_almhelpers.h"
#include "mr_util/sharp/sharp_geomhelpers.h" #include "ducc0/sharp/sharp_geomhelpers.h"
#include "python/alm.h" #include "python/alm.h"
#include "mr_util/math/fft.h" #include "ducc0/math/fft.h"
namespace mr { namespace mr {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <pybind11/pybind11.h> #include <pybind11/pybind11.h>
#include <pybind11/numpy.h> #include <pybind11/numpy.h>
#include "mr_util/bindings/pybind_utils.h" #include "ducc0/bindings/pybind_utils.h"
#include "python/gridder_cxx.h" #include "python/gridder_cxx.h"
namespace mr { namespace mr {
......
...@@ -106,7 +106,7 @@ WARN_LOGFILE = ...@@ -106,7 +106,7 @@ WARN_LOGFILE =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration options related to the input files # Configuration options related to the input files
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = ../mr_util INPUT = ../ducc0
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.h \ FILE_PATTERNS = *.h \
*.cc \ *.cc \
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <pybind11/pybind11.h> #include <pybind11/pybind11.h>
#include <pybind11/numpy.h> #include <pybind11/numpy.h>
#include "mr_util/infra/mav.h" #include "ducc0/infra/mav.h"
namespace mr { namespace mr {
......
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
* Author: Martin Reinecke * Author: Martin Reinecke
*/ */
#include "mr_util/healpix/healpix_base.h" #include "ducc0/healpix/healpix_base.h"
#include "mr_util/math/geom_utils.h" #include "ducc0/math/geom_utils.h"
#include "mr_util/math/constants.h" #include "ducc0/math/constants.h"
#include "mr_util/infra/mav.h" #include "ducc0/infra/mav.h"
#include "mr_util/math/space_filling.h" #include "ducc0/math/space_filling.h"
namespace mr { namespace mr {
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#define HEALPIX_BASE_H #define HEALPIX_BASE_H
#include <vector> #include <vector>
#include "mr_util/healpix/healpix_tables.h" #include "ducc0/healpix/healpix_tables.h"
#include "mr_util/math/pointing.h" #include "ducc0/math/pointing.h"
#include "mr_util/math/rangeset.h" #include "ducc0/math/rangeset.h"
namespace mr { namespace mr {
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
* Author: Martin Reinecke * Author: Martin Reinecke
*/ */
#include "mr_util/healpix/healpix_tables.h" #include "ducc0/healpix/healpix_tables.h"
#include "mr_util/infra/string_utils.h" #include "ducc0/infra/string_utils.h"
#include "mr_util/infra/error_handling.h" #include "ducc0/infra/error_handling.h"
namespace mr { namespace mr {
......
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