Skip to content

Commit 7b9420a

Browse files
committed
Remove pynufft following its removal from PyAutoArray
Drops the `TransformerNUFFTPyNUFFT` re-export from `autolens/__init__.py`, which would raise ImportError once PyAutoArray removes the class, and removes `pynufft` from the `optional` extra. Also updates the live documentation and citation surface, which described PyNUFFT as the interferometer NUFFT backend: the installation pages now point at `nufftax`, the feature overview names the backend actually in use, and the citation lists (`files/citations.{md,tex,bib}`) cite nufftax in its place. `paper/` is deliberately untouched — those are published records of what the software used at time of publication, not live documentation. Must merge together with the PyAutoArray removal.
1 parent 87e5827 commit 7b9420a

9 files changed

Lines changed: 6 additions & 27 deletions

File tree

autolens/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from autoarray.operators.convolver import Convolver
2828
from autoarray.operators.transformer import TransformerDFT
2929
from autoarray.operators.transformer import TransformerNUFFT
30-
from autoarray.operators.transformer import TransformerNUFFTPyNUFFT
3130
from autoarray.structures.arrays.uniform_1d import Array1D
3231
from autoarray.structures.arrays.uniform_2d import Array2D
3332
from autoarray.structures.arrays.rgb import Array2DRGB

docs/installation/conda.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ successful numba install working, with more information provided [at this readth
114114

115115
## Optional
116116

117-
For interferometer analysis there are two optional dependencies that must be installed via the commands:
117+
For interferometer analysis there is one optional dependency that must be installed via the command:
118118

119119
```bash
120-
pip install pynufft
120+
pip install nufftax
121121
```
122122

123123
**PyAutoLens** will run without these libraries and it is recommended that you only install them if you intend to

docs/installation/pip.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ successful numba install working, with more information provided [at this readth
106106

107107
## Optional
108108

109-
For interferometer analysis there are two optional dependencies that must be installed via the commands:
109+
For interferometer analysis there is one optional dependency that must be installed via the command:
110110

111111
```bash
112-
pip install pynufft
112+
pip install nufftax
113113
```
114114

115115
**PyAutoLens** will run without these libraries and it is recommended that you only install them if you intend to

docs/installation/source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pip install numba
6969
For unit tests to pass you will also need the following optional requirements:
7070

7171
```bash
72-
pip install pynufft
72+
pip install nufftax
7373
```
7474

7575
If you are using a `conda` environment, add the source repository as follows:

docs/overview/overview_3_features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Modeling of interferometer data from submillimeter (e.g. ALMA) and radio (e.g. L
101101

102102
Visibilities data is fitted directly in the uv-plane, circumventing issues that arise when fitting a dirty image
103103
such as correlated noise. This uses the non-uniform fast fourier transform algorithm
104-
\[PyNUFFT\](<https://github.com/jyhmiinlin/pynufft>) to efficiently map the galaxy model images to the uv-plane.
104+
\[nufftax\](<https://github.com/GragasLab/nufftax>) to efficiently map the galaxy model images to the uv-plane.
105105

106106
Checkout the `autolens_workspace/*/interferometer` package to get started.
107107

files/citations.bib

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,6 @@ @article{pyautolens
188188
author = {Nightingale, J. W. and Hayes, R. G. and Ashley Kelly and Aristeidis Amvrosiadis and Amy Etherington and Qiuhan He and Nan Li and XiaoYue Cao and Jonathan Frawley and Shaun Cole and Andrea Enia and Carlos S. Frenk and David R. Harvey and Ran Li and Richard J. Massey and Mattia Negrello and Andrew Robertson},
189189
title = {`PyAutoLens`: Open-Source Strong Gravitational Lensing},
190190
journal = {J. Open Source Softw.}
191-
}
192-
@article{pynufft,
193-
abstract = {A Python non-uniform fast Fourier transform (PyNUFFT) package has been developed to accelerate multidimensional non-Cartesian image reconstruction on heterogeneous platforms. Since scientific computing with Python encompasses a mature and integrated environment, the time efficiency of the NUFFT algorithm has been a major obstacle to real-time non-Cartesian image reconstruction with Python. The current PyNUFFT software enables multi-dimensional NUFFT accelerated on a heterogeneous platform, which yields an efficient solution to many non-Cartesian imaging problems. The PyNUFFT also provides several solvers, including the conjugate gradient method, 1 total variation regularized ordinary least square (L1TV-OLS), and 1 total variation regularized least absolute deviation (L1TV-LAD). Metaprogramming libraries have been employed to accelerate PyNUFFT. The PyNUFFT package has been tested on multi-core central processing units (CPUs) and graphic processing units (GPUs), with acceleration factors of 6.3–9.5× on a 32-thread CPU platform and 5.4–13× on a GPU.},
194-
author = {Lin, Jyh Miin},
195-
doi = {10.3390/jimaging4030051},
196-
file = {:home/jammy/Documents/Papers/Software/jimaging-04-00051-v2.pdf:pdf},
197-
issn = {2313433X},
198-
journal = {Journal of Imaging},
199-
keywords = {Graphic processing unit (GPU),Heterogeneous system architecture (HSA),Magnetic resonance imaging (MRI),Multi-core system,Total variation (TV)},
200-
number = {3},
201-
pages = {1--22},
202-
title = {{Python non-uniform fast fourier transform (PyNUFFT): An accelerated non-cartesian MRI package on a heterogeneous platform (CPU/GPU)}},
203-
volume = {4},
204-
year = {2018}
205191
}
206192
@book{python,
207193
author = {Van Rossum, Guido and Drake, Fred L.},

files/citations.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ This work uses the following software packages:
2929
- `PyAutoFit` https://github.com/PyAutoLabs/PyAutoFit [@pyautofit]
3030
- `PyAutoGalaxy` https://github.com/PyAutoLabs/PyAutoGalaxy [@Nightingale2018] [@pyautogalaxy]
3131
- `PyAutoLens` https://github.com/PyAutoLabs/PyAutoLens [@Nightingale2015] [@Nightingale2018] [@pyautolens]
32-
- `PyNUFFT` https://github.com/jyhmiinlin/pynufft [@pynufft]
3332
- `Python` https://www.python.org/ [@python]
3433
- `scikit-image` https://github.com/scikit-image/scikit-image [@scikit-image]
3534
- `scikit-learn` https://github.com/scikit-learn/scikit-learn [@scikit-learn]

files/citations.tex

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ \section*{Software Citations}
9494
\href{https://github.com/PyAutoLabs/PyAutoLens}{\texttt{PyAutoLens}}
9595
\citep{Nightingale2015, Nightingale2018, pyautolens}
9696

97-
\item
98-
\href{https://github.com/jyhmiinlin/pynufft}{\texttt{PyNUFFT}}
99-
\citep{pynufft}
100-
10197
\item
10298
\href{https://www.python.org/}{\texttt{Python}}
10399
\citep{python}

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ optional = [
5555
"autolens[jax]",
5656
"coolest",
5757
"numba",
58-
"pynufft",
5958
"zeus-mcmc==2.5.4",
6059
"getdist==1.4"
6160
]

0 commit comments

Comments
 (0)