diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-12-02 19:01:42 +0000 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-12-02 19:01:42 +0000 |
| commit | a48c9e69e941ec4046aca9d5d6ec453b9e9debdc (patch) | |
| tree | f62cbc2b1d51aff9aaff14e1675f932f1922dde8 /Wrappers/Python/ccpi | |
| parent | d252fcf6889855bb276cf6f9bf516e61910c064f (diff) | |
| download | regularization-a48c9e69e941ec4046aca9d5d6ec453b9e9debdc.tar.gz regularization-a48c9e69e941ec4046aca9d5d6ec453b9e9debdc.tar.bz2 regularization-a48c9e69e941ec4046aca9d5d6ec453b9e9debdc.tar.xz regularization-a48c9e69e941ec4046aca9d5d6ec453b9e9debdc.zip | |
cythonised nltv and updated demo, readme, bash run added
Diffstat (limited to 'Wrappers/Python/ccpi')
| -rw-r--r-- | Wrappers/Python/ccpi/filters/regularisers.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Wrappers/Python/ccpi/filters/regularisers.py b/Wrappers/Python/ccpi/filters/regularisers.py index c3c3c7e..bf7e23c 100644 --- a/Wrappers/Python/ccpi/filters/regularisers.py +++ b/Wrappers/Python/ccpi/filters/regularisers.py @@ -2,7 +2,7 @@ script which assigns a proper device core function based on a flag ('cpu' or 'gpu') """ -from ccpi.filters.cpu_regularisers import TV_ROF_CPU, TV_FGP_CPU, TV_SB_CPU, dTV_FGP_CPU, TNV_CPU, NDF_CPU, Diff4th_CPU, TGV_CPU, LLT_ROF_CPU, PATCHSEL_CPU +from ccpi.filters.cpu_regularisers import TV_ROF_CPU, TV_FGP_CPU, TV_SB_CPU, dTV_FGP_CPU, TNV_CPU, NDF_CPU, Diff4th_CPU, TGV_CPU, LLT_ROF_CPU, PATCHSEL_CPU, NLTV_CPU try: from ccpi.filters.gpu_regularisers import TV_ROF_GPU, TV_FGP_GPU, TV_SB_GPU, dTV_FGP_GPU, NDF_GPU, Diff4th_GPU, TGV_GPU, LLT_ROF_GPU gpu_enabled = True @@ -145,7 +145,7 @@ def DIFF4th(inputData, regularisation_parameter, edge_parameter, iterations, raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) -def PatchSelect_CPU(inputData, searchwindow, patchwindow, neighbours, edge_parameter, device='cpu'): +def PatchSelect(inputData, searchwindow, patchwindow, neighbours, edge_parameter, device='cpu'): if device == 'cpu': return PATCHSEL_CPU(inputData, searchwindow, @@ -159,7 +159,16 @@ def PatchSelect_CPU(inputData, searchwindow, patchwindow, neighbours, edge_param raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) - + +def NLTV(inputData, H_i, H_j, H_k, Weights, regularisation_parameter, iterations): + return NLTV_CPU(inputData, + H_i, + H_j, + H_k, + Weights, + regularisation_parameter, + iterations) + def TGV(inputData, regularisation_parameter, alpha1, alpha0, iterations, LipshitzConst, device='cpu'): if device == 'cpu': |