From ed17faf4bc16a336eaa4aa0b5d64e84948716b6d Mon Sep 17 00:00:00 2001 From: Jan Sijbers Date: Mon, 24 Oct 2016 23:00:53 +0200 Subject: Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index fb1f641..2be83ad 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,12 @@ Install by copying AstraCuda32.dll or AstraCuda64.dll from bin/ and ## References -If you use the ASTRA Toolbox for your research, we would appreciate it if you would refer to the following paper: +If you use the ASTRA Toolbox for your research, we would appreciate it if you would refer to the following papers: + +W. van Aarle, W. J. Palenstijn, J. Cant, E. Janssens, F. Bleichrodt, A. Dabravolski, J. De Beenhouwer, K. J. Batenburg, and J. Sijbers, “Fast and Flexible X-ray Tomography Using the ASTRA Toolbox”, Optics Express, 24(22), 25129-25147, (2016), http://dx.doi.org/10.1364/OE.24.025129 + +W. van Aarle, W. J. Palenstijn, J. De Beenhouwer, T. Altantzis, S. Bals, K. J. Batenburg, and J. Sijbers, “The ASTRA Toolbox: A platform for advanced algorithm development in electron tomography”, Ultramicroscopy, 157, 35–47, (2015), http://dx.doi.org/10.1016/j.ultramic.2015.05.002 -W. van Aarle, W. J. Palenstijn, J. De Beenhouwer, T. Altantzis, S. Bals, K J. Batenburg, and J. Sijbers, "The ASTRA Toolbox: A platform for advanced algorithm development in electron tomography", Ultramicroscopy (2015), http://dx.doi.org/10.1016/j.ultramic.2015.05.002 Additionally, if you use parallel beam GPU code, we would appreciate it if you would refer to the following paper: -- cgit v1.2.3 From d545273dc7feb0027effef782c09769372ba23c1 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 22 Nov 2016 17:12:39 +0100 Subject: Simplify default build instructions --- README.md | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 2be83ad..6691d5f 100644 --- a/README.md +++ b/README.md @@ -19,33 +19,55 @@ See the MATLAB and Python code samples in samples/ and on http://sf.net/projects ### Windows, binary -Add the mex and tools subdirectories to your MATLAB path and the Python module to your Python path.. +Add the mex and tools subdirectories to your MATLAB path, or copy +the Python astra module to your Python site-packages directory. ### Linux, from source -Requirements: g++, boost, CUDA (driver+toolkit), Matlab and/or Python (2.7 or 3.x) +#### For Matlab + +Requirements: g++, boost, CUDA (5.5 or higher), Matlab (R2012a or higher) ``` 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 + --prefix=$HOME/astra \ + --with-install-type=module 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. +Add $HOME/astra/matlab and its subdirectories (tools, mex) to your matlab path. + +If you want to build the Octave interface instead of the Matlab interface, +specify --enable-octave instead of --with-matlab=... . The Octave files +will be installed into $HOME/astra/octave . NB: Each matlab version only supports a specific range of g++ versions. Despite this, if you have a newer g++ and if you get errors related to missing GLIBCXX_3.4.xx symbols, it is often possible to work around this requirement by deleting the version of libstdc++ supplied by matlab in -MATLAB_PATH/bin/glnx86 or MATLAB_PATH/bin/glnxa64 (at your own risk). +MATLAB_PATH/bin/glnx86 or MATLAB_PATH/bin/glnxa64 (at your own risk), +or setting LD_PRELOAD=/usr/lib64/libstdc++.so.6 (or similar) when starting +matlab. + +#### For Python + +Requirements: g++, boost, CUDA (5.5 or higher), Python (2.7 or 3.x) + +``` +cd build/linux +./autogen.sh # when building a git version +./configure --with-cuda=/usr/local/cuda \ + --with-python \ + --with-install-type=module +make +make install +``` + +This will install Astra into your current Python environment. ### Windows, from source using Visual Studio 2008 -- cgit v1.2.3 From 80d5397e251d8e12c8cd77efcacc54b9f7de3f0b Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 16:53:17 +0100 Subject: Add automated Windows build scripts --- README.md | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 6691d5f..43d92b4 100644 --- a/README.md +++ b/README.md @@ -70,21 +70,30 @@ make install This will install Astra into your current Python environment. -### Windows, from source using Visual Studio 2008 +### Windows, from source using Visual Studio 2015 -Requirements: Visual Studio 2008, boost, CUDA (driver+toolkit), matlab. -Note that a .zip with all required (and precompiled) boost files is - available from our website. +Requirements: Visual Studio 2015 (full or community), boost (recent), CUDA 8.0, + Matlab (R2012a or higher) and/or WinPython 2.7/3.x. + +Using the Visual Studio IDE: Set the environment variable MATLAB_ROOT to your matlab install location. -Open astra_vc08.sln in Visual Studio. -Select the appropriate solution configuration. - (typically Release_CUDA|win32 or Release_CUDA|x64) +Copy boost headers to lib\include\boost, and boost libraries to bin\x64. +Open astra_vc14.sln in Visual Studio. +Select the appropriate solution configuration (typically Release_CUDA|x64). Build the solution. -Install by copying AstraCuda32.dll or AstraCuda64.dll from bin/ and - all .mexw32 or .mexw64 files from bin/Release_CUDA or bin/Debug_CUDA - and the entire matlab/tools directory to a directory to be added to - your matlab path. +Install by copying AstraCuda64.dll and all .mexw64 files from + bin\x64\Release_CUDA and the entire matlab/tools directory to a directory + to be added to your matlab path. + + +Using .bat scripts in build\msvc: + +Edit build_env.bat and set up the correct directories. +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. + ## References -- cgit v1.2.3 From 71db6331f8dd0d5abbeee92977af01293be4f427 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 15:54:07 +0100 Subject: Update headers (website+2016) --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 43d92b4..2cf7081 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The basic forward and backward projection operations are GPU-accelerated, and di ## Documentation / samples -See the MATLAB and Python code samples in samples/ and on http://sf.net/projects/astra-toolbox . +See the MATLAB and Python code samples in samples/ and on http://www.astra-toolbox.com/ . ## Installation instructions @@ -117,8 +117,8 @@ The ASTRA Toolbox is open source under the GPLv3 license. ## Contact email: astra@uantwerpen.be -website: http://sf.net/projects/astra-toolbox +website: http://www.astra-toolbox.com/ -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam http://visielab.uantwerpen.be/ and http://www.cwi.nl/ -- cgit v1.2.3 From 59ee208239f77eee663bc688ce48c7a80b583d8d Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 9 Dec 2016 17:16:48 +0100 Subject: Mention VS redistributable --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 2cf7081..20f87ac 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,10 @@ See the MATLAB and Python code samples in samples/ and on http://www.astra-toolb ### Windows, binary -Add the mex and tools subdirectories to your MATLAB path, or copy -the Python astra module to your Python site-packages directory. +Add the mex and tools subdirectories to your MATLAB path, or copy the Python +astra module to your Python site-packages directory. We require the Microsoft +Visual Studio 2015 redistributable package. If this is not already installed on +your system, it is included as vc_redist.x64.exe in the ASTRA zip file. ### Linux, from source -- cgit v1.2.3 From 8dea7f164e246f2d17674e46e15da2697711b882 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 17 Jan 2017 11:02:44 +0100 Subject: Add conda install instructions to README --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 20f87ac..73f5424 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,22 @@ astra module to your Python site-packages directory. We require the Microsoft Visual Studio 2015 redistributable package. If this is not already installed on your system, it is included as vc_redist.x64.exe in the ASTRA zip file. +### Linux/Windows, using conda for python + +Requirements: [conda](http://conda.pydata.org/) python environment, with 64 bit Python 2.7, 3.5 or 3.6. + +There are packages available for the ASTRA Toolbox in the astra-toolbox +channel for the conda package manager. To use these, run the following +inside a conda environment. + +``` +conda install -c astra-toolbox astra-toolbox +``` + +Linux, from source +------------------ + + ### Linux, from source #### For Matlab -- cgit v1.2.3 From 8aa72ecc013d0e5fdbbba98850aba1d88417df91 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 17 Jan 2017 11:43:28 +0100 Subject: Fix copy/paste mistake. Thanks @adler-j. --- README.md | 4 ---- 1 file changed, 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 73f5424..dc523a2 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,6 @@ inside a conda environment. conda install -c astra-toolbox astra-toolbox ``` -Linux, from source ------------------- - - ### Linux, from source #### For Matlab -- cgit v1.2.3 From cd32957185094680b84014e1ea8411ce6b142f74 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 6 Feb 2017 15:38:07 +0100 Subject: Add basic macOS/homebrew build instructions --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index dc523a2..8af69a7 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,21 @@ make install This will install Astra into your current Python environment. +### macOS, from source + +Use the Homebrew package manager to install boost, libtool, autoconf, automake. + +``` +cd build/linux +./autogen.sh +CPPFLAGS="-I/usr/local/include" NVCCFLAGS="-I/usr/local/include" ./configure \ + --with-cuda=/usr/local/cuda \ + --with-matlab=/Applications/MATLAB_R2016b.app \ + --prefix=$HOME/astra \ + --with-install-type=module +make +make install +``` ### Windows, from source using Visual Studio 2015 -- cgit v1.2.3