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
N
NIFTy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
NIFTy
Commits
2d9e6511
Commit
2d9e6511
authored
Jun 21, 2019
by
Martin Reinecke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert to old gridder interface (almost)
parent
ed095aa2
Pipeline
#50985
passed with stages
in 7 minutes and 59 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
45 deletions
+35
-45
demos/bench_gridder.py
demos/bench_gridder.py
+5
-11
nifty5/library/gridder.py
nifty5/library/gridder.py
+19
-11
test/test_operators/test_nft.py
test/test_operators/test_nft.py
+11
-23
No files found.
demos/bench_gridder.py
View file @
2d9e6511
...
...
@@ -10,30 +10,24 @@ np.random.seed(40)
N0s
,
a0s
,
b0s
,
c0s
=
[],
[],
[],
[]
for
ii
in
range
(
10
,
26
):
fovx
=
0.0001
fovy
=
0.0002
nu
=
1024
nv
=
1024
N
=
int
(
2
**
ii
)
print
(
'N = {}'
.
format
(
N
))
nchan
=
16
nrow
=
N
//
nchan
freq
=
1e9
+
1e6
*
np
.
arange
(
nchan
)
uvw
=
np
.
random
.
rand
(
nrow
,
3
)
-
0.5
vis
=
(
np
.
random
.
randn
(
N
)
+
1j
*
np
.
random
.
randn
(
N
)).
reshape
((
nrow
,
nchan
))
uv
=
np
.
random
.
rand
(
N
,
2
)
-
0.5
vis
=
np
.
random
.
randn
(
N
)
+
1j
*
np
.
random
.
randn
(
N
)
uvspace
=
ift
.
RGSpace
((
nu
,
nv
))
visspace
=
ift
.
UnstructuredDomain
(
(
N
//
nchan
,
nchan
)
)
visspace
=
ift
.
UnstructuredDomain
(
N
)
img
=
np
.
random
.
randn
(
nu
*
nv
)
img
=
img
.
reshape
((
nu
,
nv
))
img
=
ift
.
from_global_data
(
uvspace
,
img
)
t0
=
time
()
GM
=
ift
.
GridderMaker
(
uvspace
,
eps
=
1e-7
,
uvw
=
uvw
,
freq
=
freq
,
fovx
=
fovx
,
fovy
=
fovy
,
flags
=
np
.
zeros
((
N
//
nchan
,
nchan
),
dtype
=
np
.
bool
))
GM
=
ift
.
GridderMaker
(
uvspace
,
eps
=
1e-7
,
uv
=
uv
)
vis
=
ift
.
from_global_data
(
visspace
,
vis
)
op
=
GM
.
getFull
().
adjoint
t1
=
time
()
...
...
nifty5/library/gridder.py
View file @
2d9e6511
...
...
@@ -24,20 +24,28 @@ import numpy as np
class
GridderMaker
(
object
):
def
__init__
(
self
,
dirty_domain
,
uv
w
,
freq
,
fovx
,
fovy
,
flags
,
eps
=
2e-13
):
def
__init__
(
self
,
dirty_domain
,
uv
,
eps
=
2e-13
):
import
nifty_gridder
dirty_domain
=
makeDomain
(
dirty_domain
)
if
(
len
(
dirty_domain
)
!=
1
or
not
isinstance
(
dirty_domain
[
0
],
RGSpace
)
or
not
len
(
dirty_domain
.
shape
)
==
2
):
raise
ValueError
(
"need dirty_domain with exactly one 2D RGSpace"
)
if
freq
.
ndim
!=
1
:
raise
ValueError
(
"freq must be a 1D array"
)
bl
=
nifty_gridder
.
Baselines
(
uvw
,
freq
)
if
uv
.
ndim
!=
2
:
raise
ValueError
(
"uv must be a 2D array"
)
if
uv
.
shape
[
1
]
!=
2
:
raise
ValueError
(
"second dimension of uv must have length 2"
)
# wasteful hack to adjust to shape required by nifty_gridder
uvw
=
np
.
empty
((
uv
.
shape
[
0
],
3
),
dtype
=
np
.
float64
)
uvw
[:,
0
:
2
]
=
uv
uvw
[:,
2
]
=
0.
speedOfLight
=
299792458.
bl
=
nifty_gridder
.
Baselines
(
uvw
,
np
.
array
([
speedOfLight
]))
nxdirty
,
nydirty
=
dirty_domain
.
shape
gconf
=
nifty_gridder
.
GridderConfig
(
nxdirty
,
nydirty
,
eps
,
fovx
,
fovy
)
nu
=
gconf
.
Nu
()
nv
=
gconf
.
Nv
()
self
.
_idx
=
nifty_gridder
.
getIndices
(
bl
,
gconf
,
flags
)
nxd
,
nyd
=
dirty_domain
.
shape
gconf
=
nifty_gridder
.
GridderConfig
(
nxdirty
,
nydirty
,
eps
,
1.
,
1.
)
nu
,
nv
=
gconf
.
Nu
(),
gconf
.
Nv
()
self
.
_idx
=
nifty_gridder
.
getIndices
(
bl
,
gconf
,
np
.
zeros
((
uv
.
shape
[
0
],
1
),
dtype
=
np
.
bool
))
self
.
_bl
=
bl
grid_domain
=
RGSpace
([
nu
,
nv
],
distances
=
[
1
,
1
],
harmonic
=
False
)
...
...
@@ -78,7 +86,7 @@ class _RestOperator(LinearOperator):
class
RadioGridder
(
LinearOperator
):
def
__init__
(
self
,
grid_domain
,
bl
,
gconf
,
idx
):
self
.
_domain
=
DomainTuple
.
make
(
UnstructuredDomain
((
bl
.
Nrows
()
,
bl
.
Nchannels
()
)))
UnstructuredDomain
((
bl
.
Nrows
())))
self
.
_target
=
DomainTuple
.
make
(
grid_domain
)
self
.
_bl
=
bl
self
.
_gconf
=
gconf
...
...
@@ -89,10 +97,10 @@ class RadioGridder(LinearOperator):
import
nifty_gridder
self
.
_check_input
(
x
,
mode
)
if
mode
==
self
.
TIMES
:
x
=
self
.
_bl
.
ms2vis
(
x
.
to_global_data
(),
self
.
_idx
)
x
=
self
.
_bl
.
ms2vis
(
x
.
to_global_data
()
.
reshape
((
-
1
,
1
))
,
self
.
_idx
)
res
=
nifty_gridder
.
vis2grid
(
self
.
_bl
,
self
.
_gconf
,
self
.
_idx
,
x
)
else
:
res
=
nifty_gridder
.
grid2vis
(
self
.
_bl
,
self
.
_gconf
,
self
.
_idx
,
x
.
to_global_data
())
res
=
self
.
_bl
.
vis2ms
(
res
,
self
.
_idx
)
res
=
self
.
_bl
.
vis2ms
(
res
,
self
.
_idx
)
.
reshape
((
-
1
,))
return
from_global_data
(
self
.
_tgt
(
mode
),
res
)
test/test_operators/test_nft.py
View file @
2d9e6511
...
...
@@ -29,37 +29,30 @@ pmp = pytest.mark.parametrize
def
_l2error
(
a
,
b
):
return
np
.
sqrt
(
np
.
sum
(
np
.
abs
(
a
-
b
)
**
2
)
/
np
.
sum
(
np
.
abs
(
a
)
**
2
))
speedOfLight
=
299792458.
@
pmp
(
'eps'
,
[
1e-2
,
1e-4
,
1e-7
,
1e-10
,
1e-11
,
1e-12
,
2e-13
])
@
pmp
(
'nu'
,
[
12
,
128
])
@
pmp
(
'nv'
,
[
4
,
12
,
128
])
@
pmp
(
'N'
,
[
1
,
10
,
100
])
@
pmp
(
'freq'
,
[
1e9
])
def
test_gridding
(
nu
,
nv
,
N
,
eps
,
freq
):
fovx
=
0.0001
fovy
=
0.0002
uvw
=
(
np
.
random
.
rand
(
N
,
3
)
-
0.5
)
uvw
[:,
0
]
/=
fovx
*
freq
/
speedOfLight
uvw
[:,
1
]
/=
fovy
*
freq
/
speedOfLight
vis
=
(
np
.
random
.
randn
(
N
)
+
1j
*
np
.
random
.
randn
(
N
)).
reshape
((
-
1
,
1
))
def
test_gridding
(
nu
,
nv
,
N
,
eps
):
uv
=
np
.
random
.
rand
(
N
,
2
)
-
0.5
vis
=
np
.
random
.
randn
(
N
)
+
1j
*
np
.
random
.
randn
(
N
)
# Nifty
GM
=
ift
.
GridderMaker
(
ift
.
RGSpace
((
nu
,
nv
)),
uvw
=
uvw
,
freq
=
np
.
array
([
freq
]),
eps
=
eps
,
fovx
=
fovx
,
fovy
=
fovy
,
flags
=
np
.
zeros
((
N
,
1
),
dtype
=
np
.
bool
))
GM
=
ift
.
GridderMaker
(
ift
.
RGSpace
((
nu
,
nv
)),
uv
=
uv
,
eps
=
eps
)
vis2
=
ift
.
from_global_data
(
ift
.
UnstructuredDomain
(
vis
.
shape
),
vis
)
Op
=
GM
.
getFull
()
pynu
=
Op
(
vis2
).
to_global_data
()
import
matplotlib.pyplot
as
plt
plt
.
imshow
(
pynu
)
plt
.
show
()
# DFT
x
,
y
=
np
.
meshgrid
(
*
[
-
ss
/
2
+
np
.
arange
(
ss
)
for
ss
in
[
nu
,
nv
]],
indexing
=
'ij'
)
x
*=
fovx
*
freq
/
speedOfLight
y
*=
fovy
*
freq
/
speedOfLight
dft
=
pynu
*
0.
for
i
in
range
(
N
):
dft
+=
(
vis
[
i
]
*
np
.
exp
(
2j
*
np
.
pi
*
(
x
*
uv
w
[
i
,
0
]
+
y
*
uvw
[
i
,
1
]))).
real
dft
+=
(
vis
[
i
]
*
np
.
exp
(
2j
*
np
.
pi
*
(
x
*
uv
[
i
,
0
]
+
y
*
uv
[
i
,
1
]))).
real
assert_
(
_l2error
(
dft
,
pynu
)
<
eps
)
...
...
@@ -67,15 +60,10 @@ def test_gridding(nu, nv, N, eps, freq):
@
pmp
(
'nu'
,
[
12
,
128
])
@
pmp
(
'nv'
,
[
4
,
12
,
128
])
@
pmp
(
'N'
,
[
1
,
10
,
100
])
@
pmp
(
'freq'
,
[
np
.
array
([
1e9
]),
np
.
array
([
1e9
,
2e9
,
2.5e9
])])
def
test_build
(
nu
,
nv
,
N
,
eps
,
freq
):
def
test_build
(
nu
,
nv
,
N
,
eps
):
dom
=
ift
.
RGSpace
([
nu
,
nv
])
fov
=
np
.
pi
/
180
/
60
uvw
=
np
.
random
.
rand
(
N
,
3
)
-
0.5
flags
=
np
.
zeros
((
N
,
freq
.
shape
[
0
]),
dtype
=
np
.
bool
)
flags
[
0
,
0
]
=
True
GM
=
ift
.
GridderMaker
(
dom
,
uvw
=
uvw
,
freq
=
freq
,
eps
=
eps
,
flags
=
flags
,
fovx
=
fov
,
fovy
=
fov
)
uv
=
np
.
random
.
rand
(
N
,
2
)
-
0.5
GM
=
ift
.
GridderMaker
(
dom
,
uv
=
uv
,
eps
=
eps
)
R0
=
GM
.
getGridder
()
R1
=
GM
.
getRest
()
R
=
R1
@
R0
...
...
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