summaryrefslogtreecommitdiffstats
path: root/src/Python/ccpi
diff options
context:
space:
mode:
authordkazanc <dkazanc@hotmail.com>2019-05-15 11:26:25 +0100
committerdkazanc <dkazanc@hotmail.com>2019-05-15 11:26:25 +0100
commitd8168df8b3235284c0917a9a123aeb36a9a3becc (patch)
tree447b080fd937fd6cfb351cf5bd771f2886c578ea /src/Python/ccpi
parentbaa8a9208e6d4d685c08cc50699864865292159a (diff)
downloadregularization-d8168df8b3235284c0917a9a123aeb36a9a3becc.tar.gz
regularization-d8168df8b3235284c0917a9a123aeb36a9a3becc.tar.bz2
regularization-d8168df8b3235284c0917a9a123aeb36a9a3becc.tar.xz
regularization-d8168df8b3235284c0917a9a123aeb36a9a3becc.zip
mask segm bits removed from Cython
Diffstat (limited to 'src/Python/ccpi')
-rw-r--r--src/Python/ccpi/filters/regularisers.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/Python/ccpi/filters/regularisers.py b/src/Python/ccpi/filters/regularisers.py
index 2fee8b3..0b5b2ee 100644
--- a/src/Python/ccpi/filters/regularisers.py
+++ b/src/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, NLTV_CPU, MASK_CORR_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, PATCHSEL_GPU
gpu_enabled = True
@@ -212,15 +212,4 @@ def NDF_INP(inputData, maskData, regularisation_parameter, edge_parameter, itera
def NVM_INP(inputData, maskData, SW_increment, iterations):
return NVM_INPAINT_CPU(inputData, maskData, SW_increment, iterations)
-
-def MASK_CORR(maskdata, select_classes, total_classesNum, CorrectionWindow, device='cpu'):
- if device == 'cpu':
- return MASK_CORR_CPU(maskdata, select_classes, total_classesNum, CorrectionWindow)
- elif device == 'gpu' and gpu_enabled:
- return MASK_CORR_CPU(maskdata, select_classes, total_classesNum, CorrectionWindow)
- else:
- if not gpu_enabled and device == 'gpu':
- raise ValueError ('GPU is not available')
- raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
- .format(device))