summaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Add CUDA parvec supportWillem Jan Palenstijn2016-07-292-0/+7
|
* Merge branch 'master' into parvecWillem Jan Palenstijn2016-07-288-343/+588
|\
| * Add comment about setting CC to CXXDaniel M. Pelt2016-04-191-0/+2
| |
| * Use CXX for Python compilation as wellDaniel M. Pelt2016-04-191-2/+2
| |
| * Merge pull request #32 from dmpelt/split-condaWillem Jan Palenstijn2016-03-031-1/+1
| |\ | | | | | | Split conda package into c++ lib and python parts
| | * Include PluginAlgorithm in non-Python builds as wellDaniel M. Pelt2016-03-031-1/+1
| | |
| * | Revert "Use nvcc's -MT option"Willem Jan Palenstijn2016-03-031-2/+4
| |/ | | | | | | | | | | This reverts commit 29c5c86e56697286a92031aaa9fdd903b3bcc426. This fixes building with CUDA 5.5.
| * Merge pull request #111 from wjp/pluginbuildWillem Jan Palenstijn2016-02-221-3/+11
| |\ | | | | | | Remove dependency of libastra on libpython
| | * Add missing .PHONY targetsWillem Jan Palenstijn2016-01-211-1/+1
| | |
| | * Initialize Python plugins when available in MatlabWillem Jan Palenstijn2016-01-211-0/+10
| | |
| | * Remove dependency of libastra on libpython by refactoring PluginAlgorithmWillem Jan Palenstijn2016-01-211-2/+0
| | |
| * | Update gen.py to work on more python versionsWillem Jan Palenstijn2016-02-101-1/+6
| |/
| * Fix VPATH problem with older autoconf versionsWillem Jan Palenstijn2016-01-212-1/+7
| |
| * Don't build cuda non-PIC object if static libs are disabledWillem Jan Palenstijn2016-01-201-2/+10
| | | | | | | | | | This significantly speeds up builds since we usually pass disable-static to libtool.
| * Try to improve nvcc dependency file generationWillem Jan Palenstijn2016-01-201-0/+3
| | | | | | | | | | | | We now append empty targets for all dependencies listed in the .d file generated by nvcc. This mimics the behaviour of gcc's -MP option, and prevents deleted header files from breaking the build.
| * Use nvcc's -MT optionWillem Jan Palenstijn2016-01-201-4/+2
| |
| * Avoid incorrect include dirs when building python modulesWillem Jan Palenstijn2016-01-201-2/+5
| |
| * Add check for scipyWillem Jan Palenstijn2016-01-201-0/+7
| | | | | | | | The module matrix_c.pyx uses it.
| * Fail when python six module is not foundWillem Jan Palenstijn2016-01-201-1/+1
| |
| * Place Python build/temporary files in build directoryWillem Jan Palenstijn2016-01-201-9/+12
| | | | | | | | This also allows out-of-tree builds for Python.
| * Allow out-of-tree buildsWillem Jan Palenstijn2016-01-201-30/+37
| |
| * Merge pull request #105 from wjp/stringsWillem Jan Palenstijn2016-01-181-1/+0
| |\ | | | | | | Replace boost::lexical_cast by stringstreams
| | * Replace boost::lexical_cast by stringstreamsWillem Jan Palenstijn2016-01-051-1/+0
| | | | | | | | | | | | | | | | | | This is to avoid the dependence of lexical_cast on the current locale. The stringstreams used for the new string parsing/output functions are explicitly imbued with the C/classic locale.
| * | Allow user to pass NVCCFLAGS to configureWillem Jan Palenstijn2016-01-183-8/+10
| |/
| * Update version to 1.7.1Willem Jan Palenstijn2015-12-231-1/+1
| |
| * Update Windows build filesWillem Jan Palenstijn2015-12-041-0/+2
| |
| * Update version to 1.7Willem Jan Palenstijn2015-12-041-1/+1
| |
| * Add conda build scriptsDaniel M. Pelt2015-12-041-0/+4
| |
| * Merge pull request #101 from wjp/compositeWillem Jan Palenstijn2015-12-042-1/+7
| |\ | | | | | | Add CompositeGeometryManager
| | * Add CompositeGeometryManagerWillem Jan Palenstijn2015-12-042-1/+7
| | | | | | | | | | | | | | | This handles FP and BP operations on multiple data objects at once, splitting them to fit in GPU memory where necessary.
| * | Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-041-3/+13
| |\ \ | | |/ | |/| Add support for Python algorithm plugins
| | * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-012-3/+15
| | |\ | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx
| | * | Add support for Python algorithm pluginsDaniel M. Pelt2015-07-231-3/+13
| | | |
| * | | Fix Windows builds of astra_mex_directWillem Jan Palenstijn2015-12-021-0/+4
| | |/ | |/|
| * | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-071-2/+13
| | |
| * | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-071-1/+2
| |/
| * Increment version to 1.6Willem Jan Palenstijn2015-05-291-1/+1
| |
| * Fix vs2008 buildWillem Jan Palenstijn2015-05-291-2/+3
| |
| * Update utility filesWillem Jan Palenstijn2015-05-293-287/+438
| |
| * Update README, NEWSWillem Jan Palenstijn2015-05-291-2/+4
| |
* | Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-263-3/+1132
|\| | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
| * Now include path is system-independent.Valerii Sokolov2015-04-291-1/+1
| |
| * Fix typo in configure python checkWillem Jan Palenstijn2015-04-161-1/+1
| |
| * Add MSVC project filesWillem Jan Palenstijn2015-03-201-4/+34
| |
| * Merge branch 'master' into loggingWillem Jan Palenstijn2015-03-203-2/+1138
| |\
| | * Add command line option to generate vc09/vc11/all filesWillem Jan Palenstijn2015-03-201-24/+33
| | |
| | * Generate MSVC 2008/2012 project files with a Python scriptWillem Jan Palenstijn2015-03-191-0/+1088
| | |
| * | Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-131-0/+1
| | | | | | | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method.
| * | Add logging support to MatlabDaniel M. Pelt2015-03-131-0/+1
| | |
| * | Adds new logging capabilities (based on clog.h)Daniel M. Pelt2015-03-101-0/+1
| | |