summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'TomasKulhanek2018-12-0615-71/+722
|\
| * readme update3Daniil Kazantsev2018-12-061-2/+2
| * rm corr2Daniil Kazantsev2018-12-061-1/+1
| * correction2Daniil Kazantsev2018-12-061-1/+1
| * correcteddkazanc2018-12-061-1/+1
| * readme updated with figuredkazanc2018-12-062-0/+4
| * Merge pull request #77 from vais-ral/nltv_gpuDaniil Kazantsev2018-12-0414-69/+716
| |\
| | * GPU version, this completes implementation of nltv #68dkazanc2018-12-0414-69/+716
| |/
* / UPDATE: add jenkins build scriptTomasKulhanek2018-12-061-0/+12
|/
* Merge pull request #73 from vais-ral/NLTVDaniil Kazantsev2018-12-0216-16/+1079
|\
| * reasme updatedDaniil Kazantsev2018-12-021-4/+5
| * cythonised nltv and updated demo, readme, bash run addedDaniil Kazantsev2018-12-0218-618/+327
| * matlab version tested, cython bit starteddkazanc2018-11-3018-364/+1051
| * 2D version testeddkazanc2018-11-292-0/+459
| * indices provider function for 2Ddkazanc2018-11-281-0/+207
|/
* add __init__.pydkazanc2018-11-151-0/+0
* Merge pull request #66 from TomasKulhanek/patch-1Edoardo Pasca2018-11-141-6/+6
|\
| * Update Readme.mdTomas Kulhanek2018-11-141-6/+6
|/
* readme_upd2Daniil Kazantsev2018-10-231-1/+1
* readme_updatedDaniil Kazantsev2018-10-232-1/+5
* Merge pull request #64 from vais-ral/fix_tests_no_gpuEdoardo Pasca2018-10-172-13/+53
|\
| * bumps version number and fixes tests without gpuEdoardo Pasca2018-10-172-13/+53
* | Merge pull request #62 from vais-ral/demo_testsDaniil Kazantsev2018-10-174-22/+22
|\|
| * fixes tests/demos and closes #43dkazanc2018-10-114-22/+22
|/
* Merge pull request #61 from vais-ral/fix_big_dataDaniil Kazantsev2018-09-1724-333/+339
|\
| * CPU modules fixed for big dataKazantsev2018-09-1424-333/+339
|/
* cleaned installation instructionsEdoardo Pasca2018-08-201-2/+28
* Merge pull request #60 from vais-ral/cmakingDaniil Kazantsev2018-08-1532-141/+483
|\
| * install into MATLAB_DEST dir if WIN32Edoardo Pasca2018-08-154-18/+31
| * removed CIL_VERSION env variable from conda buildEdoardo Pasca2018-08-152-9/+1
| * updated build infoEdoardo Pasca2018-08-141-7/+42
| * removed s in wrappers in conda recipeEdoardo Pasca2018-08-141-1/+1
| * removed S from BUILD_PYTHON_WRAPPERSEdoardo Pasca2018-08-142-4/+4
| * fix conda buildEdoardo Pasca2018-08-141-2/+2
| * removed generatorEdoardo Pasca2018-08-141-2/+15
| * use generator expression for location of built targetsEdoardo Pasca2018-08-141-2/+1
| * remove useless ENV{CIL_VERSION}Edoardo Pasca2018-08-141-1/+1
| * bugfix install step for PythonWrapperEdoardo Pasca2018-08-141-1/+1
| * add install step for PythonWrapperEdoardo Pasca2018-08-141-0/+2
| * add info on installationalgol2018-08-131-2/+5
| * fixed matlab wrappers compilation GPUalgol2018-08-131-19/+26
| * MWsize GPU fixDaniil Kazantsev2018-08-119-17/+39
| * MWsize CPU fixalgol2018-08-1012-37/+46
| * add link flagsalgol2018-08-101-1/+8
| * bugfix initialisation of arrayalgol2018-08-102-11/+40
| * Merge branch 'cmaking' of https://github.com/vais-ral/CCPi-FISTA_Reconstructi...Edoardo Pasca2018-08-062-2/+2
| |\
| | * working recipe for Linux GPU. Needs testEdoardo Pasca2018-08-052-3/+3
| * | add destination for wrapperEdoardo Pasca2018-08-062-8/+29
| |/
| * Merge branch 'cmaking' of https://github.com/vais-ral/CCPi-FISTA_Reconstructi...Edoardo Pasca2018-08-051-1/+1
| |\
| | * fix conda linux build scriptEdoardo Pasca2018-08-051-1/+1