summaryrefslogtreecommitdiffstats
path: root/src/Python/ccpi
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc3@googlemail.com>2019-04-15 15:42:29 +0100
committerGitHub <noreply@github.com>2019-04-15 15:42:29 +0100
commit6040e1e1f501f501e8da628b065fd16d35133519 (patch)
tree3aa1382838ce6b9b856ace373f1d864683f10277 /src/Python/ccpi
parentd882861f8cfc59ffe70aa2f286dda83b348d7a70 (diff)
parente6842ec7f2cdbd46a004758bc3a6543012c6a74a (diff)
downloadregularization-6040e1e1f501f501e8da628b065fd16d35133519.tar.gz
regularization-6040e1e1f501f501e8da628b065fd16d35133519.tar.bz2
regularization-6040e1e1f501f501e8da628b065fd16d35133519.tar.xz
regularization-6040e1e1f501f501e8da628b065fd16d35133519.zip
Merge pull request #117 from vais-ral/diffcon
Connected labels merging function
Diffstat (limited to 'src/Python/ccpi')
-rw-r--r--src/Python/ccpi/filters/regularisers.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/Python/ccpi/filters/regularisers.py b/src/Python/ccpi/filters/regularisers.py
index 398e11c..2fee8b3 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
+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
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,3 +212,15 @@ 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))
+