summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS.txt6
-rw-r--r--README.md4
-rw-r--r--README.txt4
-rw-r--r--build/linux/README.txt6
4 files changed, 16 insertions, 4 deletions
diff --git a/NEWS.txt b/NEWS.txt
index c5720ec..cec28a8 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -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
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.
diff --git a/README.txt b/README.txt
index 5ec6564..4be7ba0 100644
--- a/README.txt
+++ b/README.txt
@@ -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.