Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
ducc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Simon Perkins
ducc
Commits
bf32424e
Commit
bf32424e
authored
Jun 08, 2020
by
Martin Reinecke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjust tests to new numpy RNG interface
parent
bd30feab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
44 deletions
+52
-44
python/test/test_fft.py
python/test/test_fft.py
+13
-13
python/test/test_healpix.py
python/test/test_healpix.py
+16
-10
python/test/test_totalconvolve.py
python/test/test_totalconvolve.py
+14
-12
python/test/test_wgridder.py
python/test/test_wgridder.py
+9
-9
No files found.
python/test/test_fft.py
View file @
bf32424e
...
...
@@ -71,7 +71,7 @@ dtypes = [np.float32, np.float64,
@
pmp
(
"inorm"
,
[
0
,
1
,
2
])
@
pmp
(
"dtype"
,
dtypes
)
def
test1D
(
len
,
inorm
,
dtype
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
len
)
-
0.5
+
1j
*
rng
.
random
(
len
)
-
0.5j
a
=
a
.
astype
(
ctype
[
dtype
])
eps
=
tol
[
dtype
]
...
...
@@ -92,7 +92,7 @@ def test1D(len, inorm, dtype):
@
pmp
(
"nthreads"
,
(
0
,
1
,
2
))
@
pmp
(
"inorm"
,
[
0
,
1
,
2
])
def
test_fftn
(
shp
,
nthreads
,
inorm
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
+
1j
*
rng
.
random
(
shp
)
-
0.5j
assert_
(
_l2error
(
a
,
ifftn
(
fftn
(
a
,
nthreads
=
nthreads
,
inorm
=
inorm
),
nthreads
=
nthreads
,
inorm
=
2
-
inorm
))
<
1e-15
)
...
...
@@ -105,7 +105,7 @@ def test_fftn(shp, nthreads, inorm):
@
pmp
(
"axes"
,
((
0
,),
(
1
,),
(
0
,
1
),
(
1
,
0
)))
@
pmp
(
"inorm"
,
[
0
,
1
,
2
])
def
test_fftn2D
(
shp
,
axes
,
inorm
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
+
1j
*
rng
.
random
(
shp
)
-
0.5j
assert_
(
_l2error
(
a
,
ifftn
(
fftn
(
a
,
axes
=
axes
,
inorm
=
inorm
),
axes
=
axes
,
inorm
=
2
-
inorm
))
<
1e-15
)
...
...
@@ -116,7 +116,7 @@ def test_fftn2D(shp, axes, inorm):
@
pmp
(
"shp"
,
shapes
)
def
test_rfftn
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
tmp1
=
rfftn
(
a
)
tmp2
=
fftn
(
a
)
...
...
@@ -142,7 +142,7 @@ def test_rfftn(shp):
@
pmp
(
"shp"
,
shapes2D
)
@
pmp
(
"axes"
,
((
0
,),
(
1
,),
(
0
,
1
),
(
1
,
0
)))
def
test_rfftn2D
(
shp
,
axes
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
tmp1
=
rfftn
(
a
,
axes
=
axes
)
tmp2
=
fftn
(
a
,
axes
=
axes
)
...
...
@@ -157,7 +157,7 @@ def test_rfftn2D(shp, axes):
@
pmp
(
"shp"
,
shapes
)
def
test_identity
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
+
1j
*
rng
.
random
(
shp
)
-
0.5j
assert_
(
_l2error
(
ifftn
(
fftn
(
a
),
inorm
=
2
),
a
)
<
1.5e-15
)
assert_
(
_l2error
(
ifftn
(
fftn
(
a
.
real
),
inorm
=
2
),
a
.
real
)
<
1.5e-15
)
...
...
@@ -171,7 +171,7 @@ def test_identity(shp):
@
pmp
(
"shp"
,
shapes
)
def
test_identity_r
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
b
=
a
.
astype
(
np
.
float32
)
for
ax
in
range
(
a
.
ndim
):
...
...
@@ -184,7 +184,7 @@ def test_identity_r(shp):
@
pmp
(
"shp"
,
shapes
)
def
test_identity_r2
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
+
1j
*
rng
.
random
(
shp
)
-
0.5j
a
=
rfftn
(
irfftn
(
a
))
assert_
(
_l2error
(
rfftn
(
irfftn
(
a
),
inorm
=
2
),
a
)
<
1e-15
)
...
...
@@ -192,7 +192,7 @@ def test_identity_r2(shp):
@
pmp
(
"shp"
,
shapes2D
+
shapes3D
)
def
test_genuine_hartley
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
v1
=
fft
.
genuine_hartley
(
a
)
v2
=
fftn
(
a
.
astype
(
np
.
complex128
))
...
...
@@ -202,7 +202,7 @@ def test_genuine_hartley(shp):
@
pmp
(
"shp"
,
shapes
)
def
test_hartley_identity
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
v1
=
fft
.
separable_hartley
(
fft
.
separable_hartley
(
a
))
/
a
.
size
assert_
(
_l2error
(
a
,
v1
)
<
1e-15
)
...
...
@@ -210,7 +210,7 @@ def test_hartley_identity(shp):
@
pmp
(
"shp"
,
shapes
)
def
test_genuine_hartley_identity
(
shp
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
v1
=
fft
.
genuine_hartley
(
fft
.
genuine_hartley
(
a
))
/
a
.
size
assert_
(
_l2error
(
a
,
v1
)
<
1e-15
)
...
...
@@ -223,7 +223,7 @@ def test_genuine_hartley_identity(shp):
@
pmp
(
"shp"
,
shapes2D
+
shapes3D
)
@
pmp
(
"axes"
,
((
0
,),
(
1
,),
(
0
,
1
),
(
1
,
0
)))
def
test_genuine_hartley_2D
(
shp
,
axes
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
rng
.
random
(
shp
)
-
0.5
assert_
(
_l2error
(
fft
.
genuine_hartley
(
fft
.
genuine_hartley
(
a
,
axes
=
axes
),
axes
=
axes
,
inorm
=
2
),
a
)
<
1e-15
)
...
...
@@ -234,7 +234,7 @@ def test_genuine_hartley_2D(shp, axes):
@
pmp
(
"type"
,
[
1
,
2
,
3
,
4
])
@
pmp
(
"dtype"
,
dtypes
)
def
testdcst1D
(
len
,
inorm
,
type
,
dtype
):
rng
=
np
.
random
.
default_rng
(
np
.
random
.
SeedSequence
(
42
)
)
rng
=
np
.
random
.
default_rng
(
42
)
a
=
(
rng
.
random
(
len
)
-
0.5
).
astype
(
dtype
)
eps
=
tol
[
dtype
]
itp
=
(
0
,
1
,
3
,
2
,
4
)
...
...
python/test/test_healpix.py
View file @
bf32424e
...
...
@@ -23,50 +23,56 @@ nside_ring = list2fixture(pow2+nonpow2)
vlen
=
list2fixture
([
1
,
10
,
100
,
1000
,
10000
])
def
random_ptg
(
vlen
):
def
random_ptg
(
rng
,
vlen
):
res
=
np
.
empty
((
vlen
,
2
),
dtype
=
np
.
float64
)
res
[:,
0
]
=
np
.
arccos
((
np
.
random
.
random_sample
(
vlen
)
-
0.5
)
*
2
)
# res[:, 0] = math.pi*
np.random.random_sample
(vlen)
res
[:,
1
]
=
np
.
random
.
random_sample
(
vlen
)
*
2
*
math
.
pi
res
[:,
0
]
=
np
.
arccos
((
rng
.
random
(
vlen
)
-
0.5
)
*
2
)
# res[:, 0] = math.pi*
rng.random
(vlen)
res
[:,
1
]
=
rng
.
random
(
vlen
)
*
2
*
math
.
pi
return
res
def
test_pixangpix_nest
(
vlen
,
nside_nest
):
base
=
ph
.
Healpix_Base
(
nside_nest
,
"NEST"
)
inp
=
np
.
random
.
randint
(
low
=
0
,
high
=
12
*
nside_nest
*
nside_nest
-
1
,
size
=
vlen
)
rng
=
np
.
random
.
default_rng
(
42
)
inp
=
rng
.
integers
(
low
=
0
,
high
=
12
*
nside_nest
*
nside_nest
-
1
,
size
=
vlen
)
out
=
base
.
ang2pix
(
base
.
pix2ang
(
inp
))
assert_equal
(
inp
,
out
)
def
test_pixangpix_ring
(
vlen
,
nside_ring
):
base
=
ph
.
Healpix_Base
(
nside_ring
,
"RING"
)
inp
=
np
.
random
.
randint
(
low
=
0
,
high
=
12
*
nside_ring
*
nside_ring
-
1
,
size
=
vlen
)
rng
=
np
.
random
.
default_rng
(
42
)
inp
=
rng
.
integers
(
low
=
0
,
high
=
12
*
nside_ring
*
nside_ring
-
1
,
size
=
vlen
)
out
=
base
.
ang2pix
(
base
.
pix2ang
(
inp
))
assert_equal
(
inp
,
out
)
def
test_vecpixvec_nest
(
vlen
,
nside_nest
):
base
=
ph
.
Healpix_Base
(
nside_nest
,
"NEST"
)
inp
=
ph
.
ang2vec
(
random_ptg
(
vlen
))
rng
=
np
.
random
.
default_rng
(
42
)
inp
=
ph
.
ang2vec
(
random_ptg
(
rng
,
vlen
))
out
=
base
.
pix2vec
(
base
.
vec2pix
(
inp
))
assert_equal
(
np
.
all
(
ph
.
v_angle
(
inp
,
out
)
<
base
.
max_pixrad
()),
True
)
def
test_vecpixvec_ring
(
vlen
,
nside_ring
):
base
=
ph
.
Healpix_Base
(
nside_ring
,
"RING"
)
inp
=
ph
.
ang2vec
(
random_ptg
(
vlen
))
rng
=
np
.
random
.
default_rng
(
42
)
inp
=
ph
.
ang2vec
(
random_ptg
(
rng
,
vlen
))
out
=
base
.
pix2vec
(
base
.
vec2pix
(
inp
))
assert_equal
(
np
.
all
(
ph
.
v_angle
(
inp
,
out
)
<
base
.
max_pixrad
()),
True
)
def
test_ringnestring
(
vlen
,
nside_nest
):
base
=
ph
.
Healpix_Base
(
nside_nest
,
"NEST"
)
inp
=
np
.
random
.
randint
(
low
=
0
,
high
=
12
*
nside_nest
*
nside_nest
-
1
,
size
=
vlen
)
rng
=
np
.
random
.
default_rng
(
42
)
inp
=
rng
.
integers
(
low
=
0
,
high
=
12
*
nside_nest
*
nside_nest
-
1
,
size
=
vlen
)
out
=
base
.
ring2nest
(
base
.
nest2ring
(
inp
))
assert_equal
(
np
.
all
(
out
==
inp
),
True
)
def
test_vecangvec
(
vlen
):
inp
=
random_ptg
(
vlen
)
rng
=
np
.
random
.
default_rng
(
42
)
inp
=
random_ptg
(
rng
,
vlen
)
out
=
ph
.
vec2ang
(
ph
.
ang2vec
(
inp
))
assert_equal
(
np
.
all
(
np
.
abs
(
out
-
inp
)
<
1e-14
),
True
)
python/test/test_totalconvolve.py
View file @
bf32424e
...
...
@@ -23,9 +23,9 @@ def nalm(lmax, mmax):
return
((
mmax
+
1
)
*
(
mmax
+
2
))
//
2
+
(
mmax
+
1
)
*
(
lmax
-
mmax
)
def
random_alm
(
lmax
,
mmax
,
ncomp
):
res
=
np
.
random
.
uniform
(
-
1.
,
1.
,
(
nalm
(
lmax
,
mmax
),
ncomp
))
\
+
1j
*
np
.
random
.
uniform
(
-
1.
,
1.
,
(
nalm
(
lmax
,
mmax
),
ncomp
))
def
random_alm
(
rng
,
lmax
,
mmax
,
ncomp
):
res
=
rng
.
uniform
(
-
1.
,
1.
,
(
nalm
(
lmax
,
mmax
),
ncomp
))
\
+
1j
*
rng
.
uniform
(
-
1.
,
1.
,
(
nalm
(
lmax
,
mmax
),
ncomp
))
# make a_lm with m==0 real-valued
res
[
0
:
lmax
+
1
,:].
imag
=
0.
return
res
...
...
@@ -57,16 +57,17 @@ def myalmdot(a1,a2,lmax,mmax,spin):
@
pmp
(
"separate"
,
[
True
,
False
])
def
test_against_convolution
(
lkmax
,
ncomp
,
separate
):
lmax
,
kmax
=
lkmax
slm
=
random_alm
(
lmax
,
lmax
,
ncomp
)
blm
=
random_alm
(
lmax
,
kmax
,
ncomp
)
rng
=
np
.
random
.
default_rng
(
42
)
slm
=
random_alm
(
rng
,
lmax
,
lmax
,
ncomp
)
blm
=
random_alm
(
rng
,
lmax
,
kmax
,
ncomp
)
inter
=
totalconvolve
.
PyInterpolator
(
slm
,
blm
,
separate
,
lmax
,
kmax
,
epsilon
=
1e-8
,
nthreads
=
2
)
nptg
=
50
ptg
=
np
.
zeros
((
nptg
,
3
))
ptg
[:,
0
]
=
np
.
random
.
uniform
(
0
,
np
.
pi
,
nptg
)
ptg
[:,
1
]
=
np
.
random
.
uniform
(
0
,
2
*
np
.
pi
,
nptg
)
ptg
[:,
2
]
=
np
.
random
.
uniform
(
-
np
.
pi
,
np
.
pi
,
nptg
)
ptg
[:,
0
]
=
rng
.
uniform
(
0
,
np
.
pi
,
nptg
)
ptg
[:,
1
]
=
rng
.
uniform
(
0
,
2
*
np
.
pi
,
nptg
)
ptg
[:,
2
]
=
rng
.
uniform
(
-
np
.
pi
,
np
.
pi
,
nptg
)
res1
=
inter
.
interpol
(
ptg
)
...
...
@@ -87,17 +88,18 @@ def test_against_convolution(lkmax, ncomp, separate):
@
pmp
(
"separate"
,
[
True
,
False
])
def
test_adjointness
(
lkmax
,
ncomp
,
separate
):
lmax
,
kmax
=
lkmax
slm
=
random_alm
(
lmax
,
lmax
,
ncomp
)
blm
=
random_alm
(
lmax
,
kmax
,
ncomp
)
rng
=
np
.
random
.
default_rng
(
42
)
slm
=
random_alm
(
rng
,
lmax
,
lmax
,
ncomp
)
blm
=
random_alm
(
rng
,
lmax
,
kmax
,
ncomp
)
nptg
=
100000
ptg
=
np
.
random
.
uniform
(
0.
,
1.
,
nptg
*
3
).
reshape
(
nptg
,
3
)
ptg
=
rng
.
uniform
(
0.
,
1.
,
nptg
*
3
).
reshape
(
nptg
,
3
)
ptg
[:,
0
]
*=
np
.
pi
ptg
[:,
1
]
*=
2
*
np
.
pi
ptg
[:,
2
]
*=
2
*
np
.
pi
foo
=
totalconvolve
.
PyInterpolator
(
slm
,
blm
,
separate
,
lmax
,
kmax
,
epsilon
=
1e-6
,
nthreads
=
2
)
inter1
=
foo
.
interpol
(
ptg
)
ncomp2
=
inter1
.
shape
[
1
]
fake
=
np
.
random
.
uniform
(
0.
,
1.
,
(
ptg
.
shape
[
0
],
ncomp2
))
fake
=
rng
.
uniform
(
0.
,
1.
,
(
ptg
.
shape
[
0
],
ncomp2
))
foo2
=
totalconvolve
.
PyInterpolator
(
lmax
,
kmax
,
ncomp2
,
epsilon
=
1e-6
,
nthreads
=
2
)
foo2
.
deinterpol
(
ptg
.
reshape
((
-
1
,
3
)),
fake
)
bla
=
foo2
.
getSlm
(
blm
)
...
...
python/test/test_wgridder.py
View file @
bf32424e
...
...
@@ -50,15 +50,15 @@ def explicit_gridder(uvw, freq, ms, wgt, nxdirty, nydirty, xpixsize, ypixsize,
def
test_adjointness_ms2dirty
(
nxdirty
,
nydirty
,
ofactor
,
nrow
,
nchan
,
epsilon
,
singleprec
,
wstacking
,
use_wgt
,
nthreads
):
if
singleprec
and
epsilon
<
5e-5
:
return
np
.
random
.
seed
(
42
)
rng
=
np
.
random
.
default_rng
(
42
)
pixsizex
=
np
.
pi
/
180
/
60
/
nxdirty
*
0.2398
pixsizey
=
np
.
pi
/
180
/
60
/
nxdirty
speedoflight
,
f0
=
299792458.
,
1e9
freq
=
f0
+
np
.
arange
(
nchan
)
*
(
f0
/
nchan
)
uvw
=
(
np
.
random
.
rand
(
nrow
,
3
)
-
0.5
)
/
(
pixsizey
*
f0
/
speedoflight
)
ms
=
np
.
random
.
rand
(
nrow
,
nchan
)
-
0.5
+
1j
*
(
np
.
random
.
rand
(
nrow
,
nchan
)
-
0.5
)
wgt
=
np
.
random
.
rand
(
nrow
,
nchan
)
if
use_wgt
else
None
dirty
=
np
.
random
.
rand
(
nxdirty
,
nydirty
)
-
0.5
uvw
=
(
rng
.
random
((
nrow
,
3
)
)
-
0.5
)
/
(
pixsizey
*
f0
/
speedoflight
)
ms
=
rng
.
random
((
nrow
,
nchan
))
-
0.5
+
1j
*
(
rng
.
random
((
nrow
,
nchan
)
)
-
0.5
)
wgt
=
rng
.
random
((
nrow
,
nchan
)
)
if
use_wgt
else
None
dirty
=
rng
.
random
((
nxdirty
,
nydirty
)
)
-
0.5
nu
,
nv
=
int
(
nxdirty
*
ofactor
)
+
1
,
int
(
nydirty
*
ofactor
)
+
1
if
nu
&
1
:
nu
+=
1
...
...
@@ -91,14 +91,14 @@ def test_adjointness_ms2dirty(nxdirty, nydirty, ofactor, nrow, nchan, epsilon, s
def
test_ms2dirty_against_wdft2
(
nxdirty
,
nydirty
,
ofactor
,
nrow
,
nchan
,
epsilon
,
singleprec
,
wstacking
,
use_wgt
,
fov
,
nthreads
):
if
singleprec
and
epsilon
<
5e-5
:
return
np
.
random
.
seed
(
40
)
rng
=
np
.
random
.
default_rng
(
42
)
pixsizex
=
fov
*
np
.
pi
/
180
/
nxdirty
pixsizey
=
fov
*
np
.
pi
/
180
/
nydirty
*
1.1
speedoflight
,
f0
=
299792458.
,
1e9
freq
=
f0
+
np
.
arange
(
nchan
)
*
(
f0
/
nchan
)
uvw
=
(
np
.
random
.
rand
(
nrow
,
3
)
-
0.5
)
/
(
pixsizex
*
f0
/
speedoflight
)
ms
=
np
.
random
.
rand
(
nrow
,
nchan
)
-
0.5
+
1j
*
(
np
.
random
.
rand
(
nrow
,
nchan
)
-
0.5
)
wgt
=
np
.
random
.
rand
(
nrow
,
nchan
)
if
use_wgt
else
None
uvw
=
(
rng
.
random
((
nrow
,
3
)
)
-
0.5
)
/
(
pixsizex
*
f0
/
speedoflight
)
ms
=
rng
.
random
((
nrow
,
nchan
))
-
0.5
+
1j
*
(
rng
.
random
((
nrow
,
nchan
)
)
-
0.5
)
wgt
=
rng
.
random
((
nrow
,
nchan
)
)
if
use_wgt
else
None
nu
,
nv
=
int
(
nxdirty
*
ofactor
)
+
1
,
int
(
nydirty
*
ofactor
)
+
1
if
nu
&
1
:
nu
+=
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment