Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #98 from vais-ral/TGV3D | Daniil Kazantsev | 2019-02-18 | 16 | -186/+891 |
|\ | | | | | TGV 3D CPU/GPU | ||||
| * | TGV3D_GPU added, demos updated fpr Python/Matlab | dkazanc | 2019-02-18 | 13 | -113/+583 |
| | | |||||
| * | working TGV3D_CPU version/Matlab | dkazanc | 2019-02-18 | 2 | -21/+22 |
| | | |||||
| * | first TGVD version | dkazanc | 2019-02-14 | 5 | -94/+170 |
| | | |||||
| * | first add of TGV3D_CPU | dkazanc | 2019-02-13 | 2 | -20/+178 |
| | | |||||
* | | UPDATE: python 3.7 | Tomas Kulhanek | 2019-02-13 | 1 | -0/+1 |
|/ | |||||
* | added conda badges | vais-ral | 2019-02-12 | 1 | -3/+3 |
| | |||||
* | add numpy 1.14 for Savu | Edoardo Pasca | 2019-02-08 | 1 | -0/+1 |
| | |||||
* | Demos fixed for Diff4th | dkazanc | 2019-02-07 | 5 | -21/+21 |
| | |||||
* | update calls to Diff4th | Edoardo Pasca | 2019-02-01 | 1 | -4/+4 |
| | |||||
* | Merge pull request #96 from vais-ral/Diff4th-rename | Edoardo Pasca | 2019-02-01 | 1 | -1/+1 |
|\ | | | | | DIFF4th was renamed Diff4th | ||||
| * | DIFF4th was renamed Diff4th | Edoardo Pasca | 2019-02-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #87 from vais-ral/fix_TGV | Daniil Kazantsev | 2019-02-01 | 3 | -12/+23 |
|\ | | | | | Fix tgv | ||||
| * | bugfix and rename DIFF4th to Diff4th | Edoardo Pasca | 2019-01-10 | 1 | -8/+8 |
| | | |||||
| * | remove print | Edoardo Pasca | 2019-01-10 | 1 | -1/+0 |
| | | | | | | | | closes #86 | ||||
| * | allows 3D TGV by a for loop on slices | Edoardo Pasca | 2019-01-10 | 2 | -3/+15 |
| | | |||||
| * | fix indentation | Edoardo Pasca | 2019-01-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #94 from TomasKulhanek/master | Tomas Kulhanek | 2019-01-28 | 2 | -2/+5 |
|\ \ | | | | | | | Universal build script | ||||
| * \ | Merge branch 'master' into master | Tomas Kulhanek | 2019-01-28 | 4 | -16/+14 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'master' of https://github.com/vais-ral/CCPi-Regularisation-Toolkit | vagrant | 2019-01-28 | 13 | -26/+45 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: build/jenkins-build.sh | ||||
| * \ \ | Merge pull request #93 from vais-ral/wincudafix | Edoardo Pasca | 2019-01-24 | 4 | -16/+14 |
| |\ \ \ | | | | | | | | | | | fixes gpu build on windows | ||||
| | * | | | fixes gpu build on windows | Kazantsev | 2019-01-23 | 4 | -16/+14 |
| | | | | | |||||
| * | | | | Merge pull request #92 from TomasKulhanek/master | Tomas Kulhanek | 2019-01-23 | 2 | -26/+38 |
| |\ \ \ \ | | |/ / / | |/| | | | build scripts detects tag and branch | ||||
| * | | | | Merge pull request #88 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-21 | 7 | -9/+33 |
| |\ \ \ \ | | | | | | | | | | | | | Pr test | ||||
* | | | | | | UPDATE: calling universa build script | vagrant | 2019-01-28 | 1 | -28/+1 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' of ↵ | Kulhanek | 2019-01-28 | 1 | -1/+4 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | https://github.com/TomasKulhanek/CCPi-Regularisation-Toolkit | ||||
| | | | | * \ | Merge pull request #7 from TomasKulhanek/pr2test | Tomas Kulhanek | 2019-01-25 | 1 | -1/+4 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Update Readme.md | ||||
| | | | | | * | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -0/+2 |
| | | | | | | | | |||||
| | | | | | * | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -1/+2 |
| | | | |_|/ / | | | |/| | | | |||||
| | | | * | | | UPDATE: using universal build | Kulhanek | 2019-01-28 | 1 | -93/+1 |
| | | | |/ / | |||||
| | | | * | | UPDATE: documentation of build script | Kulhanek | 2019-01-24 | 1 | -1/+23 |
| | | | | | | |||||
| | | | * | | UPDATE: branch taken from symbolic-full-name | Kulhanek | 2019-01-24 | 1 | -2/+2 |
| | | |/ / | |||||
| | | * | | Merge pull request #4 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-23 | 1 | -22/+30 |
| | | |\ \ | | | | | | | | | | | | | Pr test | ||||
| | | | * | | UPDATE 6: minor | Tomas Kulhanek | 2019-01-22 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | UPDATE 5: minor | Tomas Kulhanek | 2019-01-22 | 1 | -1/+0 |
| | | | | | | |||||
| | | | * | | UPDATE 4: check git branch | Tomas Kulhanek | 2019-01-22 | 1 | -1/+2 |
| | | | | | | |||||
| | | | * | | UPDATE 3: check git branch | Tomas Kulhanek | 2019-01-22 | 1 | -3/+4 |
| | | | | | | |||||
| | | | * | | UPDATE 2: check git branch, upload master build | Tomas Kulhanek | 2019-01-22 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | UPDATE 2: check git branch, upload master build | Tomas Kulhanek | 2019-01-22 | 1 | -14/+16 |
| | | | | | | |||||
| | | | * | | UPDATE: check git branch, upload master build | Tomas Kulhanek | 2019-01-22 | 1 | -2/+5 |
| | | | | | | |||||
| | | | * | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -2/+1 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' into pr-test | Tomas Kulhanek | 2019-01-22 | 1 | -0/+2 |
| | | | |\ \ | |||||
| | | | * | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -2/+4 |
| | | | | | | | |||||
| | | | * | | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -7/+6 |
| | | | | | | | |||||
| | | * | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -2/+3 |
| | | | | | | | |||||
| | | * | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Update Readme.md | Tomas Kulhanek | 2019-01-23 | 1 | -1/+2 |
| | | | |/ / | | | |/| | | |||||
| | | * | | | Merge pull request #3 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-22 | 1 | -14/+15 |
| | | |\| | | | | | | | | | | | | | | Update jenkins-build.sh test 32 | ||||
| | | | * | | Update jenkins-build.sh | Tomas Kulhanek | 2019-01-22 | 1 | -14/+15 |
| | | | | | | |||||
| | | * | | | Merge pull request #2 from TomasKulhanek/pr-test | Tomas Kulhanek | 2019-01-22 | 1 | -13/+13 |
| | | |\| | | | | | | | | | | | | | | Update jenkins-build.sh test |