From 0bcde21948d619e9803de229ea40499b5e1dd873 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 27 May 2015 11:54:04 +0200 Subject: Update README, NEWS --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 0713209..6054006 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,14 @@ Add the mex and tools subdirectories to your matlab path. ### Linux, from source -Requirements: g++, boost, CUDA (driver+toolkit), matlab +Requirements: g++, boost, CUDA (driver+toolkit), Matlab and/or Python (2.7 or 3.x) ``` cd build/linux ./autogen.sh # when building a git version ./configure --with-cuda=/usr/local/cuda \ --with-matlab=/usr/local/MATLAB/R2012a \ + --with-python --prefix=/usr/local/astra make make install @@ -37,6 +38,7 @@ make install Add /usr/local/astra/lib to your LD_LIBRARY_PATH. Add /usr/local/astra/matlab and its subdirectories (tools, mex) to your matlab path. +Add /usr/local/astra/python to your PYTHONPATH. NB: Each matlab version only supports a specific range of g++ versions. -- cgit v1.2.3 From 84217a9b98f420c7fd5b02ac1a0dec73fd0f5435 Mon Sep 17 00:00:00 2001 From: "Daniel M. Pelt" Date: Wed, 6 Jan 2016 17:39:37 +0100 Subject: Mention Python in the readme file --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 6054006..b34cf38 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ # The ASTRA Toolbox -The ASTRA Toolbox is a MATLAB toolbox of high-performance GPU primitives for 2D and 3D tomography. +The ASTRA Toolbox is a MATLAB and Python toolbox of high-performance GPU primitives for 2D and 3D tomography. We support 2D parallel and fan beam geometries, and 3D parallel and cone beam. All of them have highly flexible source/detector positioning. A large number of 2D and 3D algorithms are available, including FBP, SIRT, SART, CGLS. -The basic forward and backward projection operations are GPU-accelerated, and directly callable from MATLAB to enable building new algorithms. +The basic forward and backward projection operations are GPU-accelerated, and directly callable from MATLAB and Python to enable building new algorithms. ## Documentation / samples -See the matlab code samples in samples/ and on http://sf.net/projects/astra-toolbox . +See the MATLAB and Python code samples in samples/ and on http://sf.net/projects/astra-toolbox . ## Installation instructions ### Windows, binary -Add the mex and tools subdirectories to your matlab path. +Add the mex and tools subdirectories to your MATLAB path and the Python module to your Python path.. ### Linux, from source -- cgit v1.2.3 From d54172290f629d98c8a330ad358d5932bdba8dbc Mon Sep 17 00:00:00 2001 From: Jonas Adler Date: Tue, 19 Apr 2016 09:30:20 +0200 Subject: Fix missing backslash in readme.md install --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index b34cf38..fb1f641 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ cd build/linux ./autogen.sh # when building a git version ./configure --with-cuda=/usr/local/cuda \ --with-matlab=/usr/local/MATLAB/R2012a \ - --with-python + --with-python \ --prefix=/usr/local/astra make make install -- cgit v1.2.3