summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8 from vais-ral/pythonizedkazanc2017-10-2656-59/+6590
|\ | | | | Pythonize
| * added to repositoryEdoardo Pasca2017-10-251-0/+412
| |
| * doing workEdoardo Pasca2017-10-251-213/+258
| |
| * Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-251-0/+380
| |\ | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | * Merge branch 'origin/pythonize' into pythonizeEdoardo Pasca2017-10-251-5/+4
| | |\
| | * | added to repositoryEdoardo Pasca2017-10-251-0/+380
| | | |
| * | | developmentEdoardo Pasca2017-10-251-1/+5
| | | |
| * | | Removed unused variablesEdoardo Pasca2017-10-251-2/+2
| | | |
| * | | removed dependencyEdoardo Pasca2017-10-251-3/+3
| | |/ | |/|
| * | removed print to screenEdoardo Pasca2017-10-251-6/+0
| | | | | | | | | | | | Fixed #2
| * | Added print to screen to debug faulty FGP_TVEdoardo Pasca2017-10-251-5/+10
| |/ | | | | | | Bug #2 came from not initializing lambda but mu.
| * Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-2522-1362/+1058
| |\
| | * Add regularization stepEdoardo Pasca2017-10-243-7/+27
| | | | | | | | | | | | | | | Add regularization step OS seems to work
| | * saves to fileEdoardo Pasca2017-10-241-0/+1
| | |
| | * moved to test directoryEdoardo Pasca2017-10-241-3/+12
| | |
| | * Merge branch 'master' of ↵Edoardo Pasca2017-10-247-126/+117
| | |\ | |_|/ |/| | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
* | | demo_parallel updatealgol2017-10-201-0/+12
| | |
* | | GH-OS fixed, demos updated, add_artifacts functionDaniil Kazantsev2017-10-197-126/+105
| | |
| | * Remove dependency on astra-toolbox in meta.yamlEdoardo Pasca2017-10-241-1/+1
| | | | | | | | | | | | this just because otherwise conda wants to install a version from astra-toolbox which I'm not sure works for us.
| | * fix wrong indentationEdoardo Pasca2017-10-241-1/+1
| | |
| | * added targets and cache variablesEdoardo Pasca2017-10-242-2/+48
| | |
| | * removed fista directoryEdoardo Pasca2017-10-243-1034/+0
| | | | | | | | | | | | use the standard package reconstruction directory for the fista code
| | * use system packageEdoardo Pasca2017-10-241-1/+1
| | |
| | * latest devEdoardo Pasca2017-10-241-172/+427
| | |
| | * Builds 2 packages fista and regularizersEdoardo Pasca2017-10-246-26/+359
| | |
| | * add fista-recipe and stuffEdoardo Pasca2017-10-235-2/+83
| | |
| | * minor cleanupEdoardo Pasca2017-10-231-17/+7
| | |
| * | Use MATCH and CMAKE_MATCH_<n>Edoardo Pasca2017-10-251-12/+6
| |/
| * Bugfixes for UNIX compilationEdoardo Pasca2017-10-233-84/+52
| |
| * executable extension is for WIN32Edoardo Pasca2017-10-231-2/+6
| |
| * Finds the active conda environmentEdoardo Pasca2017-10-231-4/+56
| | | | | | | | sets up for the current active conda environmnet
| * Added setup.py.inEdoardo Pasca2017-10-231-0/+67
| |
| * Add needed environment variablesEdoardo Pasca2017-10-233-6/+30
| | | | | | | | Adds the environment variables that are needed to compile via conda.
| * Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-202-169/+143
| |\
| | * Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-2013-309/+601
| | |\ | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | * | Further developmentEdoardo Pasca2017-10-202-55/+81
| | | |
| | * | finished first draftEdoardo Pasca2017-10-191-115/+21
| | | |
| | * | further progressEdoardo Pasca2017-10-191-34/+54
| | | |
| | * | progress in pythonizationEdoardo Pasca2017-10-191-22/+44
| | | |
| * | | add conda-forge to the channelEdoardo Pasca2017-10-201-1/+1
| | |/ | |/|
| * | Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-202-1/+2
| |\ \ | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+79
| | | | | | | | | | | | | | | | attempting to locate conda python environment
| | * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+4
| | | | | | | | | | | | | | | | attempt to use CMake to create the build environment
| * | | Initial revision of build environment made with CMakeEdoardo Pasca2017-10-209-0/+336
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial revision of build environment made with CMake First commit of CMakeLists.txt attempt to use CMake to create the build environment First commit of CMakeLists.txt attempting to locate conda python environment Added a few files for CMake Many changes for the CMake compilation. Tested CMake build Bugfixes
| * | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-193-15/+48
| |\ \ | |/ / |/| |
* | | OS loop now fixedDaniil Kazantsev2017-10-193-27/+44
| | |
* | | Merge pull request #6 from vais-ral/if-then-elsedkazanc2017-10-191-39/+15
|\ \ \ | | | | | | | | moved code out of if-then-else
| * | | moved code out of if-then-elseEdoardo Pasca2017-10-191-39/+15
|/ / / | | | | | | | | | fixed #5
| * | Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-193-89/+594
| |\| | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | * added to repositoryEdoardo Pasca2017-10-181-0/+379
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 20:50:40 +0000