From 3660ecf4ce9594edd6b35bd8e3c70e5c6d080ef0 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Thu, 10 Jan 2019 16:34:44 +0000 Subject: bugfix and rename DIFF4th to Diff4th --- Wrappers/Python/ccpi/filters/regularisers.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Wrappers') diff --git a/Wrappers/Python/ccpi/filters/regularisers.py b/Wrappers/Python/ccpi/filters/regularisers.py index 5dbb96a..588ea32 100644 --- a/Wrappers/Python/ccpi/filters/regularisers.py +++ b/Wrappers/Python/ccpi/filters/regularisers.py @@ -24,7 +24,7 @@ def ROF_TV(inputData, regularisation_parameter, iterations, time_marching_parameter) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) @@ -48,7 +48,7 @@ def FGP_TV(inputData, regularisation_parameter,iterations, printM) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) def SB_TV(inputData, regularisation_parameter, iterations, @@ -69,7 +69,7 @@ def SB_TV(inputData, regularisation_parameter, iterations, printM) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) def FGP_dTV(inputData, refdata, regularisation_parameter, iterations, @@ -96,7 +96,7 @@ def FGP_dTV(inputData, refdata, regularisation_parameter, iterations, printM) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) def TNV(inputData, regularisation_parameter, iterations, tolerance_param): @@ -125,7 +125,7 @@ def NDF(inputData, regularisation_parameter, edge_parameter, iterations, raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) -def DIFF4th(inputData, regularisation_parameter, edge_parameter, iterations, +def Diff4th(inputData, regularisation_parameter, edge_parameter, iterations, time_marching_parameter, device='cpu'): if device == 'cpu': return Diff4th_CPU(inputData, @@ -141,7 +141,7 @@ def DIFF4th(inputData, regularisation_parameter, edge_parameter, iterations, time_marching_parameter) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) @@ -160,7 +160,7 @@ def PatchSelect(inputData, searchwindow, patchwindow, neighbours, edge_parameter edge_parameter) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) @@ -202,7 +202,7 @@ def LLT_ROF(inputData, regularisation_parameterROF, regularisation_parameterLLT, return LLT_ROF_GPU(inputData, regularisation_parameterROF, regularisation_parameterLLT, iterations, time_marching_parameter) else: if not gpu_enabled and device == 'gpu': - raise ValueError ('GPU is not available') + raise ValueError ('GPU is not available') raise ValueError('Unknown device {0}. Expecting gpu or cpu'\ .format(device)) def NDF_INP(inputData, maskData, regularisation_parameter, edge_parameter, iterations, -- cgit v1.2.3