diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-27 11:54:04 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-29 11:46:13 +0200 |
| commit | 0bcde21948d619e9803de229ea40499b5e1dd873 (patch) | |
| tree | 50678d2f7cc8d4af8f5205e6c1545bf9b79824a7 | |
| parent | 0f577d1fbc2b0c15d85f18cc38eb14e3cbf6c6a2 (diff) | |
| download | astra-0bcde21948d619e9803de229ea40499b5e1dd873.tar.gz astra-0bcde21948d619e9803de229ea40499b5e1dd873.tar.bz2 astra-0bcde21948d619e9803de229ea40499b5e1dd873.tar.xz astra-0bcde21948d619e9803de229ea40499b5e1dd873.zip | |
Update README, NEWS
| -rw-r--r-- | NEWS.txt | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | README.txt | 4 | ||||
| -rw-r--r-- | build/linux/README.txt | 6 |
4 files changed, 16 insertions, 4 deletions
@@ -9,6 +9,12 @@ Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox ----------------------------------------------------------------------- +1.6 (2015-05-29) + * integrate and improve python interface + * integrate opSpot-based opTomo operator + * build fixes for newer platforms + * various consistency and bug fixes + 1.5 (2015-01-30) * add support for fan beam FBP * remove limits on number of angles in GPU code @@ -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. @@ -49,18 +49,20 @@ 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 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. diff --git a/build/linux/README.txt b/build/linux/README.txt index 9dd7a7a..7208d45 100644 --- a/build/linux/README.txt +++ b/build/linux/README.txt @@ -1,15 +1,17 @@ -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 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. |