Skip to content
GitLab
Commit f2503557 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

introduce subarrays

parent e05a563f
Pipeline #70003 passed with stages
in 12 minutes and 39 seconds
Show whitespace changes
Inline Side-by-side
interpol_ng/interpol_ng.cc
View file @ f2503557
......@@ -37,7 +37,7 @@ template<typename T> class Interpolator
void correct(mav<T,2> &arr)
{
mav<T,2> tmp({nphi,nphi});
mav<T,2> tmp0(tmp.vdata(),{nphi0, nphi0}, tmp.stride(), true);
auto tmp0=tmp.template subarray<2>({0,0},{nphi0, nphi0});
fmav<T> ftmp0(tmp0);
for (size_t i=0; i<ntheta0; ++i)
for (size_t j=0; j<nphi0; ++j)
......@@ -49,18 +49,20 @@ template<typename T> class Interpolator
if (j2>=nphi0) j2-=nphi0;
tmp0.v(i2,j) = arr(i,j2);
}
// FFT
// FFT to frequency domain on minimal grid
r2r_fftpack(ftmp0,ftmp0,{0,1},true,true,1./(nphi0*nphi0),0);
auto fct = kernel.correction_factors(nphi, nphi0, 0);
for (size_t i=0; i<nphi0; ++i)
for (size_t j=0; j<nphi0; ++j)
tmp0.v(i,j) *= fct[(i+1)/2] * fct[(j+1)/2];
mav<T,2> tmp1(tmp.vdata(),{nphi, nphi0}, tmp.stride(), true);
auto tmp1=tmp.template subarray<2>({0,0},{nphi, nphi0});
fmav<T> ftmp1(tmp1);
// zero-padded FFT in theta direction
r2r_fftpack(ftmp1,ftmp1,{0},false,false,1.,0);
mav<T,2> tmp2(tmp.vdata(),{ntheta, nphi}, tmp.stride(), true);
auto tmp2=tmp.template subarray<2>({0,0},{ntheta, nphi});
fmav<T> ftmp2(tmp2);
fmav<T> farr(arr);
// zero-padded FFT in phi direction
r2r_fftpack(ftmp2,farr,{1},false,false,1.,0);
}
......@@ -117,8 +119,8 @@ template<typename T> class Interpolator
auto quadrant=k%4;
if (quadrant&1)
swap(kidx1, kidx2);
mav<T,2> m1(&cube.v(supp,supp,kidx1),{ntheta,nphi},{cube.stride(0),cube.stride(1)},true);
mav<T,2> m2(&cube.v(supp,supp,kidx2),{ntheta,nphi},{cube.stride(0),cube.stride(1)},true);
auto m1 = cube.template subarray<2>({supp,supp,kidx1},{ntheta,nphi,0});
auto m2 = cube.template subarray<2>({supp,supp,kidx2},{ntheta,nphi,0});
if (k==0)
sharp_alm2map(a1.Alms().data(), m1.vdata(), *ginfo, *ainfo, 0, nullptr, nullptr);
else
......@@ -153,25 +155,22 @@ template<typename T> class Interpolator
MR_assert(ptg.shape(1)==3, "second dimension must have length 3");
vector<T> wt(supp), wp(supp);
vector<T> psiarr(2*kmax+1);
double delta = 2./supp;
double xdtheta = (ntheta-1)/pi,
xdphi = nphi/(2*pi);
for (size_t i=0; i<ptg.shape(0); ++i)
{
double theta=ptg(i,0);
double phi=ptg(i,1);
double psi=ptg(i,2);
double f0=supp+theta*((ntheta-1)/pi)-0.5*supp;
double f0=0.5*supp+ptg(i,0)*xdtheta;
size_t i0 = size_t(f0+1.);
for (size_t t=0; t<supp; ++t)
wt[t] = kernel(((t+i0)-f0-0.5*supp)/supp*2);
double f1=supp+phi*(nphi/(2*pi))-0.5*supp;
wt[t] = kernel((t+i0-f0)*delta - 1);
double f1=0.5*supp+ptg(i,1)*xdphi;
size_t i1 = size_t(f1+1.);
for (size_t t=0; t<supp; ++t)
wp[t] = kernel(((t+i1)-f1-0.5*supp)/supp*2);
double sumt=0, sump=0;
for (size_t t=0; t<supp; ++t)
{sumt+=wt[t]; sump+=wp[t];}
wp[t] = kernel((t+i1-f1)*delta - 1);
double val=0;
psiarr[0]=1.;
double cpsi=cos(psi), spsi=sin(psi);
double cpsi=cos(ptg(i,2)), spsi=sin(ptg(i,2));
double cnpsi=cpsi, snpsi=spsi;
for (size_t l=1; l<=kmax; ++l)
{
......
src/mr_util/infra/mav.h
View file @ f2503557
......@@ -99,8 +99,10 @@ template<typename T> class membuf
const T *d;
bool rw;
membuf(T *d_, const Tsp &p, bool rw_)
: ptr(p), d(d_), rw(rw_) {}
membuf(const T *d_, membuf &other)
: ptr(other.ptr), d(d_), rw(other.rw) {}
membuf(const T *d_, const membuf &other)
: ptr(other.ptr), d(d_), rw(false) {}
public:
membuf(T *d_, bool rw_=false)
......@@ -232,6 +234,7 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
using mav_info<ndim>::conformable;
using membuf<T>::rw;
using membuf<T>::vraw;
template<size_t idim, typename Func> void applyHelper(ptrdiff_t idx, Func func)
{
if constexpr (idim+1<ndim)
......@@ -275,6 +278,26 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
}
}
template<size_t nd2> void subdata(const shape_t &i0, const shape_t &extent,
array<size_t, nd2> &nshp, array<ptrdiff_t, nd2> &nstr, ptrdiff_t &nofs) const
{
size_t n0=0;
for (auto x:extent) if (x==0)++n0;
MR_assert(n0+nd2==ndim, "bad extent");
nofs=0;
for (size_t i=0, i2=0; i<ndim; ++i)
{
MR_assert(i0[i]<shp[i], "bad subset");
nofs+=i0[i]*str[i];
if (extent[i]!=0)
{
MR_assert(i0[i]+extent[i2]<=shp[i], "bad subset");
nshp[i2] = extent[i]; nstr[i2]=str[i];
++i2;
}
}
}
public:
using membuf<T>::operator[];
using membuf<T>::vdata;
......@@ -296,6 +319,10 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
mav(const mav &other) = default;
mav(mav &other) = default;
mav(mav &&other) = default;
mav(const shape_t &shp_, const stride_t &str_, const T *d_, membuf<T> &mb)
: mav_info<ndim>(shp_, str_), membuf<T>(d_, mb) {}
mav(const shape_t &shp_, const stride_t &str_, const T *d_, const membuf<T> &mb)
: mav_info<ndim>(shp_, str_), membuf<T>(d_, mb) {}
operator fmav<T>() const
{
return fmav<T>(*this, {shp.begin(), shp.end()}, {str.begin(), str.end()});
......@@ -324,6 +351,22 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
{ applyHelper<0,T2,Func>(0,0,other,func); }
void fill(const T &val)
{ apply([val](T &v){v=val;}); }
template<size_t nd2> mav<T,nd2> subarray(const shape_t &i0, const shape_t &extent)
{
array<size_t,nd2> nshp;
array<ptrdiff_t,nd2> nstr;
ptrdiff_t nofs;
subdata<nd2> (i0, extent, nshp, nstr, nofs);
return mav<T,nd2> (nshp, nstr, d+nofs, *this);
}
template<size_t nd2> mav<T,nd2> subarray(const shape_t &i0, const shape_t &extent) const
{
array<size_t,nd2> nshp;
array<ptrdiff_t,nd2> nstr;
ptrdiff_t nofs;
subdata<nd2> (i0, extent, nshp, nstr, nofs);
return mav<T,nd2> (nshp, nstr, d+nofs, *this);
}
};
template<typename T, size_t ndim> class MavIter
......
Supports Markdown
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