diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-12-10 10:40:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 10:40:58 +0000 |
| commit | a19c2ef5e1d8ebfdfe97d6755cd3d7d753e73541 (patch) | |
| tree | b84242f17b05ee5251a85dd911d4e9c87f3a8e2e /src/Python/ccpi | |
| parent | d1585fb280ead79b2bf3962c3e6d492b71acb723 (diff) | |
| parent | 041bdac2cda4633906600d8c77c37245b1e2e817 (diff) | |
| download | regularization-a19c2ef5e1d8ebfdfe97d6755cd3d7d753e73541.tar.gz regularization-a19c2ef5e1d8ebfdfe97d6755cd3d7d753e73541.tar.bz2 regularization-a19c2ef5e1d8ebfdfe97d6755cd3d7d753e73541.tar.xz regularization-a19c2ef5e1d8ebfdfe97d6755cd3d7d753e73541.zip | |
Merge pull request #138 from vais-ral/pdtv_gpu_fix
fixes gpu issues with pdtv
Diffstat (limited to 'src/Python/ccpi')
| -rw-r--r-- | src/Python/ccpi/filters/regularisers.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Python/ccpi/filters/regularisers.py b/src/Python/ccpi/filters/regularisers.py index 5f4001a..e3a984e 100644 --- a/src/Python/ccpi/filters/regularisers.py +++ b/src/Python/ccpi/filters/regularisers.py @@ -53,7 +53,7 @@ def FGP_TV(inputData, regularisation_parameter,iterations, .format(device)) def PD_TV(inputData, regularisation_parameter, iterations, - tolerance_param, methodTV, nonneg, lipschitz_const, tau, device='cpu'): + tolerance_param, methodTV, nonneg, lipschitz_const, device='cpu'): if device == 'cpu': return TV_PD_CPU(inputData, regularisation_parameter, @@ -61,8 +61,7 @@ def PD_TV(inputData, regularisation_parameter, iterations, tolerance_param, methodTV, nonneg, - lipschitz_const, - tau) + lipschitz_const) elif device == 'gpu' and gpu_enabled: return TV_PD_GPU(inputData, regularisation_parameter, @@ -70,8 +69,7 @@ def PD_TV(inputData, regularisation_parameter, iterations, tolerance_param, methodTV, nonneg, - lipschitz_const, - tau) + lipschitz_const) else: if not gpu_enabled and device == 'gpu': raise ValueError ('GPU is not available') |