Commit 1b73b887 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

stage 1, healpix still missing

parent f1c7d8d8
prune mr_util
include gridder_cxx.h
include mr_util/useful_macros.h
include mr_util/constants.h
include mr_util/gl_integrator.h
include mr_util/fft.h
include mr_util/fft1d.h
include mr_util/mav.h
include mr_util/threading.h
include mr_util/aligned_array.h
include mr_util/simd.h
include mr_util/cmplx.h
include mr_util/unity_roots.h
include mr_util/error_handling.h
include mr_util/pybind_utils.h
include mr_util/threading.cc
include mr_util/infra/useful_macros.h
include mr_util/math/constants.h
include mr_util/math/gl_integrator.h
include mr_util/math/fft.h
include mr_util/math/fft1d.h
include mr_util/infra/mav.h
include mr_util/infra/threading.h
include mr_util/infra/aligned_array.h
include mr_util/infra/simd.h
include mr_util/math/cmplx.h
include mr_util/math/unity_roots.h
include mr_util/infra/error_handling.h
include mr_util/bindings/pybind_utils.h
include mr_util/infra/threading.cc
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Copyright (C) 2019 Max-Planck-Society
/* Copyright (C) 2019-2020 Max-Planck-Society
Author: Martin Reinecke */
#include <iostream>
......@@ -29,12 +29,12 @@
#include <vector>
#include <array>
#include "mr_util/error_handling.h"
#include "mr_util/fft.h"
#include "mr_util/threading.h"
#include "mr_util/useful_macros.h"
#include "mr_util/mav.h"
#include "mr_util/gl_integrator.h"
#include "mr_util/infra/error_handling.h"
#include "mr_util/math/fft.h"
#include "mr_util/infra/threading.h"
#include "mr_util/infra/useful_macros.h"
#include "mr_util/infra/mav.h"
#include "mr_util/math/gl_integrator.h"
#if defined(__GNUC__)
#define ALIGNED(align) __attribute__ ((aligned(align)))
......
......@@ -21,7 +21,7 @@
#include <pybind11/pybind11.h>
#include <pybind11/numpy.h>
#include "mr_util/pybind_utils.h"
#include "mr_util/bindings/pybind_utils.h"
#include "gridder_cxx.h"
using namespace std;
......
......@@ -33,20 +33,20 @@ else:
def get_extension_modules():
return [Extension('nifty_gridder',
sources=['nifty_gridder.cc',
'mr_util/threading.cc'],
depends=['mr_util/useful_macros.h',
'mr_util/constants.h',
'mr_util/gl_integrator.h',
'mr_util/error_handling.h',
'mr_util/fft.h',
'mr_util/fft1d.h',
'mr_util/threading.h',
'mr_util/aligned_array.h',
'mr_util/simd.h',
'mr_util/mav.h',
'mr_util/cmplx.h',
'mr_util/unity_roots.h',
'mr_util/pybind_utils.h',
'mr_util/infra/threading.cc'],
depends=['mr_util/infra/useful_macros.h',
'mr_util/math/constants.h',
'mr_util/math/gl_integrator.h',
'mr_util/infra/error_handling.h',
'mr_util/math/fft.h',
'mr_util/math/fft1d.h',
'mr_util/infra/threading.h',
'mr_util/infra/aligned_array.h',
'mr_util/infra/simd.h',
'mr_util/infra/mav.h',
'mr_util/math/cmplx.h',
'mr_util/math/unity_roots.h',
'mr_util/bindings/pybind_utils.h',
'gridder_cxx.h',
'setup.py'],
include_dirs=include_dirs,
......
prune mr_util
include mr_util/useful_macros.h
include mr_util/fft.h
include mr_util/fft1d.h
include mr_util/mav.h
include mr_util/threading.h
include mr_util/aligned_array.h
include mr_util/simd.h
include mr_util/cmplx.h
include mr_util/unity_roots.h
include mr_util/error_handling.h
include mr_util/pybind_utils.h
include mr_util/threading.cc
include mr_util/infra/useful_macros.h
include mr_util/math/fft.h
include mr_util/math/fft1d.h
include mr_util/infra/mav.h
include mr_util/infra/threading.h
include mr_util/infra/aligned_array.h
include mr_util/infra/simd.h
include mr_util/math/cmplx.h
include mr_util/math/unity_roots.h
include mr_util/infra/error_handling.h
include mr_util/bindings/pybind_utils.h
include mr_util/infra/threading.cc
../mr_util/
\ No newline at end of file
../src/mr_util/
\ No newline at end of file
......@@ -16,8 +16,8 @@
#include <pybind11/numpy.h>
#include <pybind11/stl.h>
#include "mr_util/fft.h"
#include "mr_util/pybind_utils.h"
#include "mr_util/math/fft.h"
#include "mr_util/bindings/pybind_utils.h"
namespace {
......
......@@ -37,18 +37,18 @@ def get_extension_modules():
return [Extension('pypocketfft',
language='c++',
sources=['pypocketfft.cc',
'mr_util/threading.cc'],
depends=['mr_util/useful_macros.h',
'mr_util/fft.h',
'mr_util/fft1d.h',
'mr_util/mav.h',
'mr_util/threading.h',
'mr_util/aligned_array.h',
'mr_util/simd.h',
'mr_util/cmplx.h',
'mr_util/unity_roots.h',
'mr_util/error_handling.h',
'mr_util/pybind_utils.h',
'mr_util/infra/threading.cc'],
depends=['mr_util/infra/useful_macros.h',
'mr_util/math/fft.h',
'mr_util/math/fft1d.h',
'mr_util/infra/mav.h',
'mr_util/infra/threading.h',
'mr_util/infra/aligned_array.h',
'mr_util/infra/simd.h',
'mr_util/math/cmplx.h',
'mr_util/math/unity_roots.h',
'mr_util/infra/error_handling.h',
'mr_util/bindings/pybind_utils.h',
'setup.py'],
include_dirs=include_dirs,
define_macros=define_macros,
......
prune mr_util
prune libsharp2
include mr_util/fft1d.h
include mr_util/threading.h
include mr_util/math_utils.h
include mr_util/aligned_array.h
include mr_util/gl_integrator.h
include mr_util/simd.h
include mr_util/cmplx.h
include mr_util/string_utils.h
include mr_util/timers.h
include mr_util/constants.h
include mr_util/unity_roots.h
include mr_util/error_handling.h
include mr_util/useful_macros.h
include mr_util/pybind_utils.h
include libsharp2/sharp.h
include libsharp2/sharp_internal.h
include libsharp2/sharp_geomhelpers.h
include libsharp2/sharp_almhelpers.h
include mr_util/threading.cc
include mr_util/string_utils.cc
include libsharp2/sharp.cc
include libsharp2/sharp_core.cc
include libsharp2/sharp_core_inc.cc
include libsharp2/sharp_geomhelpers.cc
include libsharp2/sharp_almhelpers.cc
include libsharp2/sharp_ylmgen.cc
include mr_util/math/fft1d.h
include mr_util/math/fft.h
include mr_util/infra/threading.h
include mr_util/infra/mav.h
include mr_util/math/math_utils.h
include mr_util/infra/aligned_array.h
include mr_util/math/gl_integrator.h
include mr_util/infra/simd.h
include mr_util/math/cmplx.h
include mr_util/infra/string_utils.h
include mr_util/infra/timers.h
include mr_util/math/constants.h
include mr_util/math/unity_roots.h
include mr_util/infra/error_handling.h
include mr_util/infra/useful_macros.h
include mr_util/bindings/pybind_utils.h
include mr_util/sharp/sharp.h
include mr_util/sharp/sharp_internal.h
include mr_util/sharp/sharp_geomhelpers.h
include mr_util/sharp/sharp_almhelpers.h
include mr_util/infra/threading.cc
include mr_util/infra/string_utils.cc
include mr_util/sharp/sharp.cc
include mr_util/sharp/sharp_core.cc
include mr_util/sharp/sharp_core_inc.cc
include mr_util/sharp/sharp_geomhelpers.cc
include mr_util/sharp/sharp_almhelpers.cc
include mr_util/sharp/sharp_ylmgen.cc
../libsharp2/
\ No newline at end of file
../mr_util/
\ No newline at end of file
../src/mr_util/
\ No newline at end of file
......@@ -32,15 +32,15 @@
#include <vector>
#include <complex>
#include "libsharp2/sharp.h"
#include "libsharp2/sharp_geomhelpers.h"
#include "libsharp2/sharp_almhelpers.h"
#include "mr_util/string_utils.h"
#include "mr_util/error_handling.h"
#include "mr_util/mav.h"
#include "mr_util/fft.h"
#include "mr_util/constants.h"
#include "mr_util/pybind_utils.h"
#include "mr_util/sharp/sharp.h"
#include "mr_util/sharp/sharp_geomhelpers.h"
#include "mr_util/sharp/sharp_almhelpers.h"
#include "mr_util/infra/string_utils.h"
#include "mr_util/infra/error_handling.h"
#include "mr_util/infra/mav.h"
#include "mr_util/math/fft.h"
#include "mr_util/math/constants.h"
#include "mr_util/bindings/pybind_utils.h"
using namespace std;
using namespace mr;
......
......@@ -35,31 +35,33 @@ def get_extension_modules():
return [Extension('pysharp',
language='c++',
sources=['pysharp.cc',
'mr_util/threading.cc',
'mr_util/string_utils.cc',
'libsharp2/sharp.cc',
'libsharp2/sharp_core.cc',
'libsharp2/sharp_geomhelpers.cc',
'libsharp2/sharp_almhelpers.cc',
'libsharp2/sharp_ylmgen.cc'],
'mr_util/infra/threading.cc',
'mr_util/infra/string_utils.cc',
'mr_util/sharp/sharp.cc',
'mr_util/sharp/sharp_core.cc',
'mr_util/sharp/sharp_geomhelpers.cc',
'mr_util/sharp/sharp_almhelpers.cc',
'mr_util/sharp/sharp_ylmgen.cc'],
depends=['mr_util/fft1d.h',
'mr_util/threading.h',
'mr_util/fft.h',
'mr_util/infra/threading.h',
'mr_util/infra/mav.h',
'mr_util/math_utils.h',
'mr_util/aligned_array.h',
'mr_util/gl_integrator.h',
'mr_util/simd.h',
'mr_util/cmplx.h',
'mr_util/string_utils.h',
'mr_util/timers.h',
'mr_util/constants.h',
'mr_util/unity_roots.h',
'mr_util/error_handling.h',
'mr_util/useful_macros.h',
'mr_util/pybind_utils.h',
'libsharp2/sharp.h',
'libsharp2/sharp_internal.h',
'libsharp2/sharp_geomhelpers.h',
'libsharp2/sharp_almhelpers.h'
'mr_util/infra/aligned_array.h',
'mr_util/math/gl_integrator.h',
'mr_util/infra/simd.h',
'mr_util/math/cmplx.h',
'mr_util/infra/string_utils.h',
'mr_util/infra/timers.h',
'mr_util/math/constants.h',
'mr_util/math/unity_roots.h',
'mr_util/infra/error_handling.h',
'mr_util/infra/useful_macros.h',
'mr_util/bindings/pybind_utils.h',
'mr_util/sharp/sharp.h',
'mr_util/sharp/sharp_internal.h',
'mr_util/sharp/sharp_geomhelpers.h',
'mr_util/sharp/sharp_almhelpers.h'
'setup.py'],
include_dirs=include_dirs,
define_macros=define_macros,
......
......@@ -4,7 +4,7 @@
#include <pybind11/pybind11.h>
#include <pybind11/numpy.h>
#include "mr_util/mav.h"
#include "mr_util/infra/mav.h"
namespace mr {
......
......@@ -25,7 +25,7 @@
#include <sstream>
#include <exception>
#include "mr_util/useful_macros.h"
#include "mr_util/infra/useful_macros.h"
namespace mr {
......
......@@ -26,7 +26,7 @@
#include <array>
#include <vector>
#include <memory>
#include "mr_util/error_handling.h"
#include "mr_util/infra/error_handling.h"
namespace mr {
......
......@@ -43,12 +43,11 @@
#include <cstdlib>
#include <cmath>
#include <algorithm>
#ifndef MRUTIL_NO_SIMD
#include <x86intrin.h>
#endif
#include <algorithm>
namespace mr {
namespace detail_simd {
......
......@@ -26,7 +26,7 @@
* This file contains the implementation of various convenience functions
* used by the Planck LevelS package.
*
* Copyright (C) 2002-2019 Max-Planck-Society
* Copyright (C) 2002-2020 Max-Planck-Society
* Author: Martin Reinecke
*/
......@@ -37,8 +37,8 @@
#include <string>
#include <cstring>
#include <cctype>
#include "mr_util/string_utils.h"
#include "mr_util/error_handling.h"
#include "mr_util/infra/string_utils.h"
#include "mr_util/infra/error_handling.h"
using namespace std;
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Copyright (C) 2019 Max-Planck-Society
/* Copyright (C) 2019-2020 Max-Planck-Society
Author: Martin Reinecke */
#ifndef MRUTIL_STRING_UTILS_H
......
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