diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-05-15 14:51:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 14:51:44 +0100 |
| commit | 5fb5be32360bab1b6619bcef192dde0878d014ff (patch) | |
| tree | 402aa4670dbbb6412df21441180940ebaace8551 /src/Python/ccpi | |
| parent | e8712929c6c18fb0799fcd60489692d809d95e89 (diff) | |
| parent | 1207b14fa2fac7f8b83280d75884ad3a62e57e75 (diff) | |
| download | regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.tar.gz regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.tar.bz2 regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.tar.xz regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.zip | |
Merge pull request #122 from vais-ral/matlab_fix
fix to cmakelists file
Diffstat (limited to 'src/Python/ccpi')
| -rw-r--r-- | src/Python/ccpi/filters/regularisers.py | 13 |
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)) |