summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2017-10-17 21:07:28 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-01 15:53:26 +0100
commit3eaebe8827db8ddf029fdb94ccda2b0af1385bec (patch)
treebe0feddf198ad5e96689c01a2002a7cfca5c8688
parent355ee14464f76f7a506143ef44a9b5a5319c4951 (diff)
downloadastra-3eaebe8827db8ddf029fdb94ccda2b0af1385bec.tar.gz
astra-3eaebe8827db8ddf029fdb94ccda2b0af1385bec.tar.bz2
astra-3eaebe8827db8ddf029fdb94ccda2b0af1385bec.tar.xz
astra-3eaebe8827db8ddf029fdb94ccda2b0af1385bec.zip
Add basic post-install python tests
-rw-r--r--.travis.yml2
-rw-r--r--README.md11
-rw-r--r--README.txt16
-rw-r--r--python/astra/__init__.py1
-rw-r--r--python/astra/tests.py97
5 files changed, 126 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index b34b1a0..aca9940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,4 +69,4 @@ script:
- make -j 4
- make test
- make install
- - python -c "import astra"
+ - python -c "import astra; astra.test_noCUDA()"
diff --git a/README.md b/README.md
index 5211e69..ddc881c 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,17 @@ Run build_setup.bat to automatically copy the boost headers and libraries.
For matlab: Run build_matlab.bat. The .dll and .mexw64 files will be in bin\x64\Release_Cuda.
For python 2.7/3.5: Run build_python27.bat or build_python35.bat. Astra will be directly installed into site-packages.
+## Testing your installation
+
+To perform a (very) basic test of your ASTRA installation in Python, you can
+run the following Python commands. You can choose if you want to skip the test
+of the GPU functionality for systems without a NVIDIA GPU.
+
+```
+import astra
+astra.test_noCUDA() # To skip GPU tests
+astra.test_CUDA() # To also perform GPU tests
+```
## References
diff --git a/README.txt b/README.txt
index 94da3d4..63c9cf5 100644
--- a/README.txt
+++ b/README.txt
@@ -151,6 +151,22 @@ For matlab: Run build_matlab.bat. The .dll and .mexw64 files will be in bin\x64\
For python 2.7/3.5: Run build_python27.bat or build_python35.bat. Astra will be directly installed into site-packages.
+Testing your installation:
+---------------------------
+
+To perform a (very) basic test of your ASTRA installation in Python, you can
+run the following Python commands. You can choose if you want to skip the test
+of the GPU functionality for systems without a NVIDIA GPU.
+
+import astra
+astra.test_noCUDA() # To skip GPU tests
+astra.test_CUDA() # To also perform GPU tests
+
+
+
+
+
+
References:
------------
diff --git a/python/astra/__init__.py b/python/astra/__init__.py
index d5aac44..8238a88 100644
--- a/python/astra/__init__.py
+++ b/python/astra/__init__.py
@@ -39,6 +39,7 @@ from . import plugin
from . import plugins
from . import log
from .optomo import OpTomo
+from .tests import test_noCUDA, test_CUDA
__version__ = '1.8'
diff --git a/python/astra/tests.py b/python/astra/tests.py
new file mode 100644
index 0000000..32afd36
--- /dev/null
+++ b/python/astra/tests.py
@@ -0,0 +1,97 @@
+# -----------------------------------------------------------------------
+# Copyright: 2010-2017, iMinds-Vision Lab, University of Antwerp
+# 2013-2017, CWI, Amsterdam
+#
+# Contact: astra@uantwerpen.be
+# Website: http://www.astra-toolbox.com/
+#
+# This file is part of the ASTRA Toolbox.
+#
+#
+# The ASTRA Toolbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The ASTRA Toolbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
+#
+# -----------------------------------------------------------------------
+
+from __future__ import print_function, absolute_import
+
+def _basic_par2d_fp(type):
+ import astra
+ import numpy as np
+ vg = astra.create_vol_geom(2, 32)
+ pg = astra.create_proj_geom('parallel', 1, 32, [0])
+ proj_id = astra.create_projector(type, pg, vg)
+ vol = np.random.rand(2, 32)
+ (sino_id, sino) = astra.create_sino(vol, proj_id)
+ astra.data2d.delete(sino_id)
+ astra.projector.delete(proj_id)
+ err = np.max(np.abs(sino[0,:] - np.sum(vol,axis=0)))
+ return err < 1e-6
+
+def _basic_par3d_fp():
+ import astra
+ import numpy as np
+ vg = astra.create_vol_geom(2, 32, 32)
+ pg = astra.create_proj_geom('parallel3d', 1, 1, 32, 32, [0])
+ vol = np.random.rand(32, 2, 32)
+ (sino_id, sino) = astra.create_sino3d_gpu(vol, pg, vg)
+ astra.data3d.delete(sino_id)
+ err = np.max(np.abs(sino[:,0,:] - np.sum(vol,axis=1)))
+ return err < 1e-6
+
+
+def _basic_par2d():
+ print("Testing basic CPU 2D functionality... ", end="")
+ if _basic_par2d_fp('line'):
+ print("Ok")
+ return True
+ else:
+ print("Error")
+ return False
+
+def _basic_par2d_cuda():
+ print("Testing basic CUDA 2D functionality... ", end="")
+ if _basic_par2d_fp('cuda'):
+ print("Ok")
+ return True
+ else:
+ print("Error")
+ return False
+
+def _basic_par3d_cuda():
+ print("Testing basic CUDA 3D functionality... ", end="")
+ if _basic_par3d_fp():
+ print("Ok")
+ return True
+ else:
+ print("Error")
+ return False
+
+def test_noCUDA():
+ """Perform a very basic functionality test, without CUDA"""
+
+ ok = _basic_par2d()
+ if not ok:
+ raise RuntimeError("Test failed")
+
+def test_CUDA():
+ """Perform a very basic functionality test, including CUDA"""
+
+ import astra
+ print("Getting GPU info... ", end="")
+ print(astra.get_gpu_info())
+ ok1 = _basic_par2d()
+ ok2 = _basic_par2d_cuda()
+ ok3 = _basic_par3d_cuda()
+ if not (ok1 and ok2 and ok3):
+ raise RuntimeError("Test failed")