Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove STIR bindings #1403

Merged
merged 1 commit into from
Jun 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions doc/source/getting_started/about_odl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ If we now exchange ``matrix_op`` and ``data`` with a tomographic projector and l
Further features
================
* A unified structure `Geometry` for representing tomographic acquisition geometries
* Interfaces to fast external libraries, e.g. `ASTRA`_ for X-ray tomography, `STIR`_ for emission tomography (preliminary), `pyFFTW`_ for fast Fourier transforms, ...
* Interfaces to fast external libraries, e.g. `ASTRA`_ for X-ray tomography, `pyFFTW`_ for fast Fourier transforms, ...
* A growing number of "must-have" operators like `Gradient`, `FourierTransform`, `WaveletTransform`
* Several solvers for variational inverse problems, ranging from simple `gradient methods <steepest_descent>` to state-of-the-art non-smooth primal-dual splitting methods like `Douglas-Rachford <douglas_rachford_pd>`
* Standardized tests for the correctness of implementations of operators and spaces, e.g. does the adjoint operator fulfill its defining relation?
Expand All @@ -193,6 +193,5 @@ Further reading
.. _real numbers: https://en.wikipedia.org/wiki/Real_number
.. _rectangular boxes: https://en.wikipedia.org/wiki/Hypercube
.. _set: https://en.wikipedia.org/wiki/Set_%28mathematics%29
.. _STIR: http://stir.sourceforge.net/
.. _vector space: https://en.wikipedia.org/wiki/Vector_space
.. _vectorized: https://en.wikipedia.org/wiki/Array_programming
6 changes: 0 additions & 6 deletions doc/source/getting_started/installing_extensions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ Astra is most easily installed using conda:
For further instructions, check `the ASTRA GitHub page <https://github.com/astra-toolbox/astra-toolbox>`_.


STIR for emission tomography
============================
For applications in emission tomography, i.e. PET or SPECT, install `STIR`_ with Python bindings.
Support for STIR is currently very limited.


CUDA backend for linear arrays
==============================
Expand Down Expand Up @@ -121,4 +116,3 @@ If the above command instead raises a ``MemoryError`` or similar, your graphics
.. _odlcuda: https://github.com/odlgroup/odlcuda
.. _CUDA toolkit: https://developer.nvidia.com/cuda-toolkit
.. _ASTRA: https://github.com/astra-toolbox/astra-toolbox
.. _STIR: https://github.com/UCL/STIR
9 changes: 0 additions & 9 deletions examples/tomo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,3 @@ Example | Purpose | Complexity
[`filtered_backprojection_cone_3d_short_scan.py`](filtered_backprojection_cone_3d_short_scan.py) | (Inexact) FBP reconstruction in 3D circular cone beam geometry **with short scan (less than 360 degrees)** | middle
[`filtered_backprojection_helical_3d.py`](filtered_backprojection_helical_3d.py) | (Inexact) FBP reconstruction in 3D helical cone beam geometry | middle


# Other

[comment]: <> (This stuff will be removed from core ODL, just putting it to "Other" for now)

Example | Purpose | Complexity
------- | ------- | ----------
[`stir_project.py`](stir_project.py) | Projection and back-projection in 3D PET geometry using the `stir` back-end | middle
[`stir_reconstruct.py`](stir_reconstruct.py) | Iterative reconstruction in 3D PET geometry using the `stir` back-end | middle
26 changes: 0 additions & 26 deletions examples/tomo/data/stir/initial.hv

This file was deleted.

Binary file removed examples/tomo/data/stir/initial.v
Binary file not shown.
36 changes: 0 additions & 36 deletions examples/tomo/data/stir/small.hs

This file was deleted.

Empty file removed examples/tomo/data/stir/small.s
Empty file.
46 changes: 0 additions & 46 deletions examples/tomo/stir_project.py

This file was deleted.

38 changes: 0 additions & 38 deletions examples/tomo/stir_reconstruct.py

This file was deleted.

26 changes: 0 additions & 26 deletions odl/test/largescale/tomo/data/stir/initial.hv

This file was deleted.

Binary file removed odl/test/largescale/tomo/data/stir/initial.v
Binary file not shown.
36 changes: 0 additions & 36 deletions odl/test/largescale/tomo/data/stir/small.hs

This file was deleted.

Empty file.
49 changes: 0 additions & 49 deletions odl/test/largescale/tomo/stir_slow_test.py

This file was deleted.

2 changes: 1 addition & 1 deletion odl/test/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
except ImportError:
pass

ignore_prefix = ['stir', 'proximal_lang']
ignore_prefix = ['proximal_lang']

# Make a fixture for all examples
here = os.path.dirname(os.path.abspath(__file__))
Expand Down
2 changes: 0 additions & 2 deletions odl/tomo/backends/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

__all__ = ()

from . import stir_bindings

from .astra_setup import *
__all__ += astra_setup.__all__

Expand Down
Loading