diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-04-09 13:41:06 +0100 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-04-09 13:41:06 +0100 |
| commit | b9fafd363d1d181a4a8b42ea4038924097207913 (patch) | |
| tree | cdc7c4469e210a52cb416b2747ca2d954da073cc /Wrappers/Python/ccpi | |
| parent | a5b5872b76bf00023a7e7cee97e028003ccbc45e (diff) | |
| download | regularization-b9fafd363d1d181a4a8b42ea4038924097207913.tar.gz regularization-b9fafd363d1d181a4a8b42ea4038924097207913.tar.bz2 regularization-b9fafd363d1d181a4a8b42ea4038924097207913.tar.xz regularization-b9fafd363d1d181a4a8b42ea4038924097207913.zip | |
major renaming and new 3D demos for Matlab
Diffstat (limited to 'Wrappers/Python/ccpi')
| -rw-r--r-- | Wrappers/Python/ccpi/filters/regularisers.py (renamed from Wrappers/Python/ccpi/filters/regularizers.py) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Wrappers/Python/ccpi/filters/regularizers.py b/Wrappers/Python/ccpi/filters/regularisers.py index d6dfa8c..039daab 100644 --- a/Wrappers/Python/ccpi/filters/regularizers.py +++ b/Wrappers/Python/ccpi/filters/regularisers.py @@ -2,30 +2,30 @@ script which assigns a proper device core function based on a flag ('cpu' or 'gpu') """ -from ccpi.filters.cpu_regularizers_cython import TV_ROF_CPU, TV_FGP_CPU -from ccpi.filters.gpu_regularizers import TV_ROF_GPU, TV_FGP_GPU +from ccpi.filters.cpu_regularisers_cython import TV_ROF_CPU, TV_FGP_CPU +from ccpi.filters.gpu_regularisers import TV_ROF_GPU, TV_FGP_GPU -def ROF_TV(inputData, regularization_parameter, iterations, +def ROF_TV(inputData, regularisation_parameter, iterations, time_marching_parameter,device='cpu'): if device == 'cpu': return TV_ROF_CPU(inputData, - regularization_parameter, + regularisation_parameter, iterations, time_marching_parameter) elif device == 'gpu': return TV_ROF_GPU(inputData, - regularization_parameter, + regularisation_parameter, iterations, time_marching_parameter) else: raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) -def FGP_TV(inputData, regularization_parameter,iterations, +def FGP_TV(inputData, regularisation_parameter,iterations, tolerance_param, methodTV, nonneg, printM, device='cpu'): if device == 'cpu': return TV_FGP_CPU(inputData, - regularization_parameter, + regularisation_parameter, iterations, tolerance_param, methodTV, @@ -33,7 +33,7 @@ def FGP_TV(inputData, regularization_parameter,iterations, printM) elif device == 'gpu': return TV_FGP_GPU(inputData, - regularization_parameter, + regularisation_parameter, iterations, tolerance_param, methodTV, @@ -41,4 +41,4 @@ def FGP_TV(inputData, regularization_parameter,iterations, printM) else: raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ - .format(device))
\ No newline at end of file + .format(device)) |